Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixes #2658 -- Modified SQLite cursor close() method for in-memory da…

…tabases, making the lifespan of an in-memory database equal to the life of the process, rather than the life of the cursor. Thanks, Ned Batchelder.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6f87b17a0d0da75767d0bbf05d52f787e897c599 1 parent 6417d6c
@freakboy3742 freakboy3742 authored
Showing with 8 additions and 4 deletions.
  1. +4 −1 django/db/backends/sqlite3/base.py
  2. +4 −3 django/test/utils.py
View
5 django/db/backends/sqlite3/base.py
@@ -62,7 +62,10 @@ def _rollback(self):
self.connection.rollback()
def close(self):
- if self.connection is not None:
+ from django.conf import settings
+ # If database is in memory, closing the connection destroys the database.
+ # To prevent accidental data loss, ignore close requests on an in-memory db.
+ if self.connection is not None and settings.DATABASE_NAME != ":memory:":
self.connection.close()
self.connection = None
View
7 django/test/utils.py
@@ -95,10 +95,11 @@ def destroy_test_db(old_database_name, verbosity=1):
# connected to it.
if verbosity >= 1:
print "Destroying test database..."
+ connection.close()
+ TEST_DATABASE_NAME = settings.DATABASE_NAME
+ settings.DATABASE_NAME = old_database_name
+
if settings.DATABASE_ENGINE != "sqlite3":
- connection.close()
- TEST_DATABASE_NAME = settings.DATABASE_NAME
- settings.DATABASE_NAME = old_database_name
cursor = connection.cursor()
_set_autocommit(connection)
time.sleep(1) # To avoid "database is being accessed by other users" errors.
Please sign in to comment.
Something went wrong with that request. Please try again.