Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #15255 -- Ensured createcachetable honors database routers.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d0eb4693ab479ef0667cd5286ecc89c347b6b2de 1 parent c8c7105
Aymeric Augustin aaugustin authored
4 django/contrib/gis/db/backends/spatialite/creation.py
View
@@ -61,9 +61,7 @@ def create_test_db(self, verbosity=1, autoclobber=False):
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.
12 django/core/management/commands/createcachetable.py
View
@@ -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 @@ class Command(LabelCommand):
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 @@ def handle_label(self, tablename, **options):
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)
4 django/db/backends/creation.py
View
@@ -255,9 +255,7 @@ def create_test_db(self, verbosity=1, autoclobber=False):
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.
39 tests/regressiontests/cache/tests.py
View
@@ -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 @@ def test_old_initialization(self):
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'
Please sign in to comment.
Something went wrong with that request. Please try again.