Ticket #7732: oracle_pool.6.diff

django/db/backends/oracle/base.py

@@ -257 +257 @@
 
     def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
-
+        from django.conf import settings
+        self.settings = settings
         self.features = DatabaseFeatures()
         self.ops = DatabaseOperations()
         self.client = DatabaseClient()
@@ -266 +267 @@
         self.validation = BaseDatabaseValidation()
 
         # Fetch connection pool settings
-        opts = self.settings_dict['DATABASE_OPTIONS']
+        opts = settings.get('DATABASE_OPTIONS')
         if not isinstance(opts, dict):
             # Insurance against foolish users...
             opts = {}
@@ -279 +280 @@
 
     def _get_pool (self):
         if not hasattr (self.__class__, '_pool'):
-            settings_dict = self.settings_dict
+            settings = self.settings
             Database.OPT_Threading = 1
-            if len(settings_dict['DATABASE_HOST'].strip()) == 0:
-                settings_dict['DATABASE_HOST'] = 'localhost'
-            if len(settings_dict['DATABASE_PORT'].strip()) != 0:
-                dsn = Database.makedsn(settings_dict['DATABASE_HOST'],
-                                       int(settings_dict['DATABASE_PORT']),
-                                       settings_dict['DATABASE_NAME'])
-                p = Database.SessionPool(settings_dict['DATABASE_USER'],
-                                         settings_dict['DATABASE_PASSWORD'],
+            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)
+                p = Database.SessionPool(settings.DATABASE_USER,
+                                         settings.DATABASE_PASSWORD,
                                          dsn,
                                          self._pool_settings['SESSION_POOL_MIN'],
                                          self._pool_settings['SESSION_POOL_MAX'],
                                          self._pool_settings['SESSION_POOL_INCREMENT'],
                                          threaded = True)
             else:
-                p = Database.SessionPool(settings_dict['DATABASE_USER'],
-                                         settings_dict['DATABASE_PASSWORD'],
-                                         settings_dict['DATABASE_NAME'],
+                p = Database.SessionPool(settings.DATABASE_USER,
+                                         settings.DATABASE_PASSWORD,
+                                         settings.DATABASE_NAME,
                                          self._pool_settings['SESSION_POOL_MIN'],
                                          self._pool_settings['SESSION_POOL_MAX'],
                                          self._pool_settings['SESSION_POOL_INCREMENT'],
@@ -360 +361 @@
             pass
         return cursor
 
-    def _cursor(self):
+    def _cursor(self, settings):
         cursor = None
         if not self._valid_connection():
             if self._use_pool and self.pool is not None:
                 self.connection = self.pool.acquire()
             else:
-                self.connection = Database.connect(self._connect_string(),
-                       **self.settings_dict['DATABASE_OPTIONS'])
+                self.connection = Database.connect(self._connect_string(settings),
+                       getattr(settings, 'DATABASE_OPTIONS'))
                 cursor = self._init_oracle_settings(self.connection)
             try:
                 self.connection.stmtcachesize = 20