Ticket #7732: oracle_pool.2.diff

django/db/backends/oracle/base.py

@@ -33 +33 @@
-    interprets_empty_strings_as_nulls = True
-    date_field_supports_time_value = False
-
+class DatabasePool:
+    def __get__(self):
+        if hasattr(self,'_pool'):
+            return self._pool
+        else:
+            from django.conf import settings
+            if len(settings.DATABASE_HOST.strip()) == 0:
+                settings.DATABASE_HOST = 'localhost'
+            if len(settings.DATABASE_PORT.strip()) != 0:
+                dsn = Database.makedsn(settings.DATABASE_HOST, int(settings.DATABASE_PORT), settings.DATABASE_NAME)
+                # FIXME. make the Pool parameters inside the settings
+                self._pool = cx_Oracle.SessionPool(settings.DATABASE_USER, settings.DATABASE_PASSWORD, dsn, 2, 12, 1)
+
+            else:
+                # FIXME. make the Pool parameters inside the settings
+                self._pool = cx_Oracle.SessionPool(settings.DATABASE_USER, settings.DATABASE_PASSWORD, settings.DATABASE_NAME, 2, 12, 1)
+            return self._pool
+
-class DatabaseOperations(BaseDatabaseOperations):
-    def autoinc_sql(self, table, column):
-        # To simulate auto-incrementing primary keys in Oracle, we have to
@@ -199 +217 @@
-        'iendswith': "LIKEC UPPER(%s) ESCAPE '\\'",
-    }
-    oracle_version = None
-
-
-
-
-
-
-
+
+
+
+
+
-            if len(settings.DATABASE_HOST.strip()) == 0:
-                settings.DATABASE_HOST = 'localhost'
-            if len(settings.DATABASE_PORT.strip()) != 0:
-                dsn = Database.makedsn(settings.DATABASE_HOST, int(settings.DATABASE_PORT), settings.DATABASE_NAME)
-
+
+
+
-            else:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            cursor = FormatStylePlaceholderCursor(self.connection)
-            # Set oracle date to ansi date format.  This only needs to execute
-            # once when we create a new connection.
@@ -237 +268 @@
-                # Django docs specify cx_Oracle version 4.3.1 or higher, but
-                # stmtcachesize is available only in 4.3.2 and up.
-                pass
+        
-        if not cursor:
-            cursor = FormatStylePlaceholderCursor(self.connection)
-        # Default arraysize of 1 is highly sub-optimal.
-        cursor.arraysize = 100
-        return cursor
-
+    def close(self):
+        if self.connection is not None:
+            self.pool.release(self.connection)
+            self.connection = None
+
+
-class FormatStylePlaceholderCursor(Database.Cursor):
-    """
-    Django uses "format" (e.g. '%s') style placeholders, but Oracle uses ":var"