innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Russell Keith-Magee 2008-08-16 05:03:40 +00:00
parent eab705f623
commit 77c949289e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
django/core/management/commands/inspectdb.py
View File

@ -16,7 +16,7 @@ class Command(NoArgsCommand):
from django.db import connection from django.db import connection
import keyword import keyword
table2model = lambda table_name: table_name.title().replace('_', '').replace(' ', '') table2model = lambda table_name: table_name.title().replace('_', '').replace(' ', '').replace('-', '')
cursor = connection.cursor() cursor = connection.cursor()
yield "# This is an auto-generated Django model module." yield "# This is an auto-generated Django model module."
@ -45,12 +45,19 @@ class Command(NoArgsCommand):
comment_notes = [] # Holds Field notes, to be displayed in a Python comment. comment_notes = [] # Holds Field notes, to be displayed in a Python comment.
extra_params = {} # Holds Field parameters such as 'db_column'. extra_params = {} # Holds Field parameters such as 'db_column'.
# 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
# Now modify the field name to make it python compatible.
if ' ' in att_name: if ' ' in att_name:
extra_params['db_column'] = att_name att_name = att_name.replace(' ', '_')
att_name = att_name.replace(' ', '')
comment_notes.append('Field renamed to remove spaces.') 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): if keyword.iskeyword(att_name):
extra_params['db_column'] = att_name
att_name += '_field' att_name += '_field'
comment_notes.append('Field renamed because it was a Python reserved word.') comment_notes.append('Field renamed because it was a Python reserved word.')