Fixed bug resulting in "TypeError" when using "DeqOptions.correlation"

for buffered delivery mode.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -33,6 +33,8 @@ Thin Mode Changes
 #)  Pooled connections that are no longer needed are now closed normally if
     possible instead of simply having the socket disconnected
     (`issue 393 <https://github.com/oracle/python-oracledb/issues/393>`__).
+#)  Fixed bug resulting in ``TypeError`` when using
+    :attr:`DeqOptions.correlation`` for buffered delivery mode.
 
 Thick Mode Changes
 ++++++++++++++++++

src/oracledb/impl/thin/messages/aq_base.pyx

@@ -88,7 +88,7 @@ cdef class AqBaseMessage(Message):
                     elif keyword == TNS_AQ_EXT_KEYWORD_AGENT_ADDRESS:
                         props_impl.sender_agent_address = value
                     elif keyword == TNS_AQ_EXT_KEYWORD_AGENT_PROTOCOL:
-                        props_impl.sender_agent_protocol = value
+                        props_impl.sender_agent_protocol = value[0]
                     elif keyword == TNS_AQ_EXT_KEYWORD_ORIGINAL_MSGID:
                         props_impl.original_msg_id = value
 

tests/test_7800_aq_raw.py

@@ -463,6 +463,23 @@ def test_7828(self):
                 setattr(props, name, None)
                 self.assertIsNone(getattr(props, name))
 
+    def test_7829(self):
+        "7829 - test deq options correlation with buffered messages"
+        queue = self.get_and_clear_queue("TEST_RAW_QUEUE")
+        value = self.raw_data[0]
+        props = self.conn.msgproperties(payload=value, correlation="sample")
+        queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
+        queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
+        queue.enqone(props)
+        self.conn.commit()
+        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
+        queue.deqoptions.deliverymode = oracledb.MSG_BUFFERED
+        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
+        queue.deqoptions.correlation = "sample"
+        msg = queue.deqone()
+        self.conn.commit()
+        self.assertEqual(msg.payload, value)
+
 
 if __name__ == "__main__":
     test_env.run_test_cases()

tests/test_7900_aq_raw_async.py

@@ -402,6 +402,23 @@ async def test_7924(self):
         with self.assertRaisesFullCode("DPY-2062"):
             await queue.enqone(props)
 
+    async def test_7925(self):
+        "7925 - test deq options correlation with buffered messages"
+        queue = await self.get_and_clear_queue("TEST_RAW_QUEUE")
+        value = self.raw_data[0]
+        props = self.conn.msgproperties(payload=value, correlation="sample")
+        queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
+        queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
+        await queue.enqone(props)
+        await self.conn.commit()
+        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
+        queue.deqoptions.deliverymode = oracledb.MSG_BUFFERED
+        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
+        queue.deqoptions.correlation = "sample"
+        msg = await queue.deqone()
+        await self.conn.commit()
+        self.assertEqual(msg.payload, value)
+
 
 if __name__ == "__main__":
     test_env.run_test_cases()