Changeset 7743

Timestamp:

06/25/08 22:11:32 (3 months ago)

Author:

mtredinnick

Message:

Fixed #7109 -- Quote certain values before passing them for substitution in
Field.db_type().

This fixes a problem with using reserved words for field names in Oracle. Only
affects Oracle at the moment, but the same changes could easily be used by
other backends if they are required (requires changing creation.py, only).

This commit also reverts [7501] so that if the fix doesn't work, it will show
up in the tests (and if it does work, the tests will prevent us from breaking
it again).

Files:

• django/trunk/django/db/backends/oracle/creation.py (modified) (2 diffs)
• django/trunk/django/db/models/fields/__init__.py (modified) (2 diffs)
• django/trunk/django/utils/datastructures.py (modified) (1 diff)
• django/trunk/tests/regressiontests/queries/models.py (modified) (2 diffs)

django/trunk/django/db/backends/oracle/creation.py

@@ -6 +6 @@
-# be interpolated against the values of Field.__dict__ before being output.
-# If a column type is set to None, it won't be included in the output.
+#
+# Any format strings starting with "qn_" are quoted before being used in the
+# output (the "qn_" prefix is stripped before the lookup is performed.
+
-DATA_TYPES = {
-    'AutoField':                    'NUMBER(11)',
-
+qn_
-    'CharField':                    'NVARCHAR2(%(max_length)s)',
-    'CommaSeparatedIntegerField':   'VARCHAR2(%(max_length)s)',
@@ -20 +24 @@
-    'IntegerField':                 'NUMBER(11)',
-    'IPAddressField':               'VARCHAR2(15)',
-
+qn_
-    'OneToOneField':                'NUMBER(11)',
-    'PhoneNumberField':             'VARCHAR2(20)',
-
-
+qn_
+qn_
-    'SlugField':                    'NVARCHAR2(50)',
-    'SmallIntegerField':            'NUMBER(11)',

django/trunk/django/db/models/fields/__init__.py

@@ -17 +17 @@
-from django import newforms as forms
-from django.core.exceptions import ObjectDoesNotExist
+from django.utils.datastructures import DictWrapper
-from django.utils.functional import curry
-from django.utils.itercompat import tee
@@ -162 +163 @@
-        # can implement db_type() instead of get_internal_type() to specify
-        # exactly which wacky database column type you want to use.
+        data = DictWrapper(self.__dict__, connection.ops.quote_name, "qn_")
-        try:
-self.__dict__
+data
-        except KeyError:
-            return None

django/trunk/django/utils/datastructures.py

@@ -344 +344 @@
-            return dict.__repr__(d)
-        return dict.__repr__(self)
+
+class DictWrapper(dict):
+    """
+    Wraps accesses to a dictionary so that certain values (those starting with
+    the specified prefix) are passed through a function before being returned.
+    The prefix is removed before looking up the real value.
+
+    Used by the SQL construction code to ensure that values are correctly
+    quoted before being used.
+    """
+    def __init__(self, data, func, prefix):
+        super(DictWrapper, self).__init__(data)
+        self.func = func
+        self.prefix = prefix
+
+    def __getitem__(self, key):
+        """
+        Retrieves the real value after stripping the prefix string (if
+        present). If the prefix is present, pass the value through self.func
+        before returning, otherwise return the raw value.
+        """
+        if key.startswith(self.prefix):
+            use_func = True
+            key = key[len(self.prefix):]
+        else:
+            use_func = False
+        value = super(DictWrapper, self).__getitem__(key)
+        if use_func:
+            return self.func(value)
+        return value
+

django/trunk/tests/regressiontests/queries/models.py

@@ -123 +123 @@
-    def get_query_set(self):
-        qs = super(CustomManager, self).get_query_set()
-is_
+
-
-class ManagedModel(models.Model):
-    data = models.CharField(max_length=10)
-    tag = models.ForeignKey(Tag)
-is_
+
-
-    objects = CustomManager()
@@ -731 +731 @@
-Updates that are filtered on the model being updated are somewhat tricky to get
-in MySQL. This exercises that case.
-is_
+
->>> ManagedModel.objects.update(data='mm')
-