Author: ikelly
Date: 2011-04-16 11:43:01 -0700 (Sat, 16 Apr 2011)
New Revision: 16028
Modified:
django/branches/releases/1.3.X/
django/branches/releases/1.3.X/django/db/backends/creation.py
django/branches/releases/1.3.X/django/middleware/csrf.py
django/branches/releases/1.3.X/django/views/csrf.py
django/branches/releases/1.3.X/django/views/decorators/csrf.py
django/branches/releases/1.3.X/tests/regressiontests/csrf_tests/models.py
django/branches/releases/1.3.X/tests/regressiontests/csrf_tests/tests.py
Log:
[1.3.X] Fixed #15573: Forced the default site id to be 1 when creating
test databases, to prevent a large number of errors when running the
tests using the oracle backend. Backport of r16027 from trunk.
Property changes on: django/branches/releases/1.3.X
___________________________________________________________________
Modified: svnmerge-integrated
- /django/branches/newforms-admin:1-4314 /django/trunk:1-5600
+ /django/branches/newforms-admin:1-4314 /django/trunk:1-5600,16027
Added: svn:mergeinfo
+ /django/trunk:16027
Modified: django/branches/releases/1.3.X/django/db/backends/creation.py
===================================================================
--- django/branches/releases/1.3.X/django/db/backends/creation.py
2011-04-15 21:49:22 UTC (rev 16027)
+++ django/branches/releases/1.3.X/django/db/backends/creation.py
2011-04-16 18:43:01 UTC (rev 16028)
@@ -374,6 +374,14 @@
verbosity=max(verbosity - 1, 0),
interactive=False,
database=self.connection.alias)
+
+ # One effect of calling syncdb followed by flush is that the id of the
+ # default site may or may not be 1, depending on how the sequence was
+ # reset. If the sites app is loaded, then we coerce it.
+ from django.db.models import get_model
+ Site = get_model('sites', 'Site')
+ if Site is not None and
Site.objects.using(self.connection.alias).count() == 1:
+
Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
from django.core.cache import get_cache
from django.core.cache.backends.db import BaseDatabaseCache
Property changes on: django/branches/releases/1.3.X/django/middleware/csrf.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: django/branches/releases/1.3.X/django/views/csrf.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
django/branches/releases/1.3.X/django/views/decorators/csrf.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
django/branches/releases/1.3.X/tests/regressiontests/csrf_tests/models.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
django/branches/releases/1.3.X/tests/regressiontests/csrf_tests/tests.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@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.
