[SESPRINGPYTHONPY-159] Resolved merge conflicts.

Greg Turnquist · Greg Turnquist · commit edce429886f3 · 2011-02-15T14:13:17.000-06:00
diff --git a/springpython.properties b/springpython.properties
@@ -9,8 +9,8 @@ project.key=EXTPY
 release.type=snapshot
 
 # This property is only un-commented and set for official tagged releases.
-release.type=release
-build.stamp=FINAL
+#release.type=release
+#build.stamp=FINAL
 
 # This property is uncommented for milestone releases.
 #release.type=milestone
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,42 @@ def testQueryingOracleWithValidlyFormattedArguments(self):
 
         del(sys.modules["cx_Oracle"])
 
+    def testInsertingIntoOracleWithInvalidlyFormattedArguments(self):
+        sys.modules["cx_Oracle"] = self.mock()
+
+        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):
+        sys.modules["cx_Oracle"] = self.mock()
+
+        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"])
+
+    def testInsertingIntoOracleWithInvalidlyFormattedArgumentsWithInsertApi(self):
+        sys.modules["cx_Oracle"] = self.mock()
+
+        connection_factory = factory.cxoraConnectionFactory(username="foo", password="bar", hostname="localhost", db="mock")
+        dt = DatabaseTemplate(connection_factory)
+
+        self.assertRaises(InvalidArgumentType, dt.insert_and_return_id,
+            "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."""
