Ticket #14415: 14415.1.diff

django/db/backends/creation.py

@@ -19 +19 @@
 
     def __init__(self, connection):
         self.connection = connection
+        self.test_database_name = None
 
     def _digest(self, *args):
         """
@@ -343 +344 @@
         if verbosity >= 1:
             print "Creating test database '%s'..." % self.connection.alias
 
-        test_database_name = self._create_test_db(verbosity, autoclobber)
+        self.test_database_name = self._create_test_db(verbosity, autoclobber)
 
         self.connection.close()
-        self.connection.settings_dict["NAME"] = test_database_name
+        self.connection.settings_dict['NAME'] = self.test_database_name
 
         # Confirm the feature set of the test database
         self.connection.features.confirm()
@@ -367 +368 @@
         # the side effect of initializing the test database.
         cursor = self.connection.cursor()
 
-        return test_database_name
+        return self.test_database_name
 
     def _create_test_db(self, verbosity, autoclobber):
         "Internal implementation - creates the test db tables."
@@ -414 +415 @@
         if verbosity >= 1:
             print "Destroying test database '%s'..." % self.connection.alias
         self.connection.close()
-        test_database_name = self.connection.settings_dict['NAME']
+        test_database_name = self.test_database_name
         self.connection.settings_dict['NAME'] = old_database_name
 
         self._destroy_test_db(test_database_name, verbosity)
@@ -428 +429 @@
         cursor = self.connection.cursor()
         self.set_autocommit()
         time.sleep(1) # To avoid "database is being accessed by other users" errors.
-        cursor.execute("DROP DATABASE %s" % self.connection.ops.quote_name(test_database_name))
+        cursor.execute("DROP DATABASE IF EXISTS %s" % self.connection.ops.quote_name(test_database_name))
         self.connection.close()
 
     def set_autocommit(self):

django/db/backends/sqlite3/creation.py

@@ -61 +61 @@
         return test_database_name
 
     def _destroy_test_db(self, test_database_name, verbosity):
-        if test_database_name and test_database_name != ":memory:":
+        if test_database_name and test_database_name != ":memory:" and os.access(test_database_name, os.F_OK):
             # Remove the SQLite database file
             os.remove(test_database_name)