From cd2866a36482f2679388df0dadbdd98c91529fe0 Mon Sep 17 00:00:00 2001
From: Boulder Sprinters <boulder-sprinters@djangoproject.com>
Date: Thu, 16 Nov 2006 18:11:06 +0000
Subject: [PATCH] boulder-oracle-sprint: Removed extra cursor creation and set
 NLS_TIMESTAMP_FORMAT in session.  More tests passing now...

git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/backends/oracle/base.py     | 20 ++++++++------------
 django/db/backends/oracle/creation.py |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 1d6a0ea06b..5334747327 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -4,6 +4,7 @@ Oracle database backend for Django.
 Requires cx_Oracle: http://www.python.net/crew/atuining/cx_Oracle/
 """
 
+from django.conf import settings
 from django.db.backends import util
 try:
     import cx_Oracle as Database
@@ -30,7 +31,6 @@ class DatabaseWrapper(local):
         return self.connection is not None
 
     def cursor(self):
-        from django.conf import settings
         if not self._valid_connection():
             if len(settings.DATABASE_HOST.strip()) == 0:
                 settings.DATABASE_HOST = 'localhost'
@@ -40,21 +40,19 @@ class DatabaseWrapper(local):
             else:
                 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)
+        # default arraysize of 1 is highly sub-optimal
+        cursor.arraysize = 256
         # set oracle date to ansi date format
-        cursor = self.connection.cursor()
-        cursor.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'")
-        cursor.close()
-        return FormatStylePlaceholderCursor(self.connection)
+        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'")
+        return cursor
 
     def _commit(self):
         self.connection.commit()
 
     def _rollback(self):
-        if self.connection:
-            try:
-                self.connection.rollback()
-            except Database.NotSupportedError:
-                pass
+        self.connection.rollback()
 
     def close(self):
         if self.connection is not None:
@@ -82,12 +80,10 @@ class FormatStylePlaceholderCursor(Database.Cursor):
 
     def execute(self, query, params=None):
         query, params = self._rewrite_args(query, params)
-        self.arraysize = 200
         return Database.Cursor.execute(self, query, params)
 
     def executemany(self, query, params=None):
         query, params = self._rewrite_args(query, params)
-        self.arraysize = 200
         return Database.Cursor.executemany(self, query, params)
 
 
diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py
index 6abfb60f4b..c1387a7ff8 100644
--- a/django/db/backends/oracle/creation.py
+++ b/django/db/backends/oracle/creation.py
@@ -10,7 +10,7 @@ DATA_TYPES = {
     'CharField':                    'VARCHAR2(%(maxlength)s)',
     'CommaSeparatedIntegerField':   'VARCHAR2(%(maxlength)s)',
     'DateField':                    'DATE',
-    'DateTimeField':                'TIMESTAMP WITH TIME ZONE',
+    'DateTimeField':                'TIMESTAMP',
     'FileField':                    'VARCHAR2(100)',
     'FilePathField':                'VARCHAR2(100)',
     'FloatField':                   'NUMBER(%(max_digits)s, %(decimal_places)s)',