From 3fc4f03895ae356a5861d0385de71e7a590811b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Thu, 29 May 2014 23:03:10 +0200 Subject: [PATCH] [1.7.x] Fixed #22749: Making SQL management commands migration aware. --- .../management/commands/sqlsequencereset.py | 2 ++ django/core/management/sql.py | 28 ++++++++++++++-- tests/commands_sql_migrations/__init__.py | 0 .../migrations/0001_initial.py | 33 +++++++++++++++++++ .../migrations/__init__.py | 0 tests/commands_sql_migrations/models.py | 10 ++++++ tests/commands_sql_migrations/tests.py | 2 +- 7 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 tests/commands_sql_migrations/__init__.py create mode 100644 tests/commands_sql_migrations/migrations/0001_initial.py create mode 100644 tests/commands_sql_migrations/migrations/__init__.py create mode 100644 tests/commands_sql_migrations/models.py diff --git a/django/core/management/commands/sqlsequencereset.py b/django/core/management/commands/sqlsequencereset.py index 9d25125efb..4f7ce4492a 100644 --- a/django/core/management/commands/sqlsequencereset.py +++ b/django/core/management/commands/sqlsequencereset.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from optparse import make_option from django.core.management.base import AppCommand +from django.core.management.sql import check_for_migrations from django.db import connections, DEFAULT_DB_ALIAS @@ -22,6 +23,7 @@ class Command(AppCommand): if app_config.models_module is None: return connection = connections[options.get('database')] + check_for_migrations(app_config, connection) models = app_config.get_models(include_auto_created=True) statements = connection.ops.sequence_reset_sql(self.style, models) return '\n'.join(statements) diff --git a/django/core/management/sql.py b/django/core/management/sql.py index 437f8737c3..323cb5423d 100644 --- a/django/core/management/sql.py +++ b/django/core/management/sql.py @@ -12,9 +12,19 @@ from django.db import models, router from django.utils.deprecation import RemovedInDjango19Warning +def check_for_migrations(app_config, connection): + # Inner import, else tests imports it too early as it needs settings + 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) + + def sql_create(app_config, style, connection): "Returns a list of the CREATE TABLE SQL statements for the given app." + check_for_migrations(app_config, connection) + if connection.settings_dict['ENGINE'] == 'django.db.backends.dummy': # This must be the "dummy" database backend, which means the user # hasn't set ENGINE for the database. @@ -58,9 +68,11 @@ def sql_create(app_config, style, connection): return final_output -def sql_delete(app_config, style, connection): +def sql_delete(app_config, style, connection, close_connection=True): "Returns a list of the DROP TABLE SQL statements for the given app." + check_for_migrations(app_config, connection) + # This should work even if a connection isn't available try: cursor = connection.cursor() @@ -97,7 +109,7 @@ def sql_delete(app_config, style, connection): finally: # Close database connection explicitly, in case this output is being piped # directly into a database client, to avoid locking issues. - if cursor: + if cursor and close_connection: cursor.close() connection.close() @@ -122,6 +134,9 @@ def sql_flush(style, connection, only_django=False, reset_sequences=True, allow_ def sql_custom(app_config, style, connection): "Returns a list of the custom table modifying SQL statements for the given app." + + check_for_migrations(app_config, connection) + output = [] app_models = router.get_migratable_models(app_config, connection.alias) @@ -134,6 +149,9 @@ def sql_custom(app_config, style, connection): def sql_indexes(app_config, style, connection): "Returns a list of the CREATE INDEX SQL statements for all models in the given app." + + check_for_migrations(app_config, connection) + output = [] for model in router.get_migratable_models(app_config, connection.alias, include_auto_created=True): output.extend(connection.creation.sql_indexes_for_model(model, style)) @@ -142,6 +160,9 @@ def sql_indexes(app_config, style, connection): def sql_destroy_indexes(app_config, style, connection): "Returns a list of the DROP INDEX SQL statements for all models in the given app." + + check_for_migrations(app_config, connection) + output = [] for model in router.get_migratable_models(app_config, connection.alias, include_auto_created=True): output.extend(connection.creation.sql_destroy_indexes_for_model(model, style)) @@ -149,6 +170,9 @@ def sql_destroy_indexes(app_config, style, connection): def sql_all(app_config, style, connection): + + check_for_migrations(app_config, connection) + "Returns a list of CREATE TABLE SQL, initial-data inserts, and CREATE INDEX SQL for the given module." return sql_create(app_config, style, connection) + sql_custom(app_config, style, connection) + sql_indexes(app_config, style, connection) diff --git a/tests/commands_sql_migrations/__init__.py b/tests/commands_sql_migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/commands_sql_migrations/migrations/0001_initial.py b/tests/commands_sql_migrations/migrations/0001_initial.py new file mode 100644 index 0000000000..39a53bf68f --- /dev/null +++ b/tests/commands_sql_migrations/migrations/0001_initial.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Comment', + fields=[ + ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Book', + fields=[ + ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)), + ('title', models.CharField(db_index=True, max_length=100)), + ('comments', models.ManyToManyField(to='commands_sql_migrations.Comment')), + ], + options={ + }, + bases=(models.Model,), + ), + ] diff --git a/tests/commands_sql_migrations/migrations/__init__.py b/tests/commands_sql_migrations/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/commands_sql_migrations/models.py b/tests/commands_sql_migrations/models.py new file mode 100644 index 0000000000..78ad722307 --- /dev/null +++ b/tests/commands_sql_migrations/models.py @@ -0,0 +1,10 @@ +from django.db import models + + +class Comment(models.Model): + pass + + +class Book(models.Model): + title = models.CharField(max_length=100, db_index=True) + comments = models.ManyToManyField(Comment) diff --git a/tests/commands_sql_migrations/tests.py b/tests/commands_sql_migrations/tests.py index e0fb3559cd..23b37a0f8f 100644 --- a/tests/commands_sql_migrations/tests.py +++ b/tests/commands_sql_migrations/tests.py @@ -20,7 +20,7 @@ class SQLCommandsMigrationsTestCase(TestCase): def test_sql_delete(self): app_config = apps.get_app_config('commands_sql_migrations') with self.assertRaises(CommandError): - sql_delete(app_config, no_style(), connections[DEFAULT_DB_ALIAS]) + sql_delete(app_config, no_style(), connections[DEFAULT_DB_ALIAS], close_connection=False) def test_sql_indexes(self): app_config = apps.get_app_config('commands_sql_migrations')