Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.1.X] Fixed #11623 -- Corrected table name quoting in db cache back…

…end. Thanks to Fraser Nevett for the report and fix.

Backport of r12410 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d4a34b5508a73c47d9e7220ee92dd7b8fb9e4262 1 parent a928216
@freakboy3742 freakboy3742 authored
View
2  django/core/cache/backends/db.py
@@ -12,7 +12,7 @@
class CacheClass(BaseCache):
def __init__(self, table, params):
BaseCache.__init__(self, params)
- self._table = table
+ self._table = connection.ops.quote_name(table)
max_entries = params.get('max_entries', 300)
try:
self._max_entries = int(max_entries)
View
4 django/core/management/commands/createcachetable.py
@@ -27,8 +27,8 @@ def handle_label(self, tablename, **options):
field_output.append("UNIQUE")
if f.db_index:
unique = f.unique and "UNIQUE " or ""
- index_output.append("CREATE %sINDEX %s_%s ON %s (%s);" % \
- (unique, tablename, f.name, qn(tablename),
+ index_output.append("CREATE %sINDEX %s ON %s (%s);" % \
+ (unique, qn('%s_%s' % (tablename, f.name)), qn(tablename),
qn(f.name)))
table_output.append(" ".join(field_output))
full_statement = ["CREATE TABLE %s (" % qn(tablename)]
View
8 tests/regressiontests/cache/tests.py
@@ -296,13 +296,15 @@ def test_long_timeout(self):
class DBCacheTests(unittest.TestCase, BaseCacheTests):
def setUp(self):
- management.call_command('createcachetable', 'test_cache_table', verbosity=0, interactive=False)
- self.cache = get_cache('db://test_cache_table')
+ # Spaces are used in the table name to ensure quoting/escaping is working
+ self._table_name = 'test cache table'
+ management.call_command('createcachetable', self._table_name, verbosity=0, interactive=False)
+ self.cache = get_cache('db://%s' % self._table_name)
def tearDown(self):
from django.db import connection
cursor = connection.cursor()
- cursor.execute('DROP TABLE test_cache_table');
+ cursor.execute('DROP TABLE %s' % connection.ops.quote_name(self._table_name))
class LocMemCacheTests(unittest.TestCase, BaseCacheTests):
def setUp(self):
Please sign in to comment.
Something went wrong with that request. Please try again.