Changeset 6963

Timestamp:

12/20/07 17:06:30 (9 months ago)

Author:

mboersma

Message:

Rearranged an Oracle ALTER statement so it is run only once per new connection, not on every cursor creation. Thanks, Ian Kelly.

Files:

• django/trunk/django/db/backends/oracle/base.py (modified) (2 diffs)

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

@@ -414 +414 @@
-
-    def _cursor(self, settings):
+        cursor = None
-        if not self._valid_connection():
-            if len(settings.DATABASE_HOST.strip()) == 0:
@@ -423 +424 @@
-                conn_string = "%s/%s@%s" % (settings.DATABASE_USER, settings.DATABASE_PASSWORD, settings.DATABASE_NAME)
-                self.connection = Database.connect(conn_string, **self.options)
+            cursor = FormatStylePlaceholderCursor(self.connection)
+            # Set oracle date to ansi date format.  This only needs to execute
+            # once when we create a new connection.
+            cursor.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD' "
+                           "NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD HH24:MI:SS.FF'")
-            try:
-                self.oracle_version = int(self.connection.version.split('.')[0])
-            except ValueError:
-                pass
-
+
+
-        # Default arraysize of 1 is highly sub-optimal.
-        cursor.arraysize = 100
-        # 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'")
-        return cursor
-