summaryrefslogtreecommitdiff
path: root/django/db/backends/sqlite3
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2015-07-30 13:56:54 +0300
committerTim Graham <timograham@gmail.com>2015-09-25 10:32:05 -0400
commit50ccedae98742ae0d9dfb5d7c268ee2e2a096e34 (patch)
treecafa2a1f95b13da8861957491b61f8fc2fce3b2a /django/db/backends/sqlite3
parentf2f4f1cfff80244be628f24c46ab7ab0e91a11c4 (diff)
[1.9.x] Fixed #25196 -- Normalized database representations in test database messages.
Left over Oracle mostly as-is since it's more complicated. Backport of afe777639cc1c591df32591e196d4cda5783c615 from master
Diffstat (limited to 'django/db/backends/sqlite3')
-rw-r--r--django/db/backends/sqlite3/creation.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/django/db/backends/sqlite3/creation.py b/django/db/backends/sqlite3/creation.py
index d52349e57f..a6e3155aa8 100644
--- a/django/db/backends/sqlite3/creation.py
+++ b/django/db/backends/sqlite3/creation.py
@@ -30,7 +30,9 @@ class DatabaseCreation(BaseDatabaseCreation):
if not self.connection.is_in_memory_db(test_database_name):
# Erase the old test database
if verbosity >= 1:
- print("Destroying old test database '%s'..." % self.connection.alias)
+ print("Destroying old test database for alias %s..." % (
+ self._get_database_display_str(verbosity, test_database_name),
+ ))
if os.access(test_database_name, os.F_OK):
if not autoclobber:
confirm = input(
@@ -69,7 +71,9 @@ class DatabaseCreation(BaseDatabaseCreation):
if keepdb:
return
if verbosity >= 1:
- print("Destroying old test database '%s'..." % target_database_name)
+ print("Destroying old test database for alias %s..." % (
+ self._get_database_display_str(verbosity, target_database_name),
+ ))
try:
os.remove(target_database_name)
except Exception as e: