Ticket #900: 900.4.patch

django/db/backends/postgresql/base.py

@@ -6 +6 @@
 
 from django.db.backends import util
 import psycopg as Database
+from threading import currentThread 
+from django.utils.synch import RWLock
 
 DatabaseError = Database.DatabaseError
 
@@ -13 +15 @@
     def __init__(self):
         self.connection = None
         self.queries = []
+        self._lock = RWLock()
+        self._active_threads = []
 
     def cursor(self):
         from django.conf import settings
-        if self.connection is None:
-            if settings.DATABASE_NAME == '':
-                from django.core.exceptions import ImproperlyConfigured
-                raise ImproperlyConfigured, "You need to specify DATABASE_NAME in your Django settings file."
-            conn_string = "dbname=%s" % settings.DATABASE_NAME
-            if settings.DATABASE_USER:
-                conn_string = "user=%s %s" % (settings.DATABASE_USER, conn_string)
-            if settings.DATABASE_PASSWORD:
-                conn_string += " password='%s'" % settings.DATABASE_PASSWORD
-            if settings.DATABASE_HOST:
-                conn_string += " host=%s" % settings.DATABASE_HOST
-            if settings.DATABASE_PORT:
-                conn_string += " port=%s" % settings.DATABASE_PORT
-            self.connection = Database.connect(conn_string)
-            self.connection.set_isolation_level(1) # make transactions transparent to all cursors
+        self._lock.writer_enters()
+        try:
+            if self.connection is None:
+                if settings.DATABASE_NAME == '':
+                    from django.core.exceptions import ImproperlyConfigured
+                    raise ImproperlyConfigured, "You need to specify DATABASE_NAME in your Django settings file."
+                conn_string = "dbname=%s" % settings.DATABASE_NAME
+                if settings.DATABASE_USER:
+                    conn_string = "user=%s %s" % (settings.DATABASE_USER, conn_string)
+                if settings.DATABASE_PASSWORD:
+                    conn_string += " password='%s'" % settings.DATABASE_PASSWORD
+                if settings.DATABASE_HOST:
+                    conn_string += " host=%s" % settings.DATABASE_HOST
+                if settings.DATABASE_PORT:
+                    conn_string += " port=%s" % settings.DATABASE_PORT
+                self.connection = Database.connect(conn_string)
+                self.connection.set_isolation_level(1) # make transactions transparent to all cursors
+                if not currentThread() in self._active_threads:
+                    self._active_threads.append(currentThread())
+        finally:
+            self._lock.writer_leaves()
         cursor = self.connection.cursor()
         cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
         if settings.DEBUG:
@@ -41 +51 @@
         return self.connection.commit()
 
     def rollback(self):
-        if self.connection:
-            return self.connection.rollback()
+        self._lock.reader_enters()
+        try:
+            if self.connection:
+                return self.connection.rollback()
+        finally:
+            self._lock.reader_leaves()
 
     def close(self):
-        if self.connection is not None:
-            self.connection.close()
-            self.connection = None
+        self._lock.writer_enters()
+        try:
+            if currentThread() in self._active_threads:
+                self._active_threads.remove(currentThread())
+            if not self._active_threads and self.connection is not None:
+                self.connection.close()
+                self.connection = None
+        finally:
+            self._lock.writer_leaves()
 
 supports_constraints = True