Code update to the settable parameters and bug fixes

Author: sharadraju

doc/src/user_guide/connection_handling.rst

@@ -4498,7 +4498,7 @@ in node-oracledb to access the information stored in OCI Object Storage. The
 :meth:`oracledb.createPool()` should be a URL such as::
 
     config-ociobject://<objectstorage-name>/n/<namespaceName>/b/<bucketName>/o/
-    <objectName>[/c/<networkServiceName>][?<option1>=<value1>&<option2>=<value2>...]
+    <objectName>[?key=<networkServiceName>&<option1>=<value1>&<option2>=<value2>...]
 
 The parameters of the connection string are detailed in the table below.
 
@@ -4515,7 +4515,7 @@ The parameters of the connection string are detailed in the table below.
     * - ``config-ociobject``
       - Required
       - Indicates that the configuration provider is OCI Object Storage.
-    * - ``<server-name>``
+    * - ``<objectstorage-name>``
       - Required
       - The URL of OCI Object Storage endpoint.
     * - ``<namespaceName>``
@@ -4527,7 +4527,7 @@ The parameters of the connection string are detailed in the table below.
     * - ``<objectName>``
       - Required
       - The JSON file name.
-    * - ``<networkServiceName>``
+    * - ``key=<networkServiceName>``
       - Optional
       - The network service name or alias if the JSON file contains one or more network service names.
     * - ``<options>`` and ``<values>``

lib/thin/protocol/messages/base.js

@@ -296,6 +296,9 @@ class Message {
       this._writeCurrentSchemaPiggyback(buf);
     }
     if (this.connection.statementCache._cursorsToClose.size > 0 && !this.connection._drcpEstablishSession) {
+      // skip closing cursors when '_drcpEstablishSession = true' Since we don't know whether the same session
+      // is in use. We can not send the information across until after the session information has been returned
+      // (on the first round trip).
       this.writeCloseCursorsPiggyBack(buf);
     }
     if (

lib/thin/protocol/messages/sessionRelease.js

@@ -45,6 +45,7 @@ class SessionReleaseMessage extends Message {
   }
 
   encode(buf) {
+    this.writePiggybacks(buf);
     this.writeFunctionHeader(buf);
     buf.writeUInt8(0); // pointer (tag name)
     buf.writeUInt8(0); // tag name length

lib/thin/sqlnet/networkSession.js

@@ -199,7 +199,7 @@ class NetworkSession {
    * Establish network session .Make transport level connection, send NSPTCN(connect packet) and read the response.
    * @returns NetError.(connection successfully established(NetError.CONNECTED) or reason for failure)
    */
-  async connect2(address) {
+  async connect2(address, userConfig) {
     /* Sanitise SDU */
     if (this.sAtts.sdu) {
       if (this.sAtts.sdu > constants.NSPABSSDULN) {
@@ -269,7 +269,7 @@ class NetworkSession {
           redirConnData = this.cData;
         }
 
-        const redirAddressNode = await resolveAddress(adrStr);
+        const redirAddressNode = await resolveAddress(adrStr, userConfig);
         const host = address.hostname;
         address = await redirAddressNode.execute();
         if (address.desc)
@@ -314,10 +314,10 @@ class NetworkSession {
     do {
       try {
         if (this.sAtts.connectTimeout) {
-          const asyncPromise = this.connect2(address);
+          const asyncPromise = this.connect2(address, userConfig);
           connected = await timeout(asyncPromise, this.sAtts.connectTimeout, "connectTimeout", address, this.sAtts.connectionId);
         } else {
-          connected = await this.connect2(address);
+          connected = await this.connect2(address, userConfig);
         }
       } catch (err) {
         if (err.message.startsWith('NJS-510') && !this.ntAdapter.connected) {

lib/util.js

@@ -35,12 +35,13 @@ const constants = require('./constants.js');
 const traceHandler = require('./traceHandler.js');
 
 // set of valid network characters
-const validNetworkCharacterSet = new Set(['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-  'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-  'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-  'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3',
-  '4', '5', '6', '7', '8', '9', '0', '<', '>', '/', '\\', ',', '.', ':', ';', '\'',
-  '"', '-', '_', '$', '+', '*', '#', '&', '!', '%', '?', '@']);
+const validNetworkCharacterSet = new Set(['A', 'B', 'C', 'D', 'E', 'F', 'G',
+  'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+  'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
+  'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '<', '>', '/', '\\', ',',
+  '.', ':', ';', '\'', '"', '-', '_', '$', '+', '*', '#', '&', '!', '%', '?',
+  '@']);
 
 // node-oracledb version number
 let packageJSON;