Removed support for custom SQL per deprecation timeline. (4aa089a9) · Commits · Dom Sekotill / django

django/core/management/init.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ class ManagementUtility(object):
		subcommand_cls = self.fetch_command(cwords[0])
		# special case: add the names of installed apps to options
		if cwords[0] in ('dumpdata', 'sql', 'sqlall', 'sqlclear',
		'sqlcustom', 'sqlindexes', 'sqlmigrate', 'sqlsequencereset', 'test'):
		'sqlindexes', 'sqlmigrate', 'sqlsequencereset', 'test'):
		try:
		app_configs = apps.get_app_configs()
		# Get the last part of the dotted path as the app name.

django/core/management/commands/inspectdb.py

+0 −3

Original line number	Diff line number	Diff line
		@@ -45,9 +45,6 @@ class Command(BaseCommand):
		"Django to create, modify, and delete the table"
		)
		yield "# Feel free to rename the models, but don't rename db_table values or field names."
		yield "#"
		yield "# Also note: You'll have to insert the output of 'django-admin sqlcustom [app_label]'"
		yield "# into your database."
		yield "from __future__ import unicode_literals"
		yield ''
		yield 'from %s import models' % self.db_module

django/core/management/commands/migrate.py

+2 −54

Original line number	Diff line number	Diff line
		@@ -4,14 +4,12 @@ from __future__ import unicode_literals
		from collections import OrderedDict
		from importlib import import_module
		import time
		import traceback
		import warnings

		from django.apps import apps
		from django.core.management import call_command
		from django.core.management.base import BaseCommand, CommandError
		from django.core.management.color import no_style
		from django.core.management.sql import custom_sql_for_model, emit_post_migrate_signal, emit_pre_migrate_signal
		from django.core.management.sql import emit_post_migrate_signal, emit_pre_migrate_signal
		from django.db import connections, router, transaction, DEFAULT_DB_ALIAS
		from django.db.migrations.executor import MigrationExecutor
		from django.db.migrations.loader import AmbiguityError
		@@ -47,7 +45,6 @@ class Command(BaseCommand):

		self.verbosity = options.get('verbosity')
		self.interactive = options.get('interactive')
		self.show_traceback = options.get('traceback')

		# Import the 'management' module within each installed app, to register
		# dispatcher events.
		@@ -73,7 +70,7 @@ class Command(BaseCommand):
		no_color=options.get('no_color'),
		settings=options.get('settings'),
		stdout=self.stdout,
		traceback=self.show_traceback,
		traceback=options.get('traceback'),
		verbosity=self.verbosity,
		)

		@@ -167,18 +164,6 @@ class Command(BaseCommand):
		self.stdout.write(self.style.MIGRATE_HEADING("Synchronizing apps without migrations:"))
		self.sync_apps(connection, executor.loader.unmigrated_apps)

		# The test runner requires us to flush after a syncdb but before migrations,
		# so do that here.
		if options.get("test_flush", False):
		call_command(
		'flush',
		verbosity=max(self.verbosity - 1, 0),
		interactive=False,
		database=db,
		reset_sequences=False,
		inhibit_post_migrate=True,
		)

		# Migrate!
		if self.verbosity >= 1:
		self.stdout.write(self.style.MIGRATE_HEADING("Running migrations:"))
		@@ -299,41 +284,4 @@ class Command(BaseCommand):
		finally:
		cursor.close()

		# The connection may have been closed by a syncdb handler.
		cursor = connection.cursor()
		try:
		# Install custom SQL for the app (but only if this
		# is a model we've just created)
		if self.verbosity >= 1:
		self.stdout.write(" Installing custom SQL...\n")
		for app_name, model_list in manifest.items():
		for model in model_list:
		if model in created_models:
		custom_sql = custom_sql_for_model(model, no_style(), connection)
		if custom_sql:
		if self.verbosity >= 2:
		self.stdout.write(
		" Installing custom SQL for %s.%s model\n" %
		(app_name, model._meta.object_name)
		)
		try:
		with transaction.atomic(using=connection.alias):
		for sql in custom_sql:
		cursor.execute(sql)
		except Exception as e:
		self.stderr.write(
		" Failed to install custom SQL for %s.%s model: %s\n"
		% (app_name, model._meta.object_name, e)
		)
		if self.show_traceback:
		traceback.print_exc()
		else:
		if self.verbosity >= 3:
		self.stdout.write(
		" No custom SQL for %s.%s model\n" %
		(app_name, model._meta.object_name)
		)
		finally:
		cursor.close()

		return created_models

django/core/management/commands/sqlall.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ from django.db import connections, DEFAULT_DB_ALIAS


		class Command(AppCommand):
		help = "Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s)."
		help = "Prints the CREATE TABLE and CREATE INDEX SQL statements for the given model module name(s)."

		output_transaction = True

django/core/management/commands/sqlcustom.py

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		from __future__ import unicode_literals

		from django.core.management.base import AppCommand
		from django.core.management.sql import sql_custom
		from django.db import connections, DEFAULT_DB_ALIAS


		class Command(AppCommand):
		help = "Prints the custom table modifying SQL statements for the given app name(s)."

		output_transaction = True

		def add_arguments(self, parser):
		super(Command, self).add_arguments(parser)
		parser.add_argument('--database', default=DEFAULT_DB_ALIAS,
		help='Nominates a database to print the SQL for. Defaults to the '
		'"default" database.')

		def handle_app_config(self, app_config, **options):
		if app_config.models_module is None:
		return
		connection = connections[options['database']]
		statements = sql_custom(app_config, self.style, connection)
		return '\n'.join(statements)