Fixed bug in the calculation of attribute

MessageProperties.deliverymode. Previously it was being set to the value
of the attribute DeqOptions.deliverymode.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -21,6 +21,9 @@ Thin Mode Changes
     thick mode`` is now raised when attempting to use session tagging with a
     connection pool. Previously a ``NotImplementedError`` exception was raised
     instead.
+#)  Fixed bug in the calculation of attribute
+    :attr:`MessageProperties.deliverymode`. Previously it was being set to the
+    value of the attribute :attr:`DeqOptions.deliverymode`.
 
 Thick Mode Changes
 ++++++++++++++++++

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

@@ -69,9 +69,6 @@ cdef class AqArrayMessage(AqBaseMessage):
                     props_impl.msgid = msgid[j * 16:(j + 1) * 16]
             else:
                 props_impl.msgid = msgid
-                props_impl.delivery_mode = (
-                    self.deq_options_impl.delivery_mode
-                )
             buf.read_ub2(&temp16)               # extensions len
             if temp16 > 0:
                 errors._raise_err(errors.ERR_NOT_IMPLEMENTED)

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

@@ -121,7 +121,11 @@ cdef class AqBaseMessage(Message):
             errors._raise_err(errors.ERR_NOT_IMPLEMENTED)
         buf.skip_ub4()                              # csn
         buf.skip_ub4()                              # dsn
-        buf.skip_ub4()                              # flags
+        buf.read_ub4(&temp32)                       # flags
+        if temp32 == TNS_KPD_AQ_BUFMSG:
+            props_impl.delivery_mode = TNS_AQ_MSG_BUFFERED
+        else:
+            props_impl.delivery_mode = TNS_AQ_MSG_PERSISTENT
         if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_21_1:
             buf.skip_ub4()                          # shard number
 

src/oracledb/impl/thin/queue.pyx

@@ -74,7 +74,6 @@ cdef class BaseThinQueueImpl(BaseQueueImpl):
         message = self._conn_impl._create_message(AqDeqMessage)
         message.queue_impl = self
         message.deq_options_impl = self.deq_options_impl
-        props_impl.delivery_mode = message.deq_options_impl.delivery_mode
         message.props_impl = props_impl
         return message
 

tests/test_2700_aq_dbobject.py

@@ -239,6 +239,7 @@ def test_2710(self):
         queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
         queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
         props = queue.deqone()
+        self.assertEqual(props.deliverymode, oracledb.MSG_BUFFERED)
         book = props.payload
         results = (book.TITLE, book.AUTHORS, book.PRICE)
         other_conn.commit()
@@ -264,6 +265,7 @@ def test_2711(self):
         queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
         queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
         props = queue.deqone()
+        self.assertEqual(props.deliverymode, oracledb.MSG_PERSISTENT)
         book = props.payload
         results = (book.TITLE, book.AUTHORS, book.PRICE)
         other_conn.commit()
@@ -289,6 +291,7 @@ def test_2712(self):
         queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
         queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
         props = queue.deqone()
+        self.assertEqual(props.deliverymode, oracledb.MSG_PERSISTENT)
         book = props.payload
         results = (book.TITLE, book.AUTHORS, book.PRICE)
         other_conn.commit()

tests/test_8400_aq_dbobject_async.py

@@ -209,6 +209,7 @@ async def test_8409(self):
             queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
             queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
             props = await queue.deqone()
+            self.assertEqual(props.deliverymode, oracledb.MSG_BUFFERED)
             book = props.payload
             results = (book.TITLE, book.AUTHORS, book.PRICE)
             await other_conn.commit()
@@ -234,6 +235,7 @@ async def test_8410(self):
             queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
             queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
             props = await queue.deqone()
+            self.assertEqual(props.deliverymode, oracledb.MSG_PERSISTENT)
             book = props.payload
             results = (book.TITLE, book.AUTHORS, book.PRICE)
             await other_conn.commit()
@@ -259,6 +261,7 @@ async def test_8411(self):
             queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
             queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
             props = await queue.deqone()
+            self.assertEqual(props.deliverymode, oracledb.MSG_PERSISTENT)
             book = props.payload
             results = (book.TITLE, book.AUTHORS, book.PRICE)
             await other_conn.commit()