Ticket #12460: inspect_db_py_names.patch

django/core/management/commands/inspectdb.py

@@ -1 @@
-import keyword
+import keyword, re
 from optparse import make_option
 
 from django.core.management.base import NoArgsCommand, CommandError
@@ -56 +56 @@
                 att_name = column_name.lower()
                 comment_notes = [] # Holds Field notes, to be displayed in a Python comment.
                 extra_params = {}  # Holds Field parameters such as 'db_column'.
+                invalid_name_re = re.compile(r'([^a-zA-Z0-9_])') # Determines whether att_name is a valid Python name or not
 
-                # If the column name can't be used verbatim as a Python
-                # attribute, set the "db_column" for this Field.
-                if ' ' in att_name or '-' in att_name or keyword.iskeyword(att_name) or column_name != att_name:
-                    extra_params['db_column'] = column_name
-
                 # Modify the field name to make it Python-compatible.
-                if ' ' in att_name:
-                    att_name = att_name.replace(' ', '_')
-                    comment_notes.append('Field renamed to remove spaces.')
-                if '-' in att_name:
-                    att_name = att_name.replace('-', '_')
-                    comment_notes.append('Field renamed to remove dashes.')
+                invalid_chars = invalid_name_re.findall(att_name)
+                for char in invalid_chars:
+                    att_name = att_name.replace(char, '_')
+                    comment_notes.append('Field renamed to remove character "%s".' % char)
+                if att_name.startswith('_'):
+                    att_name = 'field_' + att_name
+                    comment_notes.append('Field renamed because it started with "_".')
+                if att_name.endswith('_'):
+                    att_name += '_field'
+                    comment_notes.append('Field renamed because it ended with "_".')
+                if att_name[0].isdigit():
+                    att_name = 'field_' + att_name
+                    comment_notes.append('Field renamed because it started with a digit.')
                 if keyword.iskeyword(att_name):
                     att_name += '_field'
                     comment_notes.append('Field renamed because it was a Python reserved word.')
+                while att_name.find('__') >= 0:
+                    att_name = att_name.replace('__', '_')
+                    comment_notes.append('Field renamed because it contained "__".')
+
+                # If the column name can't be used verbatim as a Python
+                # attribute, set the "db_column" for this Field.
                 if column_name != att_name:
+                    extra_params['db_column'] = column_name
                     comment_notes.append('Field name made lowercase.')
 
                 if i in relations: