Add the correct pool reconfiguration error messages

Author: sharadraju

doc/src/release_notes.rst

@@ -23,6 +23,12 @@ Common Changes
 #)  Added support for an Oracle Database 23c JSON feature improving JSON
     storage usage.
 
+#)  Updated error thrown during pool reconfiguration while poolMax is 0 from
+    `ORA-24413` to `NJS-007`.
+
+#)  Added new condition check during pool reconfiguration for `poolMin > poolMax`
+    and error `NJS-092` will be thrown.
+
 Thin Mode Changes
 ++++++++++++++++++
 

lib/connection.js

@@ -570,11 +570,8 @@ class Connection extends EventEmitter {
     } else {
 
       // fetchArraySize must be a positive integer
-      if (options.fetchArraySize !== undefined) {
-        errors.assertParamPropValue(Number.isInteger(options.fetchArraySize) &&
-          options.fetchArraySize > 0, 3, "fetchArraySize");
-        outOptions.fetchArraySize = options.fetchArraySize;
-      }
+      errors.assertParamPropUnsignedIntNonZero(options, 3, "fetchArraySize");
+      outOptions.fetchArraySize = options.fetchArraySize;
 
       // fetchInfo must be an object with keys containing an object with a
       // "type" property; these are converted to an array of objects for ease

lib/errors.js

@@ -549,6 +549,19 @@ function assertParamPropUnsignedInt(obj, parameterNum, propName) {
   }
 }
 
+//-----------------------------------------------------------------------------
+// assertParamPropUnsignedIntNonZero()
+//
+// Asserts that the property value of a parameter is a positive integer value
+// (or undefined).
+//-----------------------------------------------------------------------------
+function assertParamPropUnsignedIntNonZero(obj, parameterNum, propName) {
+  if (obj[propName] !== undefined) {
+    assertParamPropValue(Number.isInteger(obj[propName]) && obj[propName] > 0,
+      parameterNum, propName);
+  }
+}
+
 //-----------------------------------------------------------------------------
 // assertParamPropString()
 //
@@ -825,6 +838,7 @@ module.exports = {
   assertParamPropInt,
   assertParamPropString,
   assertParamPropUnsignedInt,
+  assertParamPropUnsignedIntNonZero,
   assertParamPropValue,
   assertParamValue,
   assertPropValue,

lib/pool.js

@@ -681,14 +681,20 @@ class Pool extends EventEmitter {
     errors.assertParamPropBool(options, 1, "enableStatistics");
     errors.assertParamPropBool(options, 1, "resetStatistics");
     errors.assertParamPropUnsignedInt(options, 1, "poolMin");
-    errors.assertParamPropUnsignedInt(options, 1, "poolMax");
+    errors.assertParamPropUnsignedIntNonZero(options, 1, "poolMax");
     errors.assertParamPropUnsignedInt(options, 1, "poolMaxPerShard");
     errors.assertParamPropUnsignedInt(options, 1, "poolIncrement");
     errors.assertParamPropInt(options, 1, "poolPingInterval");
     errors.assertParamPropUnsignedInt(options, 1, "poolTimeout");
     errors.assertParamPropUnsignedInt(options, 1, "stmtCacheSize");
     errors.assertParamPropBool(options, 1, "sodaMetaDataCache");
 
+    // poolMax must be greater than or equal to poolMin
+    if (options.poolMin > options.poolMax) {
+      errors.throwErr(errors.ERR_INVALID_NUMBER_OF_CONNECTIONS, options.poolMax,
+        options.poolMin);
+    }
+
     // reconfiguration can happen only when status is OPEN
     this._checkPoolOpen(false);
 

test/poolReconfigure.js

@@ -1165,14 +1165,18 @@ describe('255. poolReconfigure.js', function() {
 
       await assert.rejects(
         async () => await pool.reconfigure({poolMax: 0}),
-        /ORA-24413:/
+        /NJS-007:/
       );
 
       await assert.rejects(
         async () => await pool.reconfigure({poolMax: "10"}),
         /NJS-007:/
       );
 
+      await assert.rejects(
+        async () => await pool.reconfigure({poolMax: 4, poolMin: 5}),
+        /NJS-092:/
+      );
     });
 
     it('255.5.4 passing invalid poolIncrement to pool.reconfigure', async function() {