Test improvements.

Author: anthony-tuininga

tests/test_1600_dml_returning.py

@@ -440,7 +440,7 @@ def test_1617_dml_returning_with_input_bind_vars(self):
 
     def test_1618_dml_returning_with_lob_and_outconverter(self):
         "1618 - test DML returning with LOBs and an output converter"
-        self.cursor.execute("truncate table TestCLOBs")
+        self.cursor.execute("delete from TestCLOBs")
         out_var = self.cursor.var(
             oracledb.DB_TYPE_CLOB, outconverter=lambda value: value.read()
         )
@@ -459,7 +459,7 @@ def test_1618_dml_returning_with_lob_and_outconverter(self):
 
     def test_1619_dml_returning_with_clob_converted_to_long(self):
         "1619 - test DML returning with CLOB converted to LONG"
-        self.cursor.execute("truncate table TestCLOBs")
+        self.cursor.execute("delete from TestCLOBs")
         out_var = self.cursor.var(oracledb.DB_TYPE_LONG)
         lob_value = "A short CLOB - 1619"
         self.cursor.execute(

tests/test_1900_lob_var.py

@@ -51,7 +51,8 @@ def __get_temp_lobs(self, sid):
     def __perform_test(self, lob_type, input_type):
         long_string = ""
         db_type = getattr(oracledb, f"DB_TYPE_{lob_type}")
-        self.cursor.execute(f"truncate table Test{lob_type}s")
+        self.cursor.execute(f"delete from Test{lob_type}s")
+        self.conn.commit()
         for i in range(11):
             if i > 0:
                 char = chr(ord("A") + i - 1)
@@ -90,7 +91,8 @@ def __test_bind_ordering(self, lob_type):
             extra_col_1 = extra_col_1.encode()
             extra_col_2 = extra_col_2.encode()
         self.conn.stmtcachesize = 0
-        self.cursor.execute(f"truncate table Test{lob_type}s")
+        self.cursor.execute(f"delete from Test{lob_type}s")
+        self.conn.commit()
         data = (1, main_col, 8, extra_col_1, 15, extra_col_2)
         self.cursor.execute(
             f"""
@@ -106,7 +108,8 @@ def __test_bind_ordering(self, lob_type):
             self.assertEqual(self.cursor.fetchone(), data)
 
     def __test_fetch_lobs_direct(self, lob_type):
-        self.cursor.execute(f"truncate table Test{lob_type}s")
+        self.cursor.execute(f"delete from Test{lob_type}s")
+        self.conn.commit()
         data = []
         long_string = ""
         for i in range(1, 11):
@@ -135,7 +138,8 @@ def __test_fetch_lobs_direct(self, lob_type):
             self.assertEqual(self.cursor.fetchall(), data)
 
     def __test_lob_operations(self, lob_type):
-        self.cursor.execute(f"truncate table Test{lob_type}s")
+        self.cursor.execute(f"delete from Test{lob_type}s")
+        self.conn.commit()
         self.cursor.setinputsizes(long_string=getattr(oracledb, lob_type))
         long_string = "X" * 75000
         write_value = "TEST"
@@ -214,7 +218,8 @@ def __test_pickle(self, lob_type):
         self.assertEqual(unpickled_value, value)
 
     def __test_temporary_lob(self, lob_type):
-        self.cursor.execute(f"truncate table Test{lob_type}s")
+        self.cursor.execute(f"delete from Test{lob_type}s")
+        self.conn.commit()
         value = "A test string value"
         if lob_type == "BLOB":
             value = value.encode("ascii")
@@ -267,14 +272,15 @@ def __validate_query(self, rows, lob_type):
 
     def test_1900_bind_lob_value(self):
         "1900 - test binding a LOB value directly"
-        self.cursor.execute("truncate table TestCLOBs")
+        self.cursor.execute("delete from TestCLOBs")
         self.cursor.execute(
             """
             insert into TestCLOBs
             (IntCol, ClobCol)
             values (1, 'Short value')
             """
         )
+        self.conn.commit()
         self.cursor.execute("select ClobCol from TestCLOBs")
         (lob,) = self.cursor.fetchone()
         self.cursor.execute(
@@ -343,9 +349,7 @@ def test_1911_create_temp_nclob(self):
     def test_1912_multiple_fetch(self):
         "1912 - test retrieving data from a CLOB after multiple fetches"
         self.cursor.arraysize = 1
-        self.cursor.execute("select * from TestCLOBS")
-        rows = self.cursor.fetchall()
-        self.__validate_query(rows, "CLOB")
+        self.__perform_test("CLOB", oracledb.DB_TYPE_CLOB)
 
     def test_1913_nclob_cursor_description(self):
         "1913 - test cursor description is accurate for NCLOBs"
@@ -363,7 +367,7 @@ def test_1914_nclob_direct(self):
     def test_1915_nclob_non_ascii_chars(self):
         "1915 - test binding and fetching NCLOB data (with non-ASCII chars)"
         value = "\u03b4\u4e2a"
-        self.cursor.execute("truncate table TestNCLOBs")
+        self.cursor.execute("delete from TestNCLOBs")
         self.cursor.setinputsizes(val=oracledb.DB_TYPE_NVARCHAR)
         self.cursor.execute(
             """
@@ -372,6 +376,7 @@ def test_1915_nclob_non_ascii_chars(self):
             """,
             val=value,
         )
+        self.conn.commit()
         self.cursor.execute("select NCLOBCol from TestNCLOBs")
         (nclob,) = self.cursor.fetchone()
         self.cursor.setinputsizes(val=oracledb.DB_TYPE_NVARCHAR)
@@ -429,7 +434,7 @@ def test_1920_supplemental_characters(self):
             "𠽌 𠾴 𠾼 𠿪 𡁜 𡁯 𡁵 𡁶 𡁻 𡃁 𡃉 𡇙 𢃇 𢞵 𢫕 𢭃 𢯊 𢱑 𢱕 𢳂 𢴈 "
             "𢵌 𢵧 𢺳 𣲷 𤓓 𤶸 𤷪 𥄫 𦉘 𦟌 𦧲 𦧺 𧨾 𨅝 𨈇 𨋢 𨳊 𨳍 𨳒 𩶘"
         )
-        self.cursor.execute("truncate table TestCLOBs")
+        self.cursor.execute("delete from TestCLOBs")
         lob = self.conn.createlob(oracledb.DB_TYPE_CLOB)
         lob.write(supplemental_chars)
         self.cursor.execute(

tests/test_2300_object_var.py

@@ -289,9 +289,9 @@ def test_2306_object_type(self):
 
     def test_2307_round_trip_object(self):
         "2307 - test inserting and then querying object with all data types"
-        self.cursor.execute("truncate table TestClobs")
-        self.cursor.execute("truncate table TestNClobs")
-        self.cursor.execute("truncate table TestBlobs")
+        self.cursor.execute("delete from TestClobs")
+        self.cursor.execute("delete from TestNClobs")
+        self.cursor.execute("delete from TestBlobs")
         self.cursor.execute(
             """
             insert into TestClobs (IntCol, ClobCol)

tests/test_3500_json.py

@@ -70,7 +70,7 @@ class TestCase(test_env.BaseTestCase):
     ]
 
     def __bind_scalar_as_json(self, data):
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         out_var = self.cursor.var(oracledb.DB_TYPE_JSON, arraysize=len(data))
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON, out_var)
         bind_data = list(enumerate(data))
