Author: ramiro
Date: 2012-02-11 12:53:48 -0800 (Sat, 11 Feb 2012)
New Revision: 17509
Modified:
django/trunk/django/core/management/commands/inspectdb.py
django/trunk/tests/regressiontests/inspectdb/models.py
django/trunk/tests/regressiontests/inspectdb/tests.py
Log:
Fixed #17676 -- Fixed introspection of column names that start with digit(s).
Thanks Gandalfar for the report and patch.
Modified: django/trunk/django/core/management/commands/inspectdb.py
===================================================================
--- django/trunk/django/core/management/commands/inspectdb.py 2012-02-11
20:05:50 UTC (rev 17508)
+++ django/trunk/django/core/management/commands/inspectdb.py 2012-02-11
20:53:48 UTC (rev 17509)
@@ -101,8 +101,8 @@
att_name += '_field'
comment_notes.append('Field renamed because it was a
Python reserved word.')
- if att_name.isdigit():
- att_name = 'number_%d' % int(att_name)
+ if att_name[0].isdigit():
+ att_name = 'number_%s' % att_name
extra_params['db_column'] = unicode(column_name)
comment_notes.append("Field renamed because it wasn't a "
"valid Python identifier.")
Modified: django/trunk/tests/regressiontests/inspectdb/models.py
===================================================================
--- django/trunk/tests/regressiontests/inspectdb/models.py 2012-02-11
20:05:50 UTC (rev 17508)
+++ django/trunk/tests/regressiontests/inspectdb/models.py 2012-02-11
20:53:48 UTC (rev 17509)
@@ -15,3 +15,7 @@
people_unique = models.ForeignKey(People, unique=True)
license = models.CharField(max_length=255)
+class DigitsInColumnName(models.Model):
+ all_digits = models.CharField(max_length=11, db_column='123')
+ leading_digit = models.CharField(max_length=11, db_column='4extra')
+ leading_digits = models.CharField(max_length=11, db_column='45extra')
Modified: django/trunk/tests/regressiontests/inspectdb/tests.py
===================================================================
--- django/trunk/tests/regressiontests/inspectdb/tests.py 2012-02-11
20:05:50 UTC (rev 17508)
+++ django/trunk/tests/regressiontests/inspectdb/tests.py 2012-02-11
20:53:48 UTC (rev 17509)
@@ -18,3 +18,18 @@
self.assertIn("people_unique = models.ForeignKey(InspectdbPeople,
unique=True)",
out.getvalue())
out.close()
+
+ def test_digits_column_name_introspection(self):
+ """Introspection of column names consist/start with digits
(#16536/#17676)"""
+ out = StringIO()
+ call_command('inspectdb', stdout=out)
+ error_message = "inspectdb generated a model field name which is a
number"
+ self.assertNotIn(" 123 = models.CharField", out.getvalue(),
msg=error_message)
+ self.assertIn("number_123 = models.CharField", out.getvalue())
+
+ error_message = "inspectdb generated a model field name which starts
with a digit"
+ self.assertNotIn(" 4extra = models.CharField", out.getvalue(),
msg=error_message)
+ self.assertIn("number_4extra = models.CharField", out.getvalue())
+
+ self.assertNotIn(" 45extra = models.CharField", out.getvalue(),
msg=error_message)
+ self.assertIn("number_45extra = models.CharField", out.getvalue())
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
