Changeset 5584

Timestamp:

07/02/07 02:43:36 (1 year ago)

Author:

mtredinnick

Message:

unicode: Added Unicode support for the Oracle backend. All tests pass.

Files:

• django/branches/unicode/django/db/backends/oracle/base.py (modified) (6 diffs)
• django/branches/unicode/django/db/backends/oracle/creation.py (modified) (2 diffs)

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

@@ -7 +7 @@
-from django.conf import settings
-from django.db.backends import util
+from django.utils.datastructures import SortedDict
+from django.utils.encoding import smart_str, force_unicode
+import datetime
+import os
+
+# Oracle takes client-side character set encoding from the environment.
+os.environ['NLS_LANG'] = '.UTF8'
-try:
-    import cx_Oracle as Database
@@ -12 +19 @@
-    from django.core.exceptions import ImproperlyConfigured
-    raise ImproperlyConfigured, "Error loading cx_Oracle module: %s" % e
-import datetime
-from django.utils.datastructures import SortedDict
-
-
@@ -46 +51 @@
-                self.connection = Database.connect(conn_string, **self.options)
-        cursor = FormatStylePlaceholderCursor(self.connection)
-default arraysize of 1 is highly sub-optimal
+Default arraysize of 1 is highly sub-optimal.
-        cursor.arraysize = 100
-set oracle date to ansi date format
+Set oracle date to ansi date format.
-        cursor.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD'")
-        cursor.execute("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD HH24:MI:SS.FF'")
@@ -79 +84 @@
-class FormatStylePlaceholderCursor(Database.Cursor):
-    """
-
-
-
+
+
+
+
+
+
-    """
+    charset = 'utf-8'
+
-    def _rewrite_args(self, query, params=None):
-        if params is None:
-            params = []
-        else:
-
-
-
-
-
-
-
+
-        args = [(':arg%d' % i) for i in range(len(params))]
-query
+smart_str(query, self.charset)
-        # cx_Oracle wants no trailing ';' for SQL statements.  For PL/SQL, it
-        # it does want a trailing ';' but not a trailing '/'.  However, these
@@ -104 +108 @@
-        return query, params
-
+    def _format_params(self, params):
+        if isinstance(params, dict):
+            result = {}
+            charset = self.charset
+            for key, value in params.items():
+                result[smart_str(key, charset)] = smart_str(value, charset)
+            return result
+        else:
+            return tuple([smart_str(p, self.charset, True) for p in params])
+
-    def execute(self, query, params=None):
-        query, params = self._rewrite_args(query, params)
@@ -111 +125 @@
-        query, params = self._rewrite_args(query, params)
-        return Database.Cursor.executemany(self, query, params)
+
+    def fetchone(self):
+        return to_unicode(Database.Cursor.fetchone(self))
+
+    def fetchmany(self, size=None):
+        if size is None:
+            size = self.arraysize
+        return tuple([tuple([to_unicode(e) for e in r]) for r in Database.Cursor.fetchmany(self, size)])
+
+    def fetchall(self):
+        return tuple([tuple([to_unicode(e) for e in r]) for r in Database.Cursor.fetchall(self)])
+
+def to_unicode(s):
+    """
+    Convert strings to Unicode objects (and return all other data types
+    unchanged).
+    """
+    if isinstance(s, basestring):
+        return force_unicode(s)
+    return s
-
-def quote_name(name):

django/branches/unicode/django/db/backends/oracle/creation.py

@@ -9 +9 @@
-    'AutoField':                    'NUMBER(11)',
-    'BooleanField':                 'NUMBER(1) CHECK (%(column)s IN (0,1))',
-
+N
-    'CommaSeparatedIntegerField':   'VARCHAR2(%(maxlength)s)',
-    'DateField':                    'DATE',
-    'DateTimeField':                'TIMESTAMP',
-    'DecimalField':                 'NUMBER(%(max_digits)s, %(decimal_places)s)',
-
-
+N
+N
-    'FloatField':                   'DOUBLE PRECISION',
-
+N
-    'IntegerField':                 'NUMBER(11)',
-    'IPAddressField':               'VARCHAR2(15)',
@@ -26 +26 @@
-    'PositiveIntegerField':         'NUMBER(11) CHECK (%(column)s >= 0)',
-    'PositiveSmallIntegerField':    'NUMBER(11) CHECK (%(column)s >= 0)',
-
+N
-    'SmallIntegerField':            'NUMBER(11)',
-    'TextField':                    'NCLOB',