diff options
| author | Tim Graham <timograham@gmail.com> | 2015-11-13 11:28:20 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-01-19 07:07:56 -0500 |
| commit | f0da306af186c121c0e339342f60d29552bf8c1a (patch) | |
| tree | a87d75d2b4bce06666df39ea4197ad4380ba555f | |
| parent | 0911c356783d8223870ea766f13a9b9ee75a62b5 (diff) | |
[1.9.x] Fixed #26096, refs #25196 -- Fixed incorrect argument order in test database creation.
Backport of abcdb237bb313d116ce2ac8e90f79f61429afc70 from master
| -rw-r--r-- | django/db/backends/mysql/creation.py | 2 | ||||
| -rw-r--r-- | django/db/backends/postgresql/creation.py | 2 | ||||
| -rw-r--r-- | docs/releases/1.9.2.txt | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/django/db/backends/mysql/creation.py b/django/db/backends/mysql/creation.py index 43857f07ea..ae4370935a 100644 --- a/django/db/backends/mysql/creation.py +++ b/django/db/backends/mysql/creation.py @@ -31,7 +31,7 @@ class DatabaseCreation(BaseDatabaseCreation): try: if verbosity >= 1: print("Destroying old test database for alias %s..." % ( - self._get_database_display_str(target_database_name, verbosity), + self._get_database_display_str(verbosity, target_database_name), )) cursor.execute("DROP DATABASE %s" % qn(target_database_name)) cursor.execute("CREATE DATABASE %s" % qn(target_database_name)) diff --git a/django/db/backends/postgresql/creation.py b/django/db/backends/postgresql/creation.py index 2a886bae3c..3efcfc7692 100644 --- a/django/db/backends/postgresql/creation.py +++ b/django/db/backends/postgresql/creation.py @@ -33,7 +33,7 @@ class DatabaseCreation(BaseDatabaseCreation): try: if verbosity >= 1: print("Destroying old test database for alias %s..." % ( - self._get_database_display_str(target_database_name, verbosity), + self._get_database_display_str(verbosity, target_database_name), )) cursor.execute("DROP DATABASE %s" % qn(target_database_name)) cursor.execute("CREATE DATABASE %s WITH TEMPLATE %s" % ( diff --git a/docs/releases/1.9.2.txt b/docs/releases/1.9.2.txt index 0ca7481ff8..9e13e705bc 100644 --- a/docs/releases/1.9.2.txt +++ b/docs/releases/1.9.2.txt @@ -34,4 +34,7 @@ Bugfixes * Fixed a regression where defining a relation on an abstract model's field using a string model name without an app_label no longer resolved that reference to the abstract model's app if using that model in another - application (:ticket:`25858`).
\ No newline at end of file + application (:ticket:`25858`). + +* Fixed a crash when destroying an existing test database on MySQL or + PostgreSQL (:ticket:`26096`). |