oracledb 5.1.0 → 5.4.0

package/lib/poolStatistics.js

@@ -0,0 +1,124 @@
+// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+//-----------------------------------------------------------------------------
+//
+// You may not use the identified files except in compliance with the Apache
+// License, Version 2.0 (the "License.")
+//
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0.
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-----------------------------------------------------------------------------
+
+'use strict';
+
+//-----------------------------------------------------------------------------
+// class PoolStatistics
+//  collection of statistics metrics for Pool object
+//-----------------------------------------------------------------------------
+
+class PoolStatistics {
+
+  constructor(pool) {
+    let averageTimeInQueue = 0;
+
+    if (pool._totalRequestsEnqueued !== 0) {
+      averageTimeInQueue = Math.round(pool._totalTimeInQueue /
+        pool._totalRequestsEnqueued);
+    }
+
+    this.gatheredDate = Date.now ();
+    this.upTime = this.gatheredDate - pool._createdDate;
+    this.upTimeSinceReset = this.gatheredDate - pool._timeOfReset;
+    this.connectionRequests = pool._totalConnectionRequests;
+    this.requestsEnqueued = pool._totalRequestsEnqueued;
+    this.requestsDequeued = pool._totalRequestsDequeued;
+    this.failedRequests = pool._totalFailedRequests;
+    this.rejectedRequests = pool._totalRequestsRejected;
+    this.requestTimeouts = pool._totalRequestTimeouts;
+    this.maximumQueueLength = pool._maximumQueueLength;
+    this.currentQueueLength = pool._connRequestQueue.length;
+    this.timeInQueue = pool._totalTimeInQueue;
+    this.minimumTimeInQueue = pool._minTimeInQueue;
+    this.maximumTimeInQueue = pool._maxTimeInQueue;
+    this.averageTimeInQueue = averageTimeInQueue;
+    this.connectionsInUse = pool.connectionsInUse;
+    this.connectionsOpen = pool.connectionsOpen;
+    this.connectString = pool.connectString;
+    this.edition = pool.edition;
+    this.events = pool.events;
+    this.externalAuth = pool.externalAuth;
+    this.homogeneous = pool.homogeneous;
+    this.poolAlias = pool.poolAlias;
+    this.poolIncrement = pool.poolIncrement;
+    this.poolMax = pool.poolMax;
+    this.poolMaxPerShard = pool.poolMaxPerShard;
+    this.poolMin = pool.poolMin;
+    this.poolPingInterval = pool.poolPingInterval;
+    this.poolTimeout = pool.poolTimeout;
+    this.queueMax = pool.queueMax;
+    this.queueTimeout = pool.queueTimeout;
+    this.sodaMetaDataCache = pool.sodaMetaDataCache;
+    this.stmtCacheSize = pool.stmtCacheSize;
+    this.user = pool.user;
+    this.threadPoolSize = process.env.UV_THREADPOOL_SIZE;
+  }
+
+  //---------------------------------------------------------------------------
+  // logStatistics()
+  //  To print the statistics metrics of the pool
+  //---------------------------------------------------------------------------
+  logStatistics() {
+    console.log('\nPool statistics:');
+    console.log('...gathered at:', new Date(this.gatheredDate).toISOString());
+    console.log('...up time (milliseconds):', this.upTime);
+    console.log('...up time from last reset (milliseconds)',
+      this.upTimeSinceReset);
+    console.log('...connection requests:', this.connectionRequests);
+    console.log('...requests enqueued:', this.requestsEnqueued);
+    console.log('...requests dequeued:', this.requestsDequeued);
+    console.log('...requests failed:', this.failedRequests);
+    console.log('...requests exceeding queueMax:', this.rejectedRequests);
+    console.log('...requests exceeding queueTimeout:', this.requestTimeouts);
+    console.log('...current queue length:', this.currentQueueLength);
+    console.log('...maximum queue length:', this.maximumQueueLength);
+    console.log('...sum of time in queue (milliseconds):', this.timeInQueue);
+    console.log('...minimum time in queue (milliseconds):',
+      this.minimumTimeInQueue);
+    console.log('...maximum time in queue (milliseconds):',
+      this.maximumTimeInQueue);
+    console.log('...average time in queue (milliseconds):',
+      this.averageTimeInQueue);
+    console.log('...pool connections in use:', this.connectionsInUse);
+    console.log('...pool connections open:', this.connectionsOpen);
+    console.log('Pool attributes:');
+    console.log('...connectString:', this.connectString);
+    console.log('...edition:', this.edition);
+    console.log('...events:', this.events);
+    console.log('...externalAuth:', this.externalAuth);
+    console.log('...homogeneous:', this.homogeneous);
+    console.log('...poolAlias:', this.poolAlias);
+    console.log('...poolIncrement:', this.poolIncrement);
+    console.log('...poolMax:', this.poolMax);
+    console.log('...poolMaxPerShard:', this.poolMaxPerShard);
+    console.log('...poolMin:', this.poolMin);
+    console.log('...poolPingInterval (seconds):', this.poolPingInterval);
+    console.log('...poolTimeout (seconds):', this.poolTimeout);
+    console.log('...queueMax:', this.queueMax);
+    console.log('...queueTimeout (milliseconds):', this.queueTimeout);
+    console.log('...sessionCallback:', this.sessionCallback);
+    console.log('...sodaMetaDataCache:', this.sodaMetaDataCache);
+    console.log('...stmtCacheSize:', this.stmtCacheSize);
+    console.log('...user:', this.user);
+    console.log('Related environment variables:');
+    console.log('...UV_THREADPOOL_SIZE:', this.threadPoolSize);
+  }
+}
+
+module.exports = PoolStatistics;

