summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2011-02-14 00:07:09 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2011-02-14 00:07:09 +0000
commit756f1c218dcbcb6c593fc0631149d39d47f2ada8 (patch)
tree3078ba4ac181c9edda504032fe1a23c68b5919ef
parent7e46b170007dd7b9a95e845cbb971d4eb170e317 (diff)
Fixed #15293 -- Updated the dummy backend to support the APIs introduced by r15493. Thanks to mp for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/backends/dummy/base.py32
1 files changed, 19 insertions, 13 deletions
diff --git a/django/db/backends/dummy/base.py b/django/db/backends/dummy/base.py
index 8a32a62aba..04a8d850bf 100644
--- a/django/db/backends/dummy/base.py
+++ b/django/db/backends/dummy/base.py
@@ -35,26 +35,32 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
get_relations = complain
get_indexes = complain
-class DatabaseWrapper(object):
+class DatabaseWrapper(BaseDatabaseWrapper):
operators = {}
- cursor = complain
+ # Override the base class implementations with null
+ # implementations. Anything that tries to actually
+ # do something raises complain; anything that tries
+ # to rollback or undo something raises ignore.
_commit = complain
_rollback = ignore
+ enter_transaction_management = complain
+ leave_transaction_management = ignore
+ set_dirty = complain
+ set_clean = complain
+ commit_unless_managed = complain
+ rollback_unless_managed = ignore
+ savepoint = ignore
+ savepoint_commit = complain
+ savepoint_rollback = ignore
+ close = ignore
+ cursor = complain
+
+ def __init__(self, *args, **kwargs):
+ super(DatabaseWrapper, self).__init__(*args, **kwargs)
- def __init__(self, settings_dict, alias, *args, **kwargs):
self.features = BaseDatabaseFeatures(self)
self.ops = DatabaseOperations()
self.client = DatabaseClient(self)
self.creation = BaseDatabaseCreation(self)
self.introspection = DatabaseIntrospection(self)
self.validation = BaseDatabaseValidation(self)
-
- self.settings_dict = settings_dict
- self.alias = alias
-
- self.transaction_state = []
- self.savepoint_state = 0
- self.dirty = None
-
- def close(self):
- pass