Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #6374: cross-app and circular FK constraints are now detected a…

…nd added correctly. Thanks, dready.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 50bf56767531e1f29e000d039237ad1149d46bad 1 parent a128ce7
@jacobian jacobian authored
View
1  AUTHORS
@@ -112,6 +112,7 @@ answer newbie questions, and generally made Django that much better:
Sander Dijkhuis <sander.dijkhuis@gmail.com>
Jordan Dimov <s3x3y1@gmail.com>
dne@mayonnaise.net
+ dready <wil@mojipage.com>
Maximillian Dornseif <md@hudora.de>
Jeremy Dunck <http://dunck.us/>
Andrew Durdin <adurdin@gmail.com>
View
2  django/core/management/commands/syncdb.py
@@ -67,6 +67,8 @@ def handle_noargs(self, **options):
created_models.add(model)
for refto, refs in references.items():
pending_references.setdefault(refto, []).extend(refs)
+ if refto in seen_models:
+ sql.extend(sql_for_pending_references(refto, self.style, pending_references))
sql.extend(sql_for_pending_references(model, self.style, pending_references))
if verbosity >= 1:
print "Creating table %s" % model._meta.db_table
View
2  django/core/management/sql.py
@@ -90,6 +90,8 @@ def sql_create(app, style):
final_output.extend(output)
for refto, refs in references.items():
pending_references.setdefault(refto, []).extend(refs)
+ if refto in known_models:
+ final_output.extend(sql_for_pending_references(refto, style, pending_references))
final_output.extend(sql_for_pending_references(model, style, pending_references))
# Keep track of the fact that we've created the table for this model.
known_models.add(model)
Please sign in to comment.
Something went wrong with that request. Please try again.