Changeset 7215

Timestamp:

03/10/08 17:18:50 (9 months ago)

Author:

jacob

Message:

Fixed #6374: cross-app and circular FK constraints are now detected and added correctly. Thanks, dready.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/management/commands/syncdb.py (modified) (1 diff)
• django/trunk/django/core/management/sql.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -113 +113 @@
-    Jordan Dimov <s3x3y1@gmail.com>
-    dne@mayonnaise.net
+    dready <wil@mojipage.com>
-    Maximillian Dornseif <md@hudora.de>
-    Jeremy Dunck <http://dunck.us/>

django/trunk/django/core/management/commands/syncdb.py

@@ -68 +68 @@
-                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:

django/trunk/django/core/management/sql.py

@@ -91 +91 @@
-        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.