Merge branch '1.2.x'

Greg Turnquist · Greg Turnquist · commit 7388e9274eb4 · 2011-01-17T00:10:00.000-06:00
diff --git a/springpython.properties b/springpython.properties
@@ -6,15 +6,15 @@ natural.name=se-springpython-py
 project.key=EXTPY
 
 # release, milestone or snapshot.  Trunk is always snapshot for CI build
-release.type=snapshot
+#release.type=snapshot
 
 # This property is only un-commented and set for official tagged releases.
 #release.type=release
 #build.stamp=FINAL
 
 # This property is uncommented for milestone releases.
-#release.type=milestone
-#build.stamp=RC1
+release.type=milestone
+build.stamp=RC2
 
 # docbook reference documentation
 doc.ref.dir=docs/reference
diff --git a/src/springpython/database/core.py b/src/springpython/database/core.py
@@ -46,17 +46,15 @@ def __init__(self, connection_factory = None):
         self.connection_factory = connection_factory
         self.logger = logging.getLogger("springpython.database.core.DatabaseTemplate")
 
-    def __setattr__(self, name, value):
-        """When the connection factory is set, initialize a connection to the database."""
-        self.__dict__[name] = value
-        if name == "connection_factory" and value:
-            self.__db = value.getConnection()
+    def __del__(self):
+        "When this template goes out of scope, need to close the connection it formed."
+        if self.connection_factory is not None: self.connection_factory.close()
             
     def execute(self, sql_statement, args = None):
         """Issue a single SQL execute, typically a DDL statement."""
         sql_statement = self.connection_factory.convert_sql_binding(sql_statement)
 
-        cursor = self.__db.cursor()
+        cursor = self.connection_factory.getConnection().cursor()
         error = None
         rows_affected = 0
         try:
@@ -107,7 +105,7 @@ def __query_for_list(self, sql_query, args = None):
 
         sql_query = self.connection_factory.convert_sql_binding(sql_query)
         
-        cursor = self.__db.cursor()
+        cursor = self.connection_factory.getConnection().cursor()
         error = None
         results = None
         metadata = None
diff --git a/src/springpython/database/factory.py b/src/springpython/database/factory.py
@@ -13,6 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.       
 """
+import logging
 import re
 import sys
 import types
@@ -33,6 +34,12 @@ def getConnection(self):
             self.__db = self.connect()
         return self.__db
 
+    def close(self):
+        "Need to offer API call to close the connection to the database."
+        if self.__db is not None:
+            self.__db.close()
+            self.__db = None
+
     def commit(self):
         if self.in_transaction():
             self.getConnection().commit()
diff --git a/test/springpythontest/checkin.py b/test/springpythontest/checkin.py
@@ -13,5 +13,5 @@
 from springpythontest.securityWebTestCases import *
 from springpythontest.util_test_cases import *
 from springpythontest.unicodeTestCases import *
-from springpythontest.remoting_xmlrpc import *
-from springpythontest.remotingTestCases import Pyro4RemotingTestCase
+#from springpythontest.remoting_xmlrpc import *
+#from springpythontest.remotingTestCases import Pyro4RemotingTestCase
diff --git a/test/springpythontest/databaseCoreTestCases.py b/test/springpythontest/databaseCoreTestCases.py
@@ -82,7 +82,6 @@ def testConnectingToOracle(self):
 
     def testQueryingOracleWithInvalidlyFormattedArguments(self):
         sys.modules["cx_Oracle"] = self.mock()
-        sys.modules["cx_Oracle"].expects(once()).method("connect")
         
         connection_factory = factory.cxoraConnectionFactory(username="foo", password="bar", hostname="localhost", db="mock")
         dt = DatabaseTemplate(connection_factory)
@@ -108,6 +107,7 @@ def testQueryingOracleWithValidlyFormattedArguments(self):
 
         conn = self.mock()
         conn.expects(once()).method("cursor").will(return_value(cursor))
+        conn.expects(once()).method("close")
 
         sys.modules["cx_Oracle"] = self.mock()
         sys.modules["cx_Oracle"].expects(once()).method("connect").will(return_value(conn))
diff --git a/test/springpythontest/support/testSupportClasses.py b/test/springpythontest/support/testSupportClasses.py
@@ -192,13 +192,17 @@ def __init__(self):
         self.mockCursor = None
     def cursor(self):
         return self.mockCursor
+    def close(self):
+        pass
     
 class StubDBFactory(ConnectionFactory):
     def __init__(self):
         ConnectionFactory.__init__(self, [types.TupleType])
         self.stubConnection = StubConnection()
     def connect(self):
         return self.stubConnection
+    def close(self):
+        pass
 
 class ImpFileProps(object):
     def __init__(self, paystat_work_dir, paystat_reload_dir, paystat_archive_dir, oid):
