Improved test suite; added check that the LOB type matches the expected

LOB type.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -22,6 +22,9 @@ Version 8.2 (TBD)
 #)  The distributed transaction handle assosciated with the connection is now
     cleared on commit or rollback (`issue 530
     <https://github.com/oracle/python-cx_Oracle/issues/530>`__).
+#)  Added check to ensure that when setting variables or object attributes, the
+    type of the temporary LOB must match the expected type.
+#)  Improved test suite.
 
 
 Version 8.1 (December 2020)

src/cxoTransform.c

@@ -282,6 +282,16 @@ int cxoTransform_fromPython(cxoTransformNum transformNum,
         case CXO_TRANSFORM_NCLOB:
             if (Py_TYPE(pyValue) == &cxoPyTypeLob) {
                 lob = (cxoLob*) pyValue;
+                if ((lob->dbType == cxoDbTypeBlob &&
+                                transformNum != CXO_TRANSFORM_BLOB) ||
+                        (lob->dbType == cxoDbTypeClob &&
+                                transformNum != CXO_TRANSFORM_CLOB) ||
+                        (lob->dbType == cxoDbTypeNclob &&
+                                transformNum != CXO_TRANSFORM_NCLOB)) {
+                    PyErr_SetString(PyExc_TypeError,
+                            "LOB must be of the correct type");
+                    return -1;
+                }
                 if (var) {
                     if (dpiVar_setFromLob(var->handle, arrayPos,
                             lob->handle) < 0)

test/test_1200_cursor.py

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
 #
 # Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
 #
@@ -14,6 +14,7 @@
 import test_env
 import cx_Oracle as oracledb
 import decimal
+import datetime
 
 class TestCase(test_env.BaseTestCase):
 
@@ -933,5 +934,51 @@ def test_1278_execute_with_incorrect_bind_values(self):
         self.assertRaises(oracledb.DatabaseError, self.cursor.execute,
                           statement, value=var, value2=var, value3=var)
 
+    def test_1279_change_in_size_on_successive_bind(self):
+        "1279 - change in size on subsequent binds does not use optimised path"
+        self.cursor.execute("truncate table TestTempTable")
+        data = [
+            (1, "Test String #1"),
+            (2, "ABC" * 100)
+        ]
+        sql = "insert into TestTempTable (IntCol, StringCol) values (:1, :2)"
+        for row in data:
+            self.cursor.execute(sql, row)
+        self.connection.commit()
+        self.cursor.execute("select IntCol, StringCol from TestTempTable")
+        self.assertEqual(self.cursor.fetchall(), data)
+
+    def test_1280_change_in_type_on_successive_bind(self):
+        "1280 - change in type on subsequent binds cannot use optimised path"
+        sql = "select :1 from dual"
+        self.cursor.execute(sql, ('W',))
+        row, = self.cursor.fetchone()
+        self.assertEqual(row, 'W')
+        self.cursor.execute(sql, ('S',))
+        row, = self.cursor.fetchone()
+        self.assertEqual(row, 'S')
+        self.cursor.execute(sql, (7,))
+        row, = self.cursor.fetchone()
+        self.assertEqual(row, '7')
+
+    def test_1281_dml_can_use_optimised_path(self):
+        "1281 - test that dml can use optimised path"
+        data_to_insert = [
+            (1, "Test String #1"),
+            (2, "Test String #2"),
+            (3, "Test String #3")
+        ]
+        self.cursor.execute("truncate table TestTempTable")
+        sql = "insert into TestTempTable (IntCol, StringCol) values (:1, :2)"
+        for row in data_to_insert:
+            with self.connection.cursor() as cursor:
+                cursor.execute(sql, row)
+        self.connection.commit()
+        self.cursor.execute("""
+                select IntCol, StringCol
+                from TestTempTable
+                order by IntCol""")
+        self.assertEqual(self.cursor.fetchall(), data_to_insert)
+
 if __name__ == "__main__":
     test_env.run_test_cases()

test/test_1300_cursor_var.py

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
 #
 # Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
 #
@@ -94,5 +94,35 @@ def test_1304_fetch_cursor(self):
             self.assertEqual(number, i)
             self.assertEqual(cursor.fetchall(), [(i + 1,)])
 
+    def test_1305_ref_cursor_binds(self):
+        "1305 - test that ref cursor binds cannot use optimised path"
+        ref_cursor = self.connection.cursor()
+        sql = """
+                begin
+                    open :rcursor for
+                        select IntCol, StringCol
+                        from TestStrings where IntCol
+                        between :start_value and :end_value;
+                end;"""
+        self.cursor.execute(sql, rcursor=ref_cursor, start_value=2,
+                            end_value=4)
+        expected_value = [
+            (2, 'String 2'),
+            (3, 'String 3'),
+            (4, 'String 4')
+        ]
+        rows = ref_cursor.fetchall()
+        ref_cursor.close()
+        self.assertEqual(rows, expected_value)
+        ref_cursor = self.connection.cursor()
+        self.cursor.execute(sql, rcursor=ref_cursor, start_value=5,
+                            end_value=6)
+        expected_value = [
+            (5, 'String 5'),
+            (6, 'String 6')
+        ]
+        rows = ref_cursor.fetchall()
+        self.assertEqual(rows, expected_value)
+
 if __name__ == "__main__":
     test_env.run_test_cases()

test/test_2300_object_var.py

@@ -19,31 +19,11 @@
 
 class TestCase(test_env.BaseTestCase):
 
-    def __get_object_as_tuple(self, obj):
-        if obj.type.iscollection:
-            value = []
-            for v in obj.aslist():
-                if isinstance(v, oracledb.Object):
-                    v = self.__get_object_as_tuple(v)
-                elif isinstance(value, oracledb.LOB):
-                    v = v.read()
-                value.append(v)
-            return value
-        attribute_values = []
-        for attribute in obj.type.attributes:
-            value = getattr(obj, attribute.name)
-            if isinstance(value, oracledb.Object):
-                value = self.__get_object_as_tuple(value)
-            elif isinstance(value, oracledb.LOB):
-                value = value.read()
-            attribute_values.append(value)
-        return tuple(attribute_values)
-
     def __test_data(self, expected_int_value, expected_obj_value,
                     expected_array_value):
         int_value, object_value, array_value = self.cursor.fetchone()
         if object_value is not None:
-            object_value = self.__get_object_as_tuple(object_value)
+            object_value = self.get_db_object_as_plain_object(object_value)
         if array_value is not None:
             array_value = array_value.aslist()
         self.assertEqual(int_value, expected_int_value)
@@ -413,7 +393,7 @@ def test_2311_access_sub_object_parent_object_destroyed(self):
         obj.SUBOBJECTARRAY = array_type.newobject([sub_obj1, sub_obj2])
         sub_obj_array = obj.SUBOBJECTARRAY
         del obj
-        self.assertEqual(self.__get_object_as_tuple(sub_obj_array),
+        self.assertEqual(self.get_db_object_as_plain_object(sub_obj_array),
                          [(2, "AB"), (3, "CDE")])
 
     def test_2312_setting_attr_wrong_object_type(self):
@@ -452,15 +432,18 @@ def test_2315_trim_collection_list(self):
             subObj.SUBNUMBERVALUE = num_val
             subObj.SUBSTRINGVALUE = str_val
             array_obj.append(subObj)
-        self.assertEqual(self.__get_object_as_tuple(array_obj), data)
+        self.assertEqual(self.get_db_object_as_plain_object(array_obj), data)
         array_obj.trim(2)
-        self.assertEqual(self.__get_object_as_tuple(array_obj), data[:2])
+        self.assertEqual(self.get_db_object_as_plain_object(array_obj),
+                         data[:2])
         array_obj.trim(1)
-        self.assertEqual(self.__get_object_as_tuple(array_obj), data[:1])
+        self.assertEqual(self.get_db_object_as_plain_object(array_obj),
+                         data[:1])
         array_obj.trim(0)
-        self.assertEqual(self.__get_object_as_tuple(array_obj), data[:1])
+        self.assertEqual(self.get_db_object_as_plain_object(array_obj),
+                         data[:1])
         array_obj.trim(1)
-        self.assertEqual(self.__get_object_as_tuple(array_obj), [])
+        self.assertEqual(self.get_db_object_as_plain_object(array_obj), [])
 
 if __name__ == "__main__":
     test_env.run_test_cases()

test/test_2500_string_var.py

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
 #
 # Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
 #
@@ -428,5 +428,17 @@ def test_2531_long_xml_as_string(self):
         actual_value, = self.cursor.fetchone()
         self.assertEqual(actual_value.strip(), xml_string)
 
+    def test_2532_fetch_null_values(self):
+        "2532 - fetching null and not null values can use optimised path"
+        sql = """
+                select * from TestStrings
+                where IntCol between :start_value and :end_value"""
+        self.cursor.execute(sql, start_value=2, end_value=5)
+        self.assertEqual(self.cursor.fetchall(), self.raw_data[1:5])
+        self.cursor.execute(sql, start_value=5, end_value=8)
+        self.assertEqual(self.cursor.fetchall(), self.raw_data[4:8])
+        self.cursor.execute(sql, start_value=8, end_value=10)
+        self.assertEqual(self.cursor.fetchall(), self.raw_data[7:10])
+
 if __name__ == "__main__":
     test_env.run_test_cases()