summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2020-04-19 22:49:35 -0700
committerGitHub <noreply@github.com>2020-04-20 07:49:35 +0200
commit5673d4b10240b1b00bdf060fb7ac6bef858f38a3 (patch)
tree5460e7da724ef28add04c1195ee61b24a2028fbb
parent661e39c8d5bb05d8ebe8492912bf9f63453b279f (diff)
Fixed #31477 -- Removed "using" argument from DatabaseOperations.execute_sql_flush().
-rw-r--r--django/core/management/commands/flush.py2
-rw-r--r--django/db/backends/base/operations.py7
-rw-r--r--docs/releases/3.1.txt4
-rw-r--r--tests/backends/base/test_operations.py2
-rw-r--r--tests/backends/tests.py2
5 files changed, 12 insertions, 5 deletions
diff --git a/django/core/management/commands/flush.py b/django/core/management/commands/flush.py
index e8ed3967f7..bc8021cf4e 100644
--- a/django/core/management/commands/flush.py
+++ b/django/core/management/commands/flush.py
@@ -60,7 +60,7 @@ Are you sure you want to do this?
if confirm == 'yes':
try:
- connection.ops.execute_sql_flush(database, sql_list)
+ connection.ops.execute_sql_flush(sql_list)
except Exception as exc:
raise CommandError(
"Database %s couldn't be flushed. Possible reasons:\n"
diff --git a/django/db/backends/base/operations.py b/django/db/backends/base/operations.py
index 70ac07ae09..305306e8ce 100644
--- a/django/db/backends/base/operations.py
+++ b/django/db/backends/base/operations.py
@@ -400,9 +400,12 @@ class BaseDatabaseOperations:
"""
raise NotImplementedError('subclasses of BaseDatabaseOperations must provide a sql_flush() method')
- def execute_sql_flush(self, using, sql_list):
+ def execute_sql_flush(self, sql_list):
"""Execute a list of SQL statements to flush the database."""
- with transaction.atomic(using=using, savepoint=self.connection.features.can_rollback_ddl):
+ with transaction.atomic(
+ using=self.connection.alias,
+ savepoint=self.connection.features.can_rollback_ddl,
+ ):
with self.connection.cursor() as cursor:
for sql in sql_list:
cursor.execute(sql)
diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt
index 3ec3afcf3a..4cf8183d4b 100644
--- a/docs/releases/3.1.txt
+++ b/docs/releases/3.1.txt
@@ -526,6 +526,10 @@ backends.
* The ``allow_cascade`` argument of ``DatabaseOperations.sql_flush()`` is now a
keyword-only argument.
+* The ``using`` positional argument of
+ ``DatabaseOperations.execute_sql_flush()`` is removed. The method now uses
+ the database of the called instance.
+
Dropped support for MariaDB 10.1
--------------------------------
diff --git a/tests/backends/base/test_operations.py b/tests/backends/base/test_operations.py
index 0485fe8465..b0ffe958c8 100644
--- a/tests/backends/base/test_operations.py
+++ b/tests/backends/base/test_operations.py
@@ -172,7 +172,7 @@ class SqlFlushTests(TransactionTestCase):
reset_sequences=True,
allow_cascade=True,
)
- connection.ops.execute_sql_flush(connection.alias, sql_list)
+ connection.ops.execute_sql_flush(sql_list)
with transaction.atomic():
self.assertIs(Author.objects.exists(), False)
diff --git a/tests/backends/tests.py b/tests/backends/tests.py
index d6c2331378..40fc6de7fc 100644
--- a/tests/backends/tests.py
+++ b/tests/backends/tests.py
@@ -162,7 +162,7 @@ class LongNameTest(TransactionTestCase):
VLM_m2m._meta.db_table,
]
sql_list = connection.ops.sql_flush(no_style(), tables, reset_sequences=True)
- connection.ops.execute_sql_flush(connection.alias, sql_list)
+ connection.ops.execute_sql_flush(sql_list)
class SequenceResetTest(TestCase):