Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #19676 -- Supported 'self' foreign keys in inspectdb.

Thanks Georgy Kutsurua for the report and Simon Charette for the patch.
  • Loading branch information...
commit c47fa3b4814240bb47342a4446d40ea83bd3ed19 1 parent f46d731
Aymeric Augustin aaugustin authored
6 django/core/management/commands/inspectdb.py
View
@@ -6,7 +6,7 @@
from django.core.management.base import NoArgsCommand, CommandError
from django.db import connections, DEFAULT_DB_ALIAS
-from django.utils import six
+
class Command(NoArgsCommand):
help = "Introspects the database tables in the given database and outputs a Django model module."
@@ -34,7 +34,7 @@ def handle_inspection(self, options):
table_name_filter = options.get('table_name_filter')
table2model = lambda table_name: table_name.title().replace('_', '').replace(' ', '').replace('-', '')
- strip_prefix = lambda s: s.startswith("u'") and s[1:] or s
+ strip_prefix = lambda s: s[1:] if s.startswith("u'") else s
cursor = connection.cursor()
yield "# This is an auto-generated Django model module."
@@ -86,7 +86,7 @@ def handle_inspection(self, options):
extra_params['unique'] = True
if is_relation:
- rel_to = relations[i][1] == table_name and "'self'" or table2model(relations[i][1])
+ rel_to = "self" if relations[i][1] == table_name else table2model(relations[i][1])
if rel_to in known_models:
field_type = 'ForeignKey(%s' % rel_to
else:
1  tests/regressiontests/inspectdb/models.py
View
@@ -3,6 +3,7 @@
class People(models.Model):
name = models.CharField(max_length=255)
+ parent = models.ForeignKey('self')
class Message(models.Model):
from_field = models.ForeignKey(People, db_column='from_id')
2  tests/regressiontests/inspectdb/tests.py
View
@@ -31,6 +31,8 @@ def test_attribute_name_not_python_keyword(self):
stdout=out)
output = out.getvalue()
error_message = "inspectdb generated an attribute name which is a python keyword"
+ # Recursive foreign keys should be set to 'self'
+ self.assertIn("parent = models.ForeignKey('self')", output)
self.assertNotIn("from = models.ForeignKey(InspectdbPeople)", output, msg=error_message)
# As InspectdbPeople model is defined after InspectdbMessage, it should be quoted
self.assertIn("from_field = models.ForeignKey('InspectdbPeople', db_column='from_id')",
Please sign in to comment.
Something went wrong with that request. Please try again.