Correct handling of XID binary components in thin mode.

Author: anthony-tuininga

src/oracledb/impl/thin/messages.pyx

@@ -2528,14 +2528,12 @@ cdef class TransactionChangeStateMessage(Message):
         # acquire data to send to the server
         if self.xid is not None:
             format_id = self.xid[0]
-            if isinstance(self.xid[1], bytes):
-                global_transaction_id = self.xid[1]
-            else:
-                global_transaction_id = self.xid[1].encode()
-            if isinstance(self.xid[2], bytes):
-                branch_qualifier = self.xid[2]
-            else:
-                branch_qualifier = self.xid[2].encode()
+            global_transaction_id = self.xid[1] \
+                    if isinstance(self.xid[1], bytes) \
+                    else self.xid[1].encode()
+            branch_qualifier = self.xid[2] \
+                    if isinstance(self.xid[2], bytes) \
+                    else self.xid[2].encode()
             xid_bytes = global_transaction_id + branch_qualifier
             xid_bytes += bytes(128 - len(xid_bytes))
 
@@ -2609,8 +2607,12 @@ cdef class TransactionSwitchMessage(Message):
         # acquire data to send to the server
         if self.xid is not None:
             format_id = self.xid[0]
-            global_transaction_id = self.xid[1].encode()
-            branch_qualifier = self.xid[2].encode()
+            global_transaction_id = self.xid[1] \
+                    if isinstance(self.xid[1], bytes) \
+                    else self.xid[1].encode()
+            branch_qualifier = self.xid[2] \
+                    if isinstance(self.xid[2], bytes) \
+                    else self.xid[2].encode()
             xid_bytes = global_transaction_id + branch_qualifier
             xid_bytes += bytes(128 - len(xid_bytes))
         if self.conn_impl._internal_name is not None:

tests/test_4400_tpc.py

@@ -34,7 +34,7 @@ class TestCase(test_env.BaseTestCase):
     def test_4400(self):
         "4400 - test begin, prepare, roll back global transaction"
         self.cursor.execute("truncate table TestTempTable")
-        xid = self.conn.xid(3900, "txn3900", "branchId")
+        xid = self.conn.xid(3900, b"txn3900", b"branchId")
         self.conn.tpc_begin(xid)
         self.assertEqual(self.conn.tpc_prepare(), False)
         self.conn.tpc_begin(xid)
@@ -70,7 +70,7 @@ def test_4402(self):
         "4402 - test multiple global transactions on the same connection"
         self.cursor.execute("truncate table TestTempTable")
         xid1 = self.conn.xid(3902, "txn3902", "branch1")
-        xid2 = self.conn.xid(3902, "txn3902", "branch2")
+        xid2 = self.conn.xid(3902, b"txn3902", b"branch2")
         self.conn.tpc_begin(xid1)
         self.cursor.execute(
             """
@@ -102,7 +102,7 @@ def test_4402(self):
     def test_4403(self):
         "4403 - test rollback with parameter xid"
         self.cursor.execute("truncate table TestTempTable")
-        xid1 = self.conn.xid(3901, "txn3901", "branch1")
+        xid1 = self.conn.xid(3901, b"txn3901", b"branch1")
         xid2 = self.conn.xid(3902, "txn3902", "branch2")
         for count, xid in enumerate([xid1, xid2]):
             self.conn.tpc_begin(xid)
@@ -170,7 +170,7 @@ def test_4406(self):
         "4406 - test ending a transaction with parameter xid"
         self.cursor.execute("truncate table TestTempTable")
         xid1 = self.conn.xid(4406, "txn4406a", "branch3")
-        xid2 = self.conn.xid(4406, "txn4406b", "branch4")
+        xid2 = self.conn.xid(4406, b"txn4406b", b"branch4")
         self.conn.tpc_begin(xid1)
         self.cursor.execute(
             """