diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/management/commands/inspectdb.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/django/core/management/commands/inspectdb.py b/django/core/management/commands/inspectdb.py index e45f22c287..5f0e278c61 100644 --- a/django/core/management/commands/inspectdb.py +++ b/django/core/management/commands/inspectdb.py @@ -20,7 +20,7 @@ class Command(NoArgsCommand): def handle_noargs(self, **options): try: for line in self.handle_inspection(options): - print line + self.stdout.write("%s\n" % line) except NotImplementedError: raise CommandError("Database inspection isn't supported for the currently selected database backend.") @@ -66,12 +66,11 @@ class Command(NoArgsCommand): 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.') - if keyword.iskeyword(att_name): - att_name += '_field' - comment_notes.append('Field renamed because it was a Python reserved word.') + if column_name != att_name: comment_notes.append('Field name made lowercase.') @@ -97,6 +96,10 @@ class Command(NoArgsCommand): extra_params['unique'] = True field_type += '(' + + if keyword.iskeyword(att_name): + att_name += '_field' + comment_notes.append('Field renamed because it was a Python reserved word.') # Don't output 'id = meta.AutoField(primary_key=True)', because # that's assumed if it doesn't exist. |