summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-02-11 12:21:46 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-02-11 12:21:46 +0000
commitab828da2b91c71987ef23baee4a1613fdb330c5f (patch)
tree2561aef8aeac5a1273dac528cdf94c3ec8ccda02 /django
parent4d2f489bca6b1807724f4b619d70ae8d6d1bda08 (diff)
Fixed #11623 -- Corrected table name quoting in db cache backend. Thanks to Fraser Nevett for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/core/cache/backends/db.py2
-rw-r--r--django/core/management/commands/createcachetable.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py
index dd18cd6b1d..25cbe4d236 100644
--- a/django/core/cache/backends/db.py
+++ b/django/core/cache/backends/db.py
@@ -12,7 +12,7 @@ except ImportError:
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)
diff --git a/django/core/management/commands/createcachetable.py b/django/core/management/commands/createcachetable.py
index c0d3cb8219..90172b6ca3 100644
--- a/django/core/management/commands/createcachetable.py
+++ b/django/core/management/commands/createcachetable.py
@@ -38,8 +38,8 @@ class Command(LabelCommand):
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)]