Changeset 7637

Timestamp:

06/15/08 12:28:21 (5 months ago)

Author:

jbronn

Message:

gis: Modified the Oracle database backend so that the input size of parameters may be customized (this was preventing the gis branch from working because Oracle's WKT stored procedures require CLOB rather than NCLOB as input). Ian Kelly has approved this patch; notwithstanding any further concerns, its functionality should appear in trunk sometime in the future.

Files:

• django/branches/gis/django/db/backends/oracle/base.py (modified) (6 diffs)

django/branches/gis/django/db/backends/oracle/base.py

@@ -245 +245 @@
-        return cursor
-
+class OracleParam(object):
+    """
+    Wrapper object for formatting parameters for Oracle. If the string 
+    representation of the value is large enough (greater than 4000 characters) 
+    the input size needs to be set as NCLOB. Alternatively, if the parameter has
+    an `input_size` attribute, then the value of the `input_size` attribute will 
+    be used instead. Otherwise, no input size will be set for the parameter when
+    executing the query.
+    """
+    def __init__(self, param, charset, strings_only=False):
+        self.smart_str = smart_str(param, charset, strings_only)
+        if hasattr(param, 'input_size'):
+            # If parameter has `input_size` attribute, use that.
+            self.input_size = param.input_size
+        elif isinstance(param, basestring) and len(param) > 4000:
+            # Mark any string parameter greater than 4000 characters as an NCLOB.
+            self.input_size = Database.NCLOB
+        else:
+            self.input_size = None
+
-class FormatStylePlaceholderCursor(Database.Cursor):
-    """
@@ -259 +279 @@
-        if isinstance(params, dict):
-            result = {}
-            charset = self.charset
-            for key, value in params.items():
-charset)] = smart_str(value, 
+self.charset)] = OracleParam(param, self.
-            return result
-        else:
-smart_str
-
+OracleParam
+
-    def _guess_input_sizes(self, params_list):
-        # Mark any string parameter greater than 4000 characters as an NCLOB.
-        if isinstance(params_list[0], dict):
-            sizes = {}
@@ -276 +294 @@
-        for iterator in iterators:
-            for key, value in iterator:
-
-
+
-        if isinstance(sizes, dict):
-            self.setinputsizes(**sizes)
@@ -283 +300 @@
-            self.setinputsizes(*sizes)
-
+    def _param_generator(self, params):
+        if isinstance(params, dict):
+            return dict([(k, p.smart_str) for k, p in params.iteritems()])
+        else:
+            return [p.smart_str for p in params]
+        
-    def execute(self, query, params=None):
-        if params is None:
@@ -297 +320 @@
-        query = smart_str(query, self.charset) % tuple(args)
-        self._guess_input_sizes([params])
-params
+self._param_generator(params)
-
-    def executemany(self, query, params=None):
@@ -312 +335 @@
-            query = query[:-1]
-        query = smart_str(query, self.charset) % tuple(args)
-new_param_list
-new_param_list
-new_param_list
+formatted
+formatted
+[self._param_generator(p) for p in formatted]
-
-    def fetchone(self):