Merge branch '1.1.x' into 1.2.x

Greg Turnquist · Greg Turnquist · commit b33e52b36f96 · 2011-02-15T13:55:49.000-06:00
diff --git a/src/.gitignore b/src/.gitignore
@@ -1 +1,2 @@
 setup.py
+springpython.egg-info
diff --git a/src/springpython/database/core.py b/src/springpython/database/core.py
@@ -52,6 +52,10 @@ def __del__(self):
             
     def _execute(self, sql_statement, args = None):
         """Issue a single SQL execute, typically a DDL statement."""
+
+        if args and type(args) not in self.connection_factory.acceptable_types:
+            raise InvalidArgumentType(type(args), self.connection_factory.acceptable_types)
+
         sql_statement = self.connection_factory.convert_sql_binding(sql_statement)
 
         cursor = self.connection_factory.getConnection().cursor()
diff --git a/test/springpythontest/databaseCoreTestCases.py b/test/springpythontest/databaseCoreTestCases.py
@@ -131,6 +131,38 @@ def testQueryingOracleWithValidlyFormattedArguments(self):
 
         del(sys.modules["cx_Oracle"])
 
+    def testInsertingIntoOracleWithInvalidlyFormattedArguments(self):
+        cursor = self.mock()
+        conn = self.mock()
+
+        sys.modules["cx_Oracle"] = self.mock()
+        sys.modules["cx_Oracle"].expects(once()).method("connect").will(return_value(conn))
+
+        connection_factory = factory.cxoraConnectionFactory(username="foo", password="bar", hostname="localhost", db="mock")
+        dt = DatabaseTemplate(connection_factory)
+
+        self.assertRaises(InvalidArgumentType, dt.execute, 
+            "INSERT INTO T_UNIT (F_UNIT_PK, F_UNIT_ID, F_NAME) VALUES (?, ?, ?)",
+            (1,1,1))
+
+        del(sys.modules["cx_Oracle"])
+
+    def testInsertingIntoOracleWithInvalidlyFormattedArgumentsWithUpdateApi(self):
+        cursor = self.mock()
+        conn = self.mock()
+
+        sys.modules["cx_Oracle"] = self.mock()
+        sys.modules["cx_Oracle"].expects(once()).method("connect").will(return_value(conn))
+
+        connection_factory = factory.cxoraConnectionFactory(username="foo", password="bar", hostname="localhost", db="mock")
+        dt = DatabaseTemplate(connection_factory)
+
+        self.assertRaises(InvalidArgumentType, dt.update,
+            "INSERT INTO T_UNIT (F_UNIT_PK, F_UNIT_ID, F_NAME) VALUES (?, ?, ?)",
+            (1,1,1))
+
+        del(sys.modules["cx_Oracle"])
+
 class DatabaseTemplateMockTestCase(MockTestCase):
     """Testing the DatabaseTemplate utilizes stubbing and mocking, in order to isolate from different
     vendor implementations. This reduces the overhead in making changes to core functionality."""
