summaryrefslogtreecommitdiff
path: root/django/db/backends/mysql/schema.py
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-05-20 15:41:01 +0100
committerAndrew Godwin <andrew@aeracode.org>2014-05-20 15:41:01 +0100
commit125b3d440761efca8fa808a4b815384ece847d6a (patch)
tree85baa1910a70dea8ce587d9e3e004079bf55173d /django/db/backends/mysql/schema.py
parent4e32e47348473757280ca7a8d78edf6011fe65a3 (diff)
downloaddjango-125b3d440761efca8fa808a4b815384ece847d6a.tar.gz
Fixed #22649: Beefed up quote_value
Diffstat (limited to 'django/db/backends/mysql/schema.py')
-rw-r--r--django/db/backends/mysql/schema.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/django/db/backends/mysql/schema.py b/django/db/backends/mysql/schema.py
index df5f3b7fcd..4efe008f42 100644
--- a/django/db/backends/mysql/schema.py
+++ b/django/db/backends/mysql/schema.py
@@ -30,11 +30,7 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
def quote_value(self, value):
# Inner import to allow module to fail to load gracefully
import MySQLdb.converters
-
- if isinstance(value, six.string_types):
- return '"%s"' % six.text_type(value)
- else:
- return MySQLdb.escape(value, MySQLdb.converters.conversions)
+ return MySQLdb.escape(value, MySQLdb.converters.conversions)
def skip_default(self, field):
"""
@@ -49,8 +45,7 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
# Simulate the effect of a one-off default.
if self.skip_default(field) and field.default not in {None, NOT_PROVIDED}:
effective_default = self.effective_default(field)
- self.execute('UPDATE %(table)s SET %(column)s=%(default)s' % {
+ self.execute('UPDATE %(table)s SET %(column)s = %%s' % {
'table': self.quote_name(model._meta.db_table),
'column': self.quote_name(field.column),
- 'default': self.quote_value(effective_default),
- })
+ }, [effective_default])