Ticket #10868: 10868.settings-dict-copy.2.diff

django/db/backends/creation.py

@@ -5 +5 @@
 
 # The prefix to put on the default database name when creating
 # the test database.
+from django.db.utils import load_backend
+
 TEST_DATABASE_PREFIX = 'test_'
 
 class BaseDatabaseCreation(object):
@@ -320 +322 @@
             if verbosity >= 2:
                 test_db_repr = " ('%s')" % test_database_name
             print "Destroying test database for alias '%s'%s..." % (self.connection.alias, test_db_repr)
-        self.connection.settings_dict['NAME'] = old_database_name
 
+        # Temporarily use a new thread-local connection and a thread-local
+        # copy of the settings dict. This prevents the production database from
+        # being exposed to potential child threads while the test database is
+        # being destroyed. Refs #10868.
+        original_connection = self.connection
+        settings_dict = original_connection.settings_dict.copy()
+        settings_dict['NAME'] = old_database_name
+        backend = load_backend(settings_dict['ENGINE'])
+        self.connection = backend.DatabaseWrapper(
+                              settings_dict,
+                              alias='__destroy_test_db__',
+                              allow_thread_sharing=False)
         self._destroy_test_db(test_database_name, verbosity)
+        self.connection = original_connection
 
     def _destroy_test_db(self, test_database_name, verbosity):
         "Internal implementation - remove the test db tables."

django/test/simple.py

@@ -312 +312 @@
         return unittest.TextTestRunner(verbosity=self.verbosity, failfast=self.failfast).run(suite)
 
     def teardown_databases(self, old_config, **kwargs):
-        from django.db import connections
+        """
+        Destroys all the non-mirror databases
+        """
         old_names, mirrors = old_config
-        # Point all the mirrors back to the originals
-        for alias, old_name in mirrors:
-            connections[alias].settings_dict['NAME'] = old_name
-        # Destroy all the non-mirror databases
         for connection, old_name, destroy in old_names:
             if destroy:
                 connection.creation.destroy_test_db(old_name, self.verbosity)
-            else:
-                connection.settings_dict['NAME'] = old_name
 
     def teardown_test_environment(self, **kwargs):
         unittest.removeHandler()