From d0eb4693ab479ef0667cd5286ecc89c347b6b2de Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sat, 19 Nov 2011 19:56:31 +0000 Subject: [PATCH] Fixed #15255 -- Ensured createcachetable honors database routers. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17114 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../gis/db/backends/spatialite/creation.py | 4 +- .../management/commands/createcachetable.py | 12 ++++-- django/db/backends/creation.py | 4 +- tests/regressiontests/cache/tests.py | 39 +++++++++++++++++++ 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/django/contrib/gis/db/backends/spatialite/creation.py b/django/contrib/gis/db/backends/spatialite/creation.py index ee5f9db336..03ea45da44 100644 --- a/django/contrib/gis/db/backends/spatialite/creation.py +++ b/django/contrib/gis/db/backends/spatialite/creation.py @@ -61,9 +61,7 @@ class SpatiaLiteCreation(DatabaseCreation): 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. diff --git a/django/core/management/commands/createcachetable.py b/django/core/management/commands/createcachetable.py index a6628a039a..287a036819 100644 --- a/django/core/management/commands/createcachetable.py +++ b/django/core/management/commands/createcachetable.py @@ -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 @@ class Command(LabelCommand): 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) diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py index f03df5d380..ce1da6d4c4 100644 --- a/django/db/backends/creation.py +++ b/django/db/backends/creation.py @@ -255,9 +255,7 @@ class BaseDatabaseCreation(object): 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. diff --git a/tests/regressiontests/cache/tests.py b/tests/regressiontests/cache/tests.py index f1590d1121..5f9676beb6 100644 --- a/tests/regressiontests/cache/tests.py +++ b/tests/regressiontests/cache/tests.py @@ -16,6 +16,7 @@ from django.core import management 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 @@ class DBCacheTests(unittest.TestCase, BaseCacheTests): 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'