Author: aaugustin
Date: 2011-11-19 11:56:31 -0800 (Sat, 19 Nov 2011)
New Revision: 17114
Modified:
django/trunk/django/contrib/gis/db/backends/spatialite/creation.py
django/trunk/django/core/management/commands/createcachetable.py
django/trunk/django/db/backends/creation.py
django/trunk/tests/regressiontests/cache/tests.py
Log:
Fixed #15255 -- Ensured createcachetable honors database routers.
Modified: django/trunk/django/contrib/gis/db/backends/spatialite/creation.py
===================================================================
--- django/trunk/django/contrib/gis/db/backends/spatialite/creation.py
2011-11-19 15:08:07 UTC (rev 17113)
+++ django/trunk/django/contrib/gis/db/backends/spatialite/creation.py
2011-11-19 19:56:31 UTC (rev 17114)
@@ -61,9 +61,7 @@
for cache_alias in settings.CACHES:
cache = get_cache(cache_alias)
if isinstance(cache, BaseDatabaseCache):
- from django.db import router
- if router.allow_syncdb(self.connection.alias,
cache.cache_model_class):
- call_command('createcachetable', cache._table,
database=self.connection.alias)
+ call_command('createcachetable', cache._table,
database=self.connection.alias)
# Get a cursor (even though we don't need one yet). This has
# the side effect of initializing the test database.
Modified: django/trunk/django/core/management/commands/createcachetable.py
===================================================================
--- django/trunk/django/core/management/commands/createcachetable.py
2011-11-19 15:08:07 UTC (rev 17113)
+++ django/trunk/django/core/management/commands/createcachetable.py
2011-11-19 19:56:31 UTC (rev 17114)
@@ -1,7 +1,8 @@
from optparse import make_option
+from django.core.cache.backends.db import BaseDatabaseCache
from django.core.management.base import LabelCommand
-from django.db import connections, transaction, models, DEFAULT_DB_ALIAS
+from django.db import connections, router, transaction, models,
DEFAULT_DB_ALIAS
class Command(LabelCommand):
help = "Creates the table needed to use the SQL cache backend."
@@ -18,8 +19,11 @@
requires_model_validation = False
def handle_label(self, tablename, **options):
- alias = options.get('database')
- connection = connections[alias]
+ db = options.get('database', DEFAULT_DB_ALIAS)
+ cache = BaseDatabaseCache(tablename, {})
+ if not router.allow_syncdb(db, cache.cache_model_class):
+ return
+ connection = connections[db]
fields = (
# "key" is a reserved word in MySQL, so use "cache_key" instead.
models.CharField(name='cache_key', max_length=255, unique=True,
primary_key=True),
@@ -50,4 +54,4 @@
curs.execute("\n".join(full_statement))
for statement in index_output:
curs.execute(statement)
- transaction.commit_unless_managed(using=alias)
+ transaction.commit_unless_managed(using=db)
Modified: django/trunk/django/db/backends/creation.py
===================================================================
--- django/trunk/django/db/backends/creation.py 2011-11-19 15:08:07 UTC (rev
17113)
+++ django/trunk/django/db/backends/creation.py 2011-11-19 19:56:31 UTC (rev
17114)
@@ -255,9 +255,7 @@
for cache_alias in settings.CACHES:
cache = get_cache(cache_alias)
if isinstance(cache, BaseDatabaseCache):
- from django.db import router
- if router.allow_syncdb(self.connection.alias,
cache.cache_model_class):
- call_command('createcachetable', cache._table,
database=self.connection.alias)
+ call_command('createcachetable', cache._table,
database=self.connection.alias)
# Get a cursor (even though we don't need one yet). This has
# the side effect of initializing the test database.
Modified: django/trunk/tests/regressiontests/cache/tests.py
===================================================================
--- django/trunk/tests/regressiontests/cache/tests.py 2011-11-19 15:08:07 UTC
(rev 17113)
+++ django/trunk/tests/regressiontests/cache/tests.py 2011-11-19 19:56:31 UTC
(rev 17114)
@@ -16,6 +16,7 @@
from django.core.cache import get_cache, DEFAULT_CACHE_ALIAS
from django.core.cache.backends.base import (CacheKeyWarning,
InvalidCacheBackendError)
+from django.db import router
from django.http import HttpResponse, HttpRequest, QueryDict
from django.middleware.cache import (FetchFromCacheMiddleware,
UpdateCacheMiddleware, CacheMiddleware)
@@ -775,6 +776,44 @@
self.perform_cull_test(50, 18)
+class DBCacheRouter(object):
+ """A router that puts the cache table on the 'other' database."""
+
+ def db_for_read(self, model, **hints):
+ if model._meta.app_label == 'django_cache':
+ return 'other'
+
+ def db_for_write(self, model, **hints):
+ if model._meta.app_label == 'django_cache':
+ return 'other'
+
+ def allow_syncdb(self, db, model):
+ if model._meta.app_label == 'django_cache':
+ return db == 'other'
+
+
+class CreateCacheTableForDBCacheTests(TestCase):
+ multi_db = True
+
+ def test_createcachetable_observes_database_router(self):
+ old_routers = router.routers
+ try:
+ router.routers = [DBCacheRouter()]
+ # cache table should not be created on 'default'
+ with self.assertNumQueries(0, using='default'):
+ management.call_command('createcachetable', 'cache_table',
+ database='default',
+ verbosity=0, interactive=False)
+ # cache table should be created on 'other'
+ # one query is used to create the table and another one the index
+ with self.assertNumQueries(2, using='other'):
+ management.call_command('createcachetable', 'cache_table',
+ database='other',
+ verbosity=0, interactive=False)
+ finally:
+ router.routers = old_routers
+
+
class LocMemCacheTests(unittest.TestCase, BaseCacheTests):
backend_name = 'django.core.cache.backends.locmem.LocMemCache'
--
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.
