Fixed error checking when getting and setting the pool ping interval and

the SODA metadata cache flag.

Author: anthony-tuininga

Diff for: doc/src/release_notes.rst

@@ -24,6 +24,9 @@ Thin Mode Changes
 Thick Mode Changes
 ++++++++++++++++++
 
+#)  Fixed error checking when getting and setting the pool ping interval and
+    the SODA metadata cache flag.
+
 Common Changes
 ++++++++++++++
 

Diff for: src/oracledb/impl/thick/pool.pyx

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -255,7 +255,7 @@ cdef class ThickPoolImpl(BasePoolImpl):
         """
         cdef int value
         if dpiPool_getPingInterval(self._handle, &value) < 0:
-            _raise_from_odpi
+            _raise_from_odpi()
         return value
 
     def get_soda_metadata_cache(self):
@@ -264,7 +264,7 @@ cdef class ThickPoolImpl(BasePoolImpl):
         """
         cdef bint value
         if dpiPool_getSodaMetadataCache(self._handle, &value) < 0:
-            _raise_from_odpi
+            _raise_from_odpi()
         return value
 
     def get_stmt_cache_size(self):
@@ -331,14 +331,14 @@ cdef class ThickPoolImpl(BasePoolImpl):
         Internal method for setting the value of the pool-ping-interval.
         """
         if dpiPool_setPingInterval(self._handle, value) < 0:
-            _raise_from_odpi
+            _raise_from_odpi()
 
     def set_soda_metadata_cache(self, bint value):
         """
         Internal method for enabling or disabling the soda metadata cache.
         """
         if dpiPool_setSodaMetadataCache(self._handle, value) < 0:
-            _raise_from_odpi
+            _raise_from_odpi()
 
     def set_stmt_cache_size(self, uint32_t value):
         """

Diff for: tests/test_2400_pool.py

@@ -94,27 +94,26 @@ def __perform_reconfigure_test(self, parameter_name, parameter_value,
                                    getmode=oracledb.POOL_GETMODE_WAIT,
                                    soda_metadata_cache=False):
         creation_args = dict(min=min, max=max, increment=increment,
-                             timeout=timeout, wait_timeout=wait_timeout,
-                             stmtcachesize=stmtcachesize,
-                             max_lifetime_session=max_lifetime_session,
-                             max_sessions_per_shard=max_sessions_per_shard,
-                             ping_interval=ping_interval, getmode=getmode,
-                             soda_metadata_cache=soda_metadata_cache)
+                             timeout=timeout, stmtcachesize=stmtcachesize,
+                             ping_interval=ping_interval, getmode=getmode)
+        if test_env.get_client_version() >= (12, 1):
+            creation_args["max_lifetime_session"] = max_lifetime_session
+        if test_env.get_client_version() >= (12, 2):
+            creation_args["wait_timeout"] = wait_timeout
+        if test_env.get_client_version() >= (18, 3):
+            creation_args["max_sessions_per_shard"] = max_sessions_per_shard
+        if test_env.get_client_version() >= (19, 11):
+            creation_args["soda_metadata_cache"] = soda_metadata_cache
+
         reconfigure_args = {}
         reconfigure_args[parameter_name] = parameter_value
 
         pool = test_env.get_pool(**creation_args)
         conn = pool.acquire()
         pool.reconfigure(**reconfigure_args)
-        actual_args = dict(min=pool.min, max=pool.max,
-                           increment=pool.increment, timeout=pool.timeout,
-                           wait_timeout=pool.wait_timeout,
-                           stmtcachesize=pool.stmtcachesize,
-                           max_lifetime_session=pool.max_lifetime_session,
-                           max_sessions_per_shard=pool.max_sessions_per_shard,
-                           ping_interval=pool.ping_interval,
-                           getmode=pool.getmode,
-                           soda_metadata_cache=pool.soda_metadata_cache)
+        actual_args = {}
+        for name in creation_args:
+            actual_args[name] = getattr(pool, name)
         expected_args = creation_args.copy()
         expected_args.update(reconfigure_args)
         self.assertEqual(actual_args, expected_args)
@@ -480,13 +479,16 @@ def test_2416_test_reconfigure_pool_with_missing_values(self):
         self.__perform_reconfigure_test("max", 20)
         self.__perform_reconfigure_test("increment", 5)
         self.__perform_reconfigure_test("timeout", 10)
-        self.__perform_reconfigure_test("wait_timeout", 8000)
         self.__perform_reconfigure_test("stmtcachesize", 40)
-        self.__perform_reconfigure_test("max_lifetime_session", 2000)
-        self.__perform_reconfigure_test("max_sessions_per_shard", 5)
         self.__perform_reconfigure_test("ping_interval", 50)
         self.__perform_reconfigure_test("getmode",
                                         oracledb.POOL_GETMODE_NOWAIT)
+        if test_env.get_client_version() >= (12, 1):
+            self.__perform_reconfigure_test("max_lifetime_session", 2000)
+        if test_env.get_client_version() >= (12, 2):
+            self.__perform_reconfigure_test("wait_timeout", 8000)
+        if test_env.get_client_version() >= (18, 3):
+            self.__perform_reconfigure_test("max_sessions_per_shard", 5)
         if test_env.get_client_version() >= (19, 11):
             self.__perform_reconfigure_test("soda_metadata_cache", True)