Ticket #12286: 16329-apply-this-to-reproduce-proxy-model-inheritance-failure.diff

django/core/management/commands/syncdb.py

@@ -7 +7 @@
 from django.core.management.color import no_style
 from django.core.management.sql import custom_sql_for_model, emit_post_sync_signal
 from django.db import connections, router, transaction, models, DEFAULT_DB_ALIAS
-from django.utils.datastructures import SortedDict
 from django.utils.importlib import import_module
 
 
@@ -63 +62 @@
         pending_references = {}
 
         # Build the manifest of apps and models that are to be synchronized
-        all_models = [
+        manifest = dict(
             (app.__name__.split('.')[-2],
                 [m for m in models.get_models(app, include_auto_created=True)
                 if router.allow_syncdb(db, m)])
             for app in models.get_apps()
-        ]
-        def model_installed(model):
-            opts = model._meta
-            converter = connection.introspection.table_name_converter
-            return not ((converter(opts.db_table) in tables) or
-                (opts.auto_created and converter(opts.auto_created._meta.db_table) in tables))
-
-        manifest = SortedDict(
-            (app_name, filter(model_installed, model_list))
-            for app_name, model_list in all_models
         )
 
         # Create the tables for each model
@@ -88 +77 @@
                 # Create the model's database table, if it doesn't already exist.
                 if verbosity >= 3:
                     print "Processing %s.%s model" % (app_name, model._meta.object_name)
+                opts = model._meta
+                if (connection.introspection.table_name_converter(opts.db_table) in tables or
+                    (opts.auto_created and
+                    connection.introspection.table_name_converter(opts.auto_created._meta.db_table) in tables)):
+                    continue
                 sql, references = connection.creation.sql_create_model(model, self.style, seen_models)
                 seen_models.add(model)
                 created_models.add(model)