Ticket #1237: django.db.__init__.py.diff

__init__.py

@@ -23 +23 @@
 get_introspection_module = lambda: __import__('django.db.backends.%s.introspection' % settings.DATABASE_ENGINE, '', '', [''])
 get_creation_module = lambda: __import__('django.db.backends.%s.creation' % settings.DATABASE_ENGINE, '', '', [''])
 
-connection = backend.DatabaseWrapper()
+if settings.USE_DBPOOL:
+    class ConnectObjectFactory:
+        def create_object( self ):
+            return backend.DatabaseWrapper()
+        
+        def destroy_object( self , obj ):
+            obj.close()
+            del obj
+        
+        def validate_object( self , obj ):
+            cu = obj.cursor()
+            try:
+                cu.execute( backend.get_check_sql() )
+                return True
+            except:
+                return False
+
+    import threading
+    import thread
+
+    def atomcall( func ):
+        def call( *arg , **kwarg ):
+            try:
+                atomcall.lock.acquire()
+                return func( *arg , **kwarg )
+            finally:
+                atomcall.lock.release()
+        return call
+        
+    atomcall.lock = threading.Lock()
+
+    import pool
+    class DatabaseWrapper:
+        def __init__(self):
+            self._conn = backend.DatabaseWrapper()
+            self.connections = {}
+            self.pool = pool.DBPoolWithThread( ConnectObjectFactory() , freetime = 1 , threadsafety = backend.Database.threadsafety )
+            self.queries = []
+
+        def cursor(self):
+            con = self.getcon()
+            if con is None:
+                con = self.pool.borrow_object()
+                self.setcon( con )
+            if con:
+                return con.cursor()
+
+        def commit(self):
+            con = self.getcon()
+            if con:
+                return con.commit()
+
+        def rollback(self):
+            con = self.getcon()
+            if con:
+                return con.rollback()
+
+        def close(self):
+            con = self.getcon()
+            if con is not None:
+                self.pool.return_object( con )
+                self.delcon()
+        
+        def quote_name(self, name):
+            return self._conn.quote_name( name )
+
+        @atomcall
+        def getcon( self ):
+            threadid = thread.get_ident()
+            return self.connections.get( threadid , None )
+            
+        @atomcall
+        def delcon( self ):
+            threadid = thread.get_ident()
+            del self.connections[ threadid ]
+            
+        @atomcall
+        def setcon( self , con ):
+            threadid = thread.get_ident()
+            self.connections[threadid] = con
+    connection = DatabaseWrapper()
+else:
+    connection = backend.DatabaseWrapper()
+    
 DatabaseError = backend.DatabaseError
 
 # Register an event that closes the database connection