summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-05-29 15:34:35 -0700
committerAndrew Godwin <andrew@aeracode.org>2014-05-29 15:36:49 -0700
commit4956e182ac207437eaf182f076de6717ee00843c (patch)
tree0c1cfef0aed4310efb50377e84ca33d75a531cd1
parentb6a960cd1df4a191fc2900bcaa76c73f2696fc4d (diff)
[1.7.x] Fix test failure caused by 3149cdce32e7261b2d44128ab712c4d4f1a5d429
-rw-r--r--django/core/management/sql.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/management/sql.py b/django/core/management/sql.py
index 02bc2603ce..721afb2d04 100644
--- a/django/core/management/sql.py
+++ b/django/core/management/sql.py
@@ -9,11 +9,12 @@ from django.apps import apps
from django.conf import settings
from django.core.management.base import CommandError
from django.db import models, router
-from django.db.migrations.loader import MigrationLoader
from django.utils.deprecation import RemovedInDjango19Warning
def check_for_migrations(app_config, connection):
+ # Inner import to stop tests failing
+ from django.db.migrations.loader import MigrationLoader
loader = MigrationLoader(connection)
if app_config.label in loader.migrated_apps:
raise CommandError("App '%s' has migrations. Only the sqlmigrate and sqlflush commands can be used when an app has migrations." % app_config.label)