Author: russellm
Date: 2009-12-23 23:57:43 -0600 (Wed, 23 Dec 2009)
New Revision: 11974
Modified:
django/trunk/django/db/backends/dummy/base.py
django/trunk/django/db/utils.py
Log:
Fixed #12428: Ensured that the dummy backend is installed correctly on a fresh
project generated by django-admin.py startproject. Thanks to Simon for the
report.
Modified: django/trunk/django/db/backends/dummy/base.py
===================================================================
--- django/trunk/django/db/backends/dummy/base.py 2009-12-24 05:35:43 UTC
(rev 11973)
+++ django/trunk/django/db/backends/dummy/base.py 2009-12-24 05:57:43 UTC
(rev 11974)
@@ -41,13 +41,16 @@
_commit = complain
_rollback = ignore
- def __init__(self, *args, **kwargs):
+ def __init__(self, settings_dict, alias, *args, **kwargs):
self.features = BaseDatabaseFeatures()
self.ops = DatabaseOperations()
self.client = DatabaseClient(self)
self.creation = BaseDatabaseCreation(self)
self.introspection = DatabaseIntrospection(self)
- self.validation = BaseDatabaseValidation()
+ self.validation = BaseDatabaseValidation(self)
+ self.settings_dict = settings_dict
+ self.alias = alias
+
def close(self):
pass
Modified: django/trunk/django/db/utils.py
===================================================================
--- django/trunk/django/db/utils.py 2009-12-24 05:35:43 UTC (rev 11973)
+++ django/trunk/django/db/utils.py 2009-12-24 05:57:43 UTC (rev 11974)
@@ -55,7 +55,9 @@
conn = self.databases[alias]
except KeyError:
raise ConnectionDoesNotExist("The connection %s doesn't exist" %
alias)
- conn.setdefault('ENGINE', 'dummy')
+ conn.setdefault('ENGINE', 'django.db.backends.dummy')
+ if conn['ENGINE'] == 'django.db.backends.':
+ conn['ENGINE'] = 'django.db.backends.dummy'
conn.setdefault('OPTIONS', {})
conn.setdefault('TEST_CHARSET', None)
conn.setdefault('TEST_COLLATION', None)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
