Ticket #121: fixed_quote_name.patch

django/core/db/__init__.py

@@ -37 +37 @@
 get_last_insert_id = dbmod.get_last_insert_id
 get_date_extract_sql = dbmod.get_date_extract_sql
 get_date_trunc_sql = dbmod.get_date_trunc_sql
+quote_name = dbmod.quote_name
 OPERATOR_MAPPING = dbmod.OPERATOR_MAPPING
 DATA_TYPES = dbmod.DATA_TYPES

django/core/db/backends/postgresql.py

@@ -71 +71 @@
     # http://www.postgresql.org/docs/8.0/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC
     return "DATE_TRUNC('%s', %s)" % (lookup_type, field_name)
 
+def quote_name(name):
+    if name.startswith('"') and name.endswith('"'):
+        # Quoting once is enough!
+        return name
+    else:
+        return '"%s"' % name
+
 # Register these custom typecasts, because Django expects dates/times to be
 # in Python's native (standard-library) datetime/time format, whereas psycopg
 # use mx.DateTime by default.

django/core/db/backends/sqlite3.py

@@ -98 +98 @@
     elif lookup_type == 'day':
         return "%i-%02i-%02i 00:00:00" % (dt.year, dt.month, dt.day)
 
+def quote_name(name):
+    if name.startswith('"') and name.endswith('"'):
+        # Quoting once is enough!
+        return name
+    else:
+        return '"%s"' % name
+
 # Operators and fields ########################################################
         
 OPERATOR_MAPPING = {

django/core/db/backends/mysql.py

@@ -68 +68 @@
         subtractions.append(" - interval (DATE_FORMAT(%s, '%%%%m')-1) month" % field_name)
     return "(%s - %s)" % (field_name, ''.join(subtractions))
 
+def quote_name(name):
+    if name.startswith("`") and name.endswith("`"):
+        # Quoting once is enough!
+        return name
+    else:
+        return "`%s`" % name
+
 OPERATOR_MAPPING = {
     'exact': '=',
     'iexact': 'LIKE',