@@ -86,7 +86,7 @@ def __bind_scalar_as_json(self, data):
 
     def test_3500_insert_and_fetch_single_json(self):
         "3500 - insert and fetch single row with JSON"
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
         self.cursor.execute(
             "insert into TestJson values (:1, :2)", [1, self.json_data]
@@ -98,7 +98,7 @@ def test_3500_insert_and_fetch_single_json(self):
     def test_3501_execute_with_dml_returning(self):
         "3501 - inserting single rows with JSON and DML returning"
         json_val = self.json_data[11]
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         json_out = self.cursor.var(oracledb.DB_TYPE_JSON)
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON, json_out)
         self.cursor.execute(
@@ -113,7 +113,7 @@ def test_3501_execute_with_dml_returning(self):
 
     def test_3502_insert_and_fetch_multiple_json(self):
         "3502 - insert and fetch multiple rows with JSON"
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
         data = list(enumerate(self.json_data))
         self.cursor.executemany("insert into TestJson values(:1, :2)", data)
@@ -122,7 +122,7 @@ def test_3502_insert_and_fetch_multiple_json(self):
 
     def test_3503_executemany_with_dml_returning(self):
         "3503 - inserting multiple rows with JSON and DML returning"
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         int_values = [i for i in range(len(self.json_data))]
         out_int_var = self.cursor.var(int, arraysize=len(int_values))
         out_json_var = self.cursor.var(
@@ -189,7 +189,7 @@ def test_3507_bind_number(self):
 
     def test_3508_unsupported_python_type_bind(self):
         "3508 - test binding unsupported python type with JSON"
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
         insert_sql = "insert into TestJson values (:1, :2)"
         self.assertRaisesRegex(
@@ -268,7 +268,7 @@ def test_3510_fetch_all_supported_types(self):
 
     def test_3511_update_json(self):
         "3511 - test inserting and updating JSON"
-        self.cursor.execute("truncate table TestJSON")
+        self.cursor.execute("delete from TestJSON")
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
         self.cursor.executemany(
             "insert into TestJSON values (:1, :2)",
@@ -287,7 +287,7 @@ def test_3511_update_json(self):
 
     def test_3512_json_query(self):
         "3512 - test fetching json with json_query"
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
         self.cursor.executemany(
             "insert into TestJSON values (:1, :2)",
@@ -307,7 +307,7 @@ def test_3512_json_query(self):
 
     def test_3513_json_exists(self):
         "3513 - test fetching json with json_exists"
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
         self.cursor.executemany(
             "insert into TestJSON values (:1, :2)",
@@ -327,7 +327,7 @@ def test_3513_json_exists(self):
 
     def test_3514_select_json(self):
         "3514 - test selecting json data"
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
         self.cursor.executemany(
             "insert into TestJSON values (:1, :2)",
@@ -350,7 +350,7 @@ def test_3514_select_json(self):
 
     def test_3515_json_serialize(self):
         "3515 - test fetching json with json_serialize"
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         data = [{"a": 12.5}, {"b": True}, {"c": None}]
         expected_data = ['{"a":12.5}', '{"b":true}', '{"c":null}']
         self.cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)

tests/test_3600_outputtypehandler.py

@@ -59,7 +59,7 @@ def type_handler(cursor, metadata):
         in_value = f"Some {lob_type} data"
         if lob_type == "BLOB":
             in_value = in_value.encode()
-        self.cursor.execute(f"truncate table Test{lob_type}s")
+        self.cursor.execute(f"delete from Test{lob_type}s")
         self.cursor.execute(
             f"""
             insert into Test{lob_type}s (IntCol, {lob_type}Col)

tests/test_3800_typehandler.py

@@ -255,7 +255,7 @@ def output_type_handler(cursor, metadata):
                     outconverter=lambda v: json.loads(v.read()),
                 )
 
-        self.cursor.execute("truncate table TestJson")
+        self.cursor.execute("delete from TestJson")
         insert_sql = "insert into TestJson values (:1, :2)"
         json_data = [
             dict(name="John", city="Delhi"),

tests/test_4300_cursor_other.py

@@ -558,15 +558,15 @@ def type_handler(cursor, metadata):
 
         self.conn.outputtypehandler = type_handler
         blob_data = b"An arbitrary set of blob data for test case 4348"
-        self.cursor.execute("truncate table TestBLOBs")
+        self.cursor.execute("delete from TestBLOBs")
         self.cursor.execute(
             "insert into TestBLOBs (IntCol, BlobCol) values (1, :data)",
             [blob_data],
         )
         self.cursor.execute("select IntCol, BlobCol from TestBLOBs")
         self.assertEqual(self.cursor.fetchall(), [(1, blob_data)])
 
-        self.cursor.execute("truncate table TestBLOBs")
+        self.cursor.execute("delete from TestBLOBs")
         self.cursor.execute(
             "insert into TestBLOBs (IntCol, BlobCol) values (1, :data)",
             [blob_data],
@@ -777,7 +777,7 @@ def test_4350_rowcount_after_close(self):
 
     def test_4351_change_of_bind_type_with_define(self):
         "4351 - changing bind type with define needed"
-        self.cursor.execute("truncate table TestClobs")
+        self.cursor.execute("delete from TestClobs")
         row_for_1 = (1, "Short value 1")
         row_for_56 = (56, "Short value 56")
         for data in (row_for_1, row_for_56):
@@ -876,7 +876,7 @@ def test_4356_cursor_rowcount_for_queries(self):
 
     def test_4357_bind_order_for_plsql(self):
         "4357 - test bind order for PL/SQL"
-        self.cursor.execute("truncate table TestClobs")
+        self.cursor.execute("delete from TestClobs")
         sql = """
             insert into TestClobs (IntCol, CLOBCol, ExtraNumCol1)
             values (:1, :2, :3)"""