diff --git a/django/core/management.py b/django/core/management.py index f4f83e698a..1482da0ed5 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -411,16 +411,15 @@ def _install(app, commit=True, initial_data=True): models_installed = manager.get_installed_models(tables) for model in pending.keys(): + manager = model._default_manager if model in models_installed: for rel_class, f in pending[model]: - manager = model._default_manager for statement in manager.get_pending(rel_class, f): statement.execute() pending.pop(model) else: - raise Exception("%s is not installed, but there are " - "pending statements that need it: %s" - % (model, statements)) + raise Exception("%s is not installed, but it has pending " + "references" % model) except Exception, e: import traceback print traceback.format_exception(*sys.exc_info()) diff --git a/django/db/backends/ansi/sql.py b/django/db/backends/ansi/sql.py index d830e9ccb2..bd7f78d131 100644 --- a/django/db/backends/ansi/sql.py +++ b/django/db/backends/ansi/sql.py @@ -103,7 +103,8 @@ class SchemaBuilder(object): else: # We haven't yet created the table to which this field # is related, so save it for later. - pending.setdefault(f.rel.to, []).append((model, f)) + if backend.supports_constraints: + pending.setdefault(f.rel.to, []).append((model, f)) table_output.append(' '.join(field_output)) if opts.order_with_respect_to: table_output.append(style.SQL_FIELD(quote_name('_order')) + ' ' + \ @@ -124,8 +125,7 @@ class SchemaBuilder(object): create = [BoundStatement('\n'.join(full_statement), db.connection)] # Pull out any pending statements for me - if (pending and - backend.supports_constraints): + if pending: if model in pending: for rel_class, f in pending[model]: create.append(self.get_ref_sql(model, rel_class, f,