mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

boulder-oracle-sprint: Removed extra cursor creation and set

Browse Source 
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
This commit is contained in:
Boulder Sprinters 2006-11-16 18:11:06 +00:00
parent 525f81d091
commit cd2866a364
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
django/db/backends/oracle/base.py
View File

@ -4,6 +4,7 @@ Oracle database backend for Django.
Requires cx_Oracle: http://www.python.net/crew/atuining/cx_Oracle/ Requires cx_Oracle: http://www.python.net/crew/atuining/cx_Oracle/
""" """
from django.conf import settings
from django.db.backends import util from django.db.backends import util
try: try:
import cx_Oracle as Database import cx_Oracle as Database
@ -30,7 +31,6 @@ class DatabaseWrapper(local):
return self.connection is not None return self.connection is not None
def cursor(self): def cursor(self):
from django.conf import settings
if not self._valid_connection(): if not self._valid_connection():
if len(settings.DATABASE_HOST.strip()) == 0: if len(settings.DATABASE_HOST.strip()) == 0:
settings.DATABASE_HOST = 'localhost' settings.DATABASE_HOST = 'localhost'
@ -40,21 +40,19 @@ class DatabaseWrapper(local):
else: else:
conn_string = "%s/%s@%s" % (settings.DATABASE_USER, settings.DATABASE_PASSWORD, settings.DATABASE_NAME) conn_string = "%s/%s@%s" % (settings.DATABASE_USER, settings.DATABASE_PASSWORD, settings.DATABASE_NAME)
self.connection = Database.connect(conn_string, **self.options) 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 # set oracle date to ansi date format
cursor = self.connection.cursor() cursor.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD'")
cursor.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'") cursor.execute("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD HH24:MI:SS'")
cursor.close() return cursor
return FormatStylePlaceholderCursor(self.connection)
def _commit(self): def _commit(self):
self.connection.commit() self.connection.commit()
def _rollback(self): def _rollback(self):
if self.connection: self.connection.rollback()
try:
self.connection.rollback()
except Database.NotSupportedError:
pass
def close(self): def close(self):
if self.connection is not None: if self.connection is not None:
@ -82,12 +80,10 @@ class FormatStylePlaceholderCursor(Database.Cursor):
def execute(self, query, params=None): def execute(self, query, params=None):
query, params = self._rewrite_args(query, params) query, params = self._rewrite_args(query, params)
self.arraysize = 200
return Database.Cursor.execute(self, query, params) return Database.Cursor.execute(self, query, params)
def executemany(self, query, params=None): def executemany(self, query, params=None):
query, params = self._rewrite_args(query, params) query, params = self._rewrite_args(query, params)
self.arraysize = 200
return Database.Cursor.executemany(self, query, params) return Database.Cursor.executemany(self, query, params)

2
django/db/backends/oracle/creation.py
View File

@ -10,7 +10,7 @@ DATA_TYPES = {
'CharField': 'VARCHAR2(%(maxlength)s)', 'CharField': 'VARCHAR2(%(maxlength)s)',
'CommaSeparatedIntegerField': 'VARCHAR2(%(maxlength)s)', 'CommaSeparatedIntegerField': 'VARCHAR2(%(maxlength)s)',
'DateField': 'DATE', 'DateField': 'DATE',
'DateTimeField': 'TIMESTAMP WITH TIME ZONE', 'DateTimeField': 'TIMESTAMP',
'FileField': 'VARCHAR2(100)', 'FileField': 'VARCHAR2(100)',
'FilePathField': 'VARCHAR2(100)', 'FilePathField': 'VARCHAR2(100)',
'FloatField': 'NUMBER(%(max_digits)s, %(decimal_places)s)', 'FloatField': 'NUMBER(%(max_digits)s, %(decimal_places)s)',