Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #7285: Improved inspectdb handling of dashes in table and field…

… names. Thanks to redalastor@gmail.com for the report and Justin Bronn for the first part of a fix.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 77c949289e8cc93df47997c44b8710217996cf63 1 parent eab705f
Russell Keith-Magee freakboy3742 authored
Showing with 11 additions and 4 deletions.
  1. +11 −4 django/core/management/commands/inspectdb.py
15 django/core/management/commands/inspectdb.py
View
@@ -16,7 +16,7 @@ def handle_inspection(self):
from django.db import connection
import keyword
- table2model = lambda table_name: table_name.title().replace('_', '').replace(' ', '')
+ table2model = lambda table_name: table_name.title().replace('_', '').replace(' ', '').replace('-', '')
cursor = connection.cursor()
yield "# This is an auto-generated Django model module."
@@ -45,12 +45,19 @@ def handle_inspection(self):
comment_notes = [] # Holds Field notes, to be displayed in a Python comment.
extra_params = {} # Holds Field parameters such as 'db_column'.
- if ' ' in att_name:
+ # If we need to do field name modifiations,
+ # remember the original field name
+ if ' ' in att_name or '-' in att_name or keyword.iskeyword(att_name):
extra_params['db_column'] = att_name
- att_name = att_name.replace(' ', '')
+
+ # Now 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.')
if keyword.iskeyword(att_name):
- extra_params['db_column'] = att_name
att_name += '_field'
comment_notes.append('Field renamed because it was a Python reserved word.')
Please sign in to comment.
Something went wrong with that request. Please try again.