Commit 50bf5676 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

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

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


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a128ce78

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -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>

django/core/management/commands/syncdb.py

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ class Command(NoArgsCommand): 
                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

django/core/management/sql.py

+2 −0
Original line number Diff line number Diff line
@@ -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)