added support for reusing connections

stamparm · stamparm · commit 1973024ebf1a · 2010-03-30T13:52:47.000Z
diff --git a/plugins/dbms/access/connector.py b/plugins/dbms/access/connector.py
@@ -45,7 +45,10 @@ class Connector(GenericConnector):
     def __init__(self):
         GenericConnector.__init__(self)
 
-    def connect(self):
+    def connect(self, reuse=True):
+        if reuse and self.connector:
+            return
+
         self.initConnection()
 
         try:
@@ -89,4 +92,5 @@ def setCursor(self):
     def close(self):
         self.cursor.close()
         self.connector.close()
+        self.closed()
 
diff --git a/plugins/dbms/firebird/connector.py b/plugins/dbms/firebird/connector.py
@@ -43,7 +43,10 @@ class Connector(GenericConnector):
     def __init__(self):
         GenericConnector.__init__(self)
 
-    def connect(self):
+    def connect(self, reuse=True):
+        if reuse and self.connector:
+            return
+
         self.initConnection()
 
         try:
@@ -83,3 +86,4 @@ def setCursor(self):
     def close(self):
         self.cursor.close()
         self.connector.close()
+        self.closed()
diff --git a/plugins/dbms/mysql/connector.py b/plugins/dbms/mysql/connector.py
@@ -47,7 +47,10 @@ class Connector(GenericConnector):
     def __init__(self):
         GenericConnector.__init__(self)
 
-    def connect(self):
+    def connect(self, reuse=True):
+        if reuse and self.connector:
+            return
+
         self.initConnection()
 
         try:
@@ -87,3 +90,4 @@ def setCursor(self):
     def close(self):
         self.cursor.close()
         self.connector.close()
+        self.closed()
diff --git a/plugins/dbms/oracle/connector.py b/plugins/dbms/oracle/connector.py
@@ -46,7 +46,10 @@ class Connector(GenericConnector):
     def __init__(self):
         GenericConnector.__init__(self)
 
-    def connect(self):
+    def connect(self, reuse=True):
+        if reuse and self.connector:
+            return
+
         self.initConnection()
         self.__dsn = cx_Oracle.makedsn(self.hostname, self.port, self.db)
 
@@ -91,3 +94,4 @@ def setCursor(self):
     def close(self):
         self.cursor.close()
         self.connector.close()
+        self.closed()
diff --git a/plugins/dbms/postgresql/connector.py b/plugins/dbms/postgresql/connector.py
@@ -46,7 +46,10 @@ class Connector(GenericConnector):
     def __init__(self):
         GenericConnector.__init__(self)
 
-    def connect(self):
+    def connect(self, reuse=True):
+        if reuse and self.connector:
+            return
+
         self.initConnection()
 
         try:
@@ -86,3 +89,4 @@ def setCursor(self):
     def close(self):
         self.cursor.close()
         self.connector.close()
+        self.closed()
diff --git a/plugins/dbms/sqlite/connector.py b/plugins/dbms/sqlite/connector.py
@@ -47,7 +47,10 @@ class Connector(GenericConnector):
     def __init__(self):
         GenericConnector.__init__(self)
 
-    def connect(self):
+    def connect(self, reuse=True):
+        if reuse and self.connector:
+            return
+
         self.initConnection()
 
         try:
@@ -87,3 +90,4 @@ def setCursor(self):
     def close(self):
         self.cursor.close()
         self.connector.close()
+        self.closed()
diff --git a/plugins/generic/connector.py b/plugins/generic/connector.py
@@ -46,6 +46,13 @@ def connected(self):
         infoMsg = "connection to %s server %s" % (conf.dbms, self.hostname)
         infoMsg += ":%d established" % self.port
         logger.info(infoMsg)
+        
+    def closed(self):
+        self.connector = None
+        self.cursor = None
+        infoMsg = "connection to %s server %s" % (conf.dbms, self.hostname)
+        infoMsg += ":%d closed" % self.port
+        logger.info(infoMsg)
 
     def connect(self):
         errMsg  = "'connect' method must be defined "