package/lib/queryStream.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2015, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -89,11 +89,6 @@ class QueryStream extends Readable {
       this._fetching = true;
       this._resultSet._allowGetRowCall = true;
       const row = await this._resultSet.getRow();
-      this._fetching = false;
-      if (!this._resultSet) {
-        this.emit('_doneFetching');
-        return;
-      }
       if (row) {
         this.push(row);
       } else {
@@ -101,6 +96,13 @@ class QueryStream extends Readable {
       }
     } catch (err) {
       this.destroy(err);
+    } finally {
+      this._fetching = false;
+      if (this._resultSet) {
+        this._resultSet._allowGetRowCall = false;
+      } else {
+        this.emit('_doneFetching');
+      }
     }
   }
 

package/lib/resultset.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2016, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -72,9 +72,14 @@ async function getRow() {
 async function getRows(numRows) {
   let rowsNeeded;
 
-  nodbUtil.checkArgCount(arguments, 1, 1);
-  nodbUtil.assert(Number.isInteger(numRows), 'NJS-005', 2);
-  nodbUtil.assert(numRows > 0, 'NJS-005', 2);
+  nodbUtil.checkArgCount(arguments, 0, 1);
+
+  if (arguments.length == 0) {
+    numRows = 0;
+  } else {
+    nodbUtil.assert(Number.isInteger(numRows), 'NJS-005', 1);
+    nodbUtil.assert(numRows >= 0, 'NJS-005', 1);
+  }
 
   if (this._convertedToStream) {
     throw new Error(nodbUtil.getErrorMessage('NJS-042'));
@@ -82,6 +87,20 @@ async function getRows(numRows) {
 
   this._processingStarted = true;
 
+  if (numRows == 0) {
+    let requestedRows = this._rowCache;
+
+    const fetchArraySize = this._fetchArraySize;
+    while (true) {  // eslint-disable-line
+      let rows = await this._getRows(fetchArraySize, false, false);
+      if (rows)
+        requestedRows = requestedRows.concat(rows);
+      if (rows.length < fetchArraySize)
+        break;
+    }
+    return requestedRows;
+  }
+
   if (this._rowCache.length === 0) {
     return await this._getRows(numRows, false, false);
   }
@@ -105,13 +124,21 @@ class ResultSet {
     this._processingStarted = false;
     this._convertedToStream = false;
     this._allowGetRowCall = false;
+    this._isActive = false;
   }
 
   _extend(oracledb) {
     this._oracledb = oracledb;
-    this.close = nodbUtil.callbackify(close);
-    this.getRow = nodbUtil.callbackify(getRow);
-    this.getRows = nodbUtil.callbackify(getRows);
+    this.close = nodbUtil.callbackify(nodbUtil.preventConcurrent(nodbUtil.serialize(close), 'NJS-017'));
+    this.getRow = nodbUtil.callbackify(nodbUtil.preventConcurrent(nodbUtil.serialize(getRow), 'NJS-017'));
+    this.getRows = nodbUtil.callbackify(nodbUtil.preventConcurrent(nodbUtil.serialize(getRows), 'NJS-017'));
+  }
+
+  _getConnection() {
+    let connection = this._parentObj;
+    while (!(connection instanceof this._oracledb.Connection))
+      connection = connection._parentObj;
+    return connection;
   }
 
   async _getAllRows(executeOpts, metaDataObj, isNested) {
@@ -167,8 +194,9 @@ class ResultSet {
           for (let j = 0; j < nestedCursorIndices.length; j++) {
             const val = row[nestedCursorIndices[j]];
             if (val) {
-              row[nestedCursorIndices[j]] = await val._getAllRows(executeOpts,
-                nestedCursorMetaDataObjs[j], true);
+              row[nestedCursorIndices[j]] =
+                  await val._getAllRows(executeOpts,
+                    nestedCursorMetaDataObjs[j], true);
             }
           }
         }

package/lib/sodaCollection.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -61,10 +61,17 @@ async function insertMany(docs) {
 //   Insert an array of documents into the collection in a single round-trip
 // and return a set of result documents containing metadata.
 //-----------------------------------------------------------------------------
-async function insertManyAndGet(docs) {
-  nodbUtil.checkArgCount(arguments, 1, 1);
+async function insertManyAndGet(docs, a2) {
+  let options = {};
+
+  nodbUtil.checkArgCount(arguments, 1, 2);
   nodbUtil.assert(Array.isArray(docs), 'NJS-005', 1);
 
+  if (arguments.length == 2) {
+    nodbUtil.assert(nodbUtil.isObject(a2), 'NJS-005', 2);
+    options = a2;
+  }
+
   if (docs.length == 0) {
     throw new Error(nodbUtil.getErrorMessage('NJS-005', 1));
   }
@@ -78,7 +85,7 @@ async function insertManyAndGet(docs) {
     actualDocs[i] = content;
   }
 
-  return await this._insertManyAndGet(actualDocs);
+  return await this._insertManyAndGet(actualDocs, options);
 }
 
 
@@ -104,16 +111,23 @@ async function insertOne(content) {
 //   Inserts a single document into the collection and returns a result
 // document containing metadata.
 //-----------------------------------------------------------------------------
-async function insertOneAndGet(content) {
-  nodbUtil.checkArgCount(arguments, 1, 1);
+async function insertOneAndGet(content, a2) {
+  let options = {};
+
+  nodbUtil.checkArgCount(arguments, 1, 2);
   nodbUtil.assert(nodbUtil.isObject(content) ||
       nodbUtil.isSodaDocument(content), 'NJS-005', 1);
 
+  if (arguments.length == 2) {
+    nodbUtil.assert(nodbUtil.isObject(a2), 'NJS-005', 2);
+    options = a2;
+  }
+
   if (!nodbUtil.isSodaDocument(content)) {
     content = Buffer.from(JSON.stringify(content));
   }
 
-  return await this._insertOneAndGet(content);
+  return await this._insertOneAndGet(content, options);
 }
 
 
@@ -178,16 +192,23 @@ async function save(content) {
 //   Saves a single document into the collection and returns a result
 // document containing metadata.
 //-----------------------------------------------------------------------------
-async function saveAndGet(content) {
-  nodbUtil.checkArgCount(arguments, 1, 1);
+async function saveAndGet(content, a2) {
+  let options = {};
+
+  nodbUtil.checkArgCount(arguments, 1, 2);
   nodbUtil.assert(nodbUtil.isObject(content) ||
       nodbUtil.isSodaDocument(content), 'NJS-005', 1);
 
+  if (arguments.length == 2) {
+    nodbUtil.assert(nodbUtil.isObject(a2), 'NJS-005', 2);
+    options = a2;
+  }
+
   if (!nodbUtil.isSodaDocument(content)) {
     content = Buffer.from(JSON.stringify(content));
   }
 
-  return await this._saveAndGet(content);
+  return await this._saveAndGet(content, options);
 }
 
 
@@ -204,17 +225,21 @@ async function truncate() {
 class SodaCollection {
 
   _extend() {
-    this.createIndex = nodbUtil.callbackify(createIndex);
-    this.drop = nodbUtil.callbackify(drop);
-    this.dropIndex = nodbUtil.callbackify(dropIndex);
-    this.getDataGuide = nodbUtil.callbackify(getDataGuide);
-    this.insertMany = nodbUtil.callbackify(insertMany);
-    this.insertManyAndGet = nodbUtil.callbackify(insertManyAndGet);
-    this.insertOne = nodbUtil.callbackify(insertOne);
-    this.insertOneAndGet = nodbUtil.callbackify(insertOneAndGet);
-    this.save = nodbUtil.callbackify(save);
-    this.saveAndGet = nodbUtil.callbackify(saveAndGet);
-    this.truncate = nodbUtil.callbackify(truncate);
+    this.createIndex = nodbUtil.callbackify(nodbUtil.serialize(createIndex));
+    this.drop = nodbUtil.callbackify(nodbUtil.serialize(drop));
+    this.dropIndex = nodbUtil.callbackify(nodbUtil.serialize(dropIndex));
+    this.getDataGuide = nodbUtil.callbackify(nodbUtil.serialize(getDataGuide));
+    this.insertMany = nodbUtil.callbackify(nodbUtil.serialize(insertMany));
+    this.insertManyAndGet = nodbUtil.callbackify(nodbUtil.serialize(insertManyAndGet));
+    this.insertOne = nodbUtil.callbackify(nodbUtil.serialize(insertOne));
+    this.insertOneAndGet = nodbUtil.callbackify(nodbUtil.serialize(insertOneAndGet));
+    this.save = nodbUtil.callbackify(nodbUtil.serialize(save));
+    this.saveAndGet = nodbUtil.callbackify(nodbUtil.serialize(saveAndGet));
+    this.truncate = nodbUtil.callbackify(nodbUtil.serialize(truncate));
+  }
+
+  _getConnection() {
+    return this._database._connection;
   }
 
   find() {

package/lib/sodaDatabase.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -76,9 +76,13 @@ async function getCollectionNames(a1) {
 class SodaDatabase {
 
   _extend() {
-    this.createCollection = nodbUtil.callbackify(createCollection);
-    this.getCollectionNames = nodbUtil.callbackify(getCollectionNames);
-    this.openCollection = nodbUtil.callbackify(openCollection);
+    this.createCollection = nodbUtil.callbackify(nodbUtil.serialize(createCollection));
+    this.getCollectionNames = nodbUtil.callbackify(nodbUtil.serialize(getCollectionNames));
+    this.openCollection = nodbUtil.callbackify(nodbUtil.serialize(openCollection));
+  }
+
+  _getConnection() {
+    return this._connection;
   }
 
   // To create a SODA document object based content and (optional) other fields

package/lib/sodaDocCursor.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -44,8 +44,12 @@ async function close() {
 class SodaDocCursor {
 
   _extend() {
-    this.close = nodbUtil.callbackify(close);
-    this.getNext = nodbUtil.callbackify(getNext);
+    this.close = nodbUtil.callbackify(nodbUtil.serialize(close));
+    this.getNext = nodbUtil.callbackify(nodbUtil.serialize(getNext));
+  }
+
+  _getConnection() {
+    return this._operation._getConnection();
   }
 
 }

package/lib/sodaDocument.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //

package/lib/sodaOperation.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -116,13 +116,17 @@ class SodaOperation {
   }
 
   _extend() {
-    this.count = nodbUtil.callbackify(count);
-    this.getCursor = nodbUtil.callbackify(getCursor);
-    this.getDocuments = nodbUtil.callbackify(getDocuments);
-    this.getOne = nodbUtil.callbackify(getOne);
-    this.remove = nodbUtil.callbackify(remove);
-    this.replaceOne = nodbUtil.callbackify(replaceOne);
-    this.replaceOneAndGet = nodbUtil.callbackify(replaceOneAndGet);
+    this.count = nodbUtil.callbackify(nodbUtil.serialize(count));
+    this.getCursor = nodbUtil.callbackify(nodbUtil.serialize(getCursor));
+    this.getDocuments = nodbUtil.callbackify(nodbUtil.serialize(getDocuments));
+    this.getOne = nodbUtil.callbackify(nodbUtil.serialize(getOne));
+    this.remove = nodbUtil.callbackify(nodbUtil.serialize(remove));
+    this.replaceOne = nodbUtil.callbackify(nodbUtil.serialize(replaceOne));
+    this.replaceOneAndGet = nodbUtil.callbackify(nodbUtil.serialize(replaceOneAndGet));
+  }
+
+  _getConnection() {
+    return this._collection._database._connection;
   }
 
   // fetchArraySize - a non-terminal function that can chain further
@@ -141,6 +145,14 @@ class SodaOperation {
     return this;
   }
 
+  // hint - a non-terminal function and can chain further
+  hint(val) {
+    nodbUtil.checkArgCount(arguments, 1, 1);
+    nodbUtil.assert(typeof val === 'string', 'NJS-005', 1);
+    this._options.hint = val;
+    return this;
+  }
+
   // key - a non-terminal function and can chain further
   key(k) {
     nodbUtil.checkArgCount(arguments, 1, 1);
@@ -165,7 +177,7 @@ class SodaOperation {
   }
 
   // limit property - a non-terminal function and can chain further
-  limit (n) {
+  limit(n) {
     nodbUtil.checkArgCount(arguments, 1, 1);
     nodbUtil.assert(typeof n === 'number', 'NJS-005', 1);
     this._options.limit = n;

package/lib/util.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2016, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -25,7 +25,7 @@ const util = require('util');
 let packageJSON;
 try {
   packageJSON = require('../package.json');
-} catch(err) {
+} catch (err) {
   throw new Error('package.json is missing');
 }
 const PACKAGE_JSON_VERSION = packageJSON.version;
@@ -49,6 +49,8 @@ const errorMessages = {
   'NJS-004': 'NJS-004: invalid value for property %s',
   'NJS-005': 'NJS-005: invalid value for parameter %d',
   'NJS-009': 'NJS-009: invalid number of parameters',
+  'NJS-017': 'NJS-017: concurrent operations on ResultSet are not allowed',
+  'NJS-023': 'NJS-023: concurrent operations on LOB are not allowed',
   'NJS-037': 'NJS-037: incompatible type of value provided',
   'NJS-040': 'NJS-040: connection request timeout. Request exceeded queueTimeout of %d',
   'NJS-041': 'NJS-041: cannot convert ResultSet to QueryStream after invoking methods',
@@ -62,11 +64,17 @@ const errorMessages = {
   'NJS-067': 'NJS-067: a pre-built node-oracledb binary was not found for %s',
   'NJS-069': 'NJS-069: node-oracledb %s requires Node.js %s or later',
   'NJS-076': 'NJS-076: connection request rejected. Pool queue length queueMax %d reached',
+  'NJS-081': 'NJS-081: concurrent operations on a connection are disabled',
+  'NJS-082': 'NJS-082: connection pool is being reconfigured',
+  'NJS-083': 'NJS-083: pool statistics not enabled',
+  'NJS-084': 'NJS-084: invalid or missing parameter with token based authentication. The token and privateKey attributes must contain values. Other credentials cannot be specified',
+  'NJS-085': 'NJS-085: invalid connection pool configuration with token based authentication. The homogeneous and externalAuth attributes must be set to true',
+  'NJS-086': 'NJS-086: invalid standalone configuration with token based authentication. The externalAuth attribute must be set to true'
 };
 
 // getInstallURL returns a string with installation URL
 function getInstallURL() {
-  return('Node-oracledb installation instructions: https://oracle.github.io/node-oracledb/INSTALL.html');
+  return ('Node-oracledb installation instructions: https://oracle.github.io/node-oracledb/INSTALL.html');
 }
 
 module.exports.getInstallURL = getInstallURL;
@@ -77,27 +85,24 @@ function getInstallHelp() {
   let mesg = getInstallURL() + '\n';
   if (process.platform === 'linux') {
     if (process.arch === 'x64') {
-      url = 'http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html\n';
+      url = 'https://www.oracle.com/database/technologies/instant-client/linux-x86-64-downloads.html\n';
       arch = '64-bit';
     } else if (process.arch === 'x32') {
-      url = 'http://www.oracle.com/technetwork/topics/linuxsoft-082809.html\n';
+      url = 'https://www.oracle.com/database/technologies/instant-client/linux-x86-32-downloads.html\n';
       arch = '32-bit';
     } else {
-      url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
+      url = 'https://www.oracle.com/database/technologies/instant-client.html\n';
       arch = process.arch;
     }
-    mesg += 'You must have ' + arch + ' Oracle client libraries in LD_LIBRARY_PATH, or configured with ldconfig.\n';
+    mesg += 'You must have ' + arch + ' Oracle Client libraries configured with ldconfig, or in LD_LIBRARY_PATH.\n';
     mesg += 'If you do not have Oracle Database on this computer, then install the Instant Client Basic or Basic Light package from \n';
     mesg += url;
   } else if (process.platform === 'darwin') {
     if (process.arch === 'x64') {
-      url = 'http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html';
+      url = 'https://www.oracle.com/database/technologies/instant-client/macos-intel-x86-downloads.html\n';
       arch = '64-bit';
-    } else if (process.arch === 'x32') {
-      url = 'http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html';
-      arch = '32-bit';
     } else {
-      url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
+      url = 'https://www.oracle.com/database/technologies/instant-client.html\n';
       arch = process.arch;
     }
     mesg += 'You must have the ' + arch + ' Oracle Instant Client Basic or Basic Light package libraries in\n';
@@ -105,22 +110,22 @@ function getInstallHelp() {
     mesg += 'Oracle Instant Client can be downloaded from ' + url;
   } else if (process.platform === 'win32') {
     if (process.arch === 'x64') {
-      url = 'http://www.oracle.com/technetwork/topics/winx64soft-089540.html\n';
+      url = 'https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html\n';
       arch = '64-bit';
     } else if (process.arch === 'x32') {
-      url = 'http://www.oracle.com/technetwork/topics/winsoft-085727.html\n';
+      url = 'https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html\n';
       arch = '32-bit';
     } else {
-      url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
+      url = 'https://www.oracle.com/database/technologies/instant-client.html\n';
       arch = process.arch;
     }
-    mesg += 'You must have ' + arch + ' Oracle client libraries in your PATH environment variable.\n';
+    mesg += 'You must have ' + arch + ' Oracle Client libraries in your PATH environment variable.\n';
     mesg += 'If you do not have Oracle Database on this computer, then install the Instant Client Basic or Basic Light package from\n';
     mesg += url;
     mesg += 'A Microsoft Visual Studio Redistributable suitable for your Oracle client library version must be available.\n';
   } else {
-    url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
-    mesg += 'You must have ' + process.arch + ' Oracle client libraries in your operating system library search path.\n';
+    url = 'https://www.oracle.com/database/technologies/instant-client.html\n';
+    mesg += 'You must have ' + process.arch + ' Oracle Client libraries in your operating system library search path.\n';
     mesg += 'If you do not have Oracle Database on this computer, then install an Instant Client Basic or Basic Light package from: \n';
     mesg += url;
   }
@@ -168,12 +173,15 @@ module.exports.checkArgCount = checkArgCount;
 // is resolved or rejected and the callback invoked; otherwise, the function is
 // called unchanged and a promise is returned
 function callbackify(func) {
-  return function() {
+  const wrapper = function() {
 
     // if last argument is not a function, simply invoke the function as usual
     // and a promise will be returned
     if (typeof arguments[arguments.length - 1] !== 'function') {
-      return func.apply(this, arguments);
+      return func.apply(this, arguments).catch(function stackCapture(e) {
+        Error.captureStackTrace(e, stackCapture);
+        throw e;
+      });
     }
 
     // otherwise, resolve or reject the promise and invoke the callback
@@ -184,10 +192,53 @@ function callbackify(func) {
     }, cb);
 
   };
+  if (func.name) {
+    Object.defineProperty(wrapper, 'name', { value: func.name });
+  }
+  return wrapper;
 }
 
 module.exports.callbackify = callbackify;
 
+// The serialize function is used to wrap methods to ensure that the connection
+// is not used concurrently by multiple threads
+function serialize(func) {
+  return async function() {
+
+    // determine the connection associated with the object
+    const connection = this._getConnection();
+
+    // acquire the "lock"; this simply checks to see if another operation is in
+    // progress, and if so, waits for it to complete
+    await connection._acquireLock();
+
+    // call the function and ensure that the lock is "released" once the
+    // function has completed -- either successfully or in failure
+    try {
+      return await func.apply(this, arguments);
+    } finally {
+      connection._releaseLock();
+    }
+  };
+}
+
+module.exports.serialize = serialize;
+
+function preventConcurrent(func, errorCode) {
+  return async function() {
+    if (this._isActive)
+      throw new Error(getErrorMessage(errorCode));
+    this._isActive = true;
+    try {
+      return await func.apply(this, arguments);
+    } finally {
+      this._isActive = false;
+    }
+  };
+}
+
+module.exports.preventConcurrent = preventConcurrent;
+
 function isObject(value) {
   return value !== null && typeof value === 'object';
 }
@@ -204,4 +255,13 @@ function isSodaDocument(value) {
   return (value != null && value._sodaDocumentMarker);
 }
 
+function isXid(value) {
+  return (isObject(value) &&
+            (value.formatId !== undefined) &&
+            (value.globalTransactionId !== undefined) &&
+            (value.branchQualifier !== undefined));
+}
+
+module.exports.isXid = isXid;
+
 module.exports.isSodaDocument = isSodaDocument;