oracledb 2.1.0 → 2.3.0

package/lib/connection.js

@@ -23,11 +23,17 @@ var resultset = require('./resultset.js');
 var QueryStream = require('./querystream.js');
 var nodbUtil = require('./util.js');
 var executePromisified;
+var executeManyPromisified;
+var getStatementInfoPromisified;
 var commitPromisified;
 var createLobPromisified;
 var rollbackPromisified;
-var releasePromisified;
+var closePromisified;
 var breakPromisified;
+var changePasswordPromisified;
+var pingPromisified;
+var subscribePromisified;
+var unsubscribePromisified;
 
 // The queryStream function is similar to execute except that it immediately
 // returns a QueryStream.
@@ -181,6 +187,47 @@ function execute(sql, a2, a3, a4) {
 
 executePromisified = nodbUtil.promisify(execute);
 
+// This executeMany function is used to override the executeMany method of
+// the Connection class, which is defined in the C layer.
+function executeMany(sql, binds, a3, a4) {
+  var self = this;
+  var options = {};
+  var executeCb;
+
+  nodbUtil.assert(arguments.length > 2 && arguments.length < 5, 'NJS-009');
+  nodbUtil.assert(typeof sql === 'string', 'NJS-006', 1);
+  nodbUtil.assert(Array.isArray(binds), 'NJS-006', 2);
+
+  switch (arguments.length) {
+    case 3:
+      nodbUtil.assert(typeof a3 === 'function', 'NJS-006', 3);
+      executeCb = a3;
+      break;
+    case 4:
+      nodbUtil.assert(nodbUtil.isObject(a3), 'NJS-006', 3);
+      nodbUtil.assert(typeof a4 === 'function', 'NJS-006', 4);
+      options = a3;
+      executeCb = a4;
+      break;
+  }
+
+  self._executeMany.call(self, sql, binds, options, executeCb);
+}
+
+executeManyPromisified = nodbUtil.promisify(executeMany);
+
+// This getStatementInfo function is just a place holder to allow for easier extension later.
+function getStatementInfo(sql, getStatementInfoCb) {
+  var self = this;
+
+  nodbUtil.assert(arguments.length === 2, 'NJS-009');
+  nodbUtil.assert(typeof getStatementInfoCb === 'function', 'NJS-006', 1);
+
+  self._getStatementInfo.apply(self, arguments);
+}
+
+getStatementInfoPromisified = nodbUtil.promisify(getStatementInfo);
+
 // This commit function is just a place holder to allow for easier extension later.
 function commit(commitCb) {
   var self = this;
@@ -217,26 +264,26 @@ function rollback(rollbackCb) {
 
 rollbackPromisified = nodbUtil.promisify(rollback);
 
-// This release function is used to override the release method of the Connection
+// This close function is used to override the close method of the Connection
 // class, which is defined in the C layer.
-function release(releaseCb) {
+function close(closeCb) {
   var self = this;
 
   nodbUtil.assert(arguments.length === 1, 'NJS-009');
-  nodbUtil.assert(typeof releaseCb === 'function', 'NJS-006', 1);
+  nodbUtil.assert(typeof closeCb === 'function', 'NJS-006', 1);
 
-  self._release(function(err) {
+  self._close(function(err) {
     if (!err) {
       self.emit('_after_close');
     }
 
-    releaseCb(err);
+    closeCb(err);
   });
 }
 
-releasePromisified = nodbUtil.promisify(release);
+closePromisified = nodbUtil.promisify(close);
 
-// This release function is just a place holder to allow for easier extension later.
+// This break function is just a place holder to allow for easier extension later.
 // It's attached to the module as break is a reserved word.
 module.break = function(breakCb) {
   var self = this;
@@ -249,6 +296,61 @@ module.break = function(breakCb) {
 
 breakPromisified = nodbUtil.promisify(module.break);
 
+// This changePassword function is just a place holder to allow for easier extension later.
+function changePassword(user, password, newPassword, changePasswordCb) {
+  var self = this;
+
+  nodbUtil.assert(arguments.length === 4, 'NJS-009');
+  nodbUtil.assert(typeof user === 'string', 'NJS-006', 1);
+  nodbUtil.assert(typeof password === 'string', 'NJS-006', 2);
+  nodbUtil.assert(typeof newPassword === 'string', 'NJS-006', 3);
+  nodbUtil.assert(typeof changePasswordCb === 'function', 'NJS-006', 4);
+
+  self._changePassword.apply(self, arguments);
+}
+
+changePasswordPromisified = nodbUtil.promisify(changePassword);
+
+// This ping function is just a place holder to allow for easier extension later.
+function ping(pingCb) {
+  var self = this;
+
+  nodbUtil.assert(arguments.length === 1, 'NJS-009');
+  nodbUtil.assert(typeof pingCb === 'function', 'NJS-006', 1);
+
+  self._ping.apply(self, arguments);
+}
+
+pingPromisified = nodbUtil.promisify(ping);
+
+// create a subscription which can be used to get notifications of database
+// changes
+function subscribe(name, options, subscribeCb) {
+  var self = this;
+
+  nodbUtil.assert(arguments.length == 3, 'NJS-009');
+  nodbUtil.assert(typeof name === 'string', 'NJS-006', 1);
+  nodbUtil.assert(nodbUtil.isObject(options), 'NJS-006', 2);
+  nodbUtil.assert(typeof subscribeCb === 'function', 'NJS-006', 3);
+  self._subscribe.call(self, name, options, subscribeCb);
+}
+
+subscribePromisified = nodbUtil.promisify(subscribe);
+
+// destroy a subscription which was earlier created using subscribe()
+function unsubscribe(name, cb) {
+  var self = this;
+
+  nodbUtil.assert(arguments.length == 2, 'NJS-009');
+  nodbUtil.assert(typeof name === 'string', 'NJS-006', 1);
+  nodbUtil.assert(typeof cb === 'function', 'NJS-006', 2);
+
+  self._unsubscribe.call(self, name, cb);
+}
+
+unsubscribePromisified = nodbUtil.promisify(unsubscribe);
+
+
 // The extend method is used to extend the Connection instance from the C layer with
 // custom properties and method overrides. References to the original methods are
 // maintained so they can be invoked by the overriding method at the right time.
@@ -269,6 +371,14 @@ function extend(conn, oracledb, pool) {
       _execute: {
         value: conn.execute
       },
+      _getStatementInfo: {
+        value: conn.getStatementInfo
+      },
+      getStatementInfo: {
+        value: getStatementInfoPromisified,
+        enumerable: true,
+        writable: true
+      },
       queryStream: {
         value: queryStream,
         enumerable: true,
@@ -279,6 +389,14 @@ function extend(conn, oracledb, pool) {
         enumerable: true,
         writable: true
       },
+      _executeMany: {
+        value: conn.executeMany
+      },
+      executeMany: {
+        value: executeManyPromisified,
+        enumerable: true,
+        writable: true
+      },
       _commit: {
         value: conn.commit
       },
@@ -303,16 +421,16 @@ function extend(conn, oracledb, pool) {
         enumerable: true,
         writable: true
       },
-      _release: {
-        value: conn.release
+      _close: {
+        value: conn.close
       },
-      release: {
-        value: releasePromisified,
+      close: {
+        value: closePromisified,
         enumerable: true,
         writable: true
       },
-      close: { // alias for release
-        value: releasePromisified,
+      release: { // alias for close
+        value: closePromisified,
         enumerable: true,
         writable: true
       },
@@ -323,6 +441,38 @@ function extend(conn, oracledb, pool) {
         value: breakPromisified,
         enumerable: true,
         writable: true
+      },
+      _changePassword: {
+        value: conn.changePassword
+      },
+      changePassword: {
+        value: changePasswordPromisified,
+        enumerable: true,
+        writable: true
+      },
+      _ping: {
+        value: conn.ping
+      },
+      ping: {
+        value: pingPromisified,
+        enumerable: true,
+        writable: true
+      },
+      _subscribe: {
+        value: conn.subscribe
+      },
+      subscribe: {
+        value: subscribePromisified,
+        enumerable: true,
+        writable: true
+      },
+      _unsubscribe: {
+        value: conn.unsubscribe
+      },
+      unsubscribe: {
+        value: unsubscribePromisified,
+        enumerable: true,
+        writable: true
       }
     }
   );

package/lib/oracledb.js

@@ -79,24 +79,31 @@ oracledbCLib.Oracledb.prototype.newLob = function(iLob) {
 function getInfo() {
   var arch, url, mesg = '';
   mesg = 'Node-oracledb installation instructions: ';
-  mesg += 'https://github.com/oracle/node-oracledb/blob/master/INSTALL.md\n';
+  mesg += 'https://oracle.github.io/node-oracledb/INSTALL.html\n';
   if (process.platform === 'linux') {
     if (process.arch === 'x64') {
       url = 'http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html\n';
       arch = '64-bit';
-    } else {
+    } else if (process.arch === 'x32') {
       url = 'http://www.oracle.com/technetwork/topics/linuxsoft-082809.html\n';
       arch = '32-bit';
+    } else {
+      url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
+      arch = process.arch;
     }
     mesg += 'You must have ' + arch + ' Oracle client libraries in LD_LIBRARY_PATH, or configured with ldconfig.\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') {
-    url = 'http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html';
     if (process.arch === 'x64') {
+      url = 'http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html';
       arch = '64-bit';
-    } else {
+    } 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';
+      arch = process.arch;
     }
     mesg += 'You must have the ' + arch + ' Oracle Instant Client Basic or Basic Light package in ~/lib or /usr/local/lib\n';
     mesg += 'They can be downloaded from ' + url;
@@ -104,9 +111,12 @@ function getInfo() {
     if (process.arch === 'x64') {
       url = 'http://www.oracle.com/technetwork/topics/winx64soft-089540.html\n';
       arch = '64-bit';
-    } else {
+    } else if (process.arch === 'x32') {
       url = 'http://www.oracle.com/technetwork/topics/winsoft-085727.html\n';
       arch = '32-bit';
+    } else {
+      url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
+      arch = process.arch;
     }
     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';
@@ -114,12 +124,7 @@ function getInfo() {
     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';
-    if (process.arch === 'x64') {
-      arch = '64-bit';
-    } else {
-      arch = '32-bit';
-    }
-    mesg += 'You must have ' + arch + ' Oracle client libraries in your operating system library search path.\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;
   }
@@ -319,6 +324,34 @@ function extend(oracledb) {
         value: 0,
         enumerable: true
       },
+      CQN_OPCODE_ALL_OPS: {
+        value: 0,
+        enumerable: true
+      },
+      CQN_OPCODE_ALL_ROWS: {
+        value: 1,
+        enumerable: true
+      },
+      CQN_OPCODE_ALTER: {
+        value: 16,
+        enumerable: true
+      },
+      CQN_OPCODE_DELETE: {
+        value: 8,
+        enumerable: true
+      },
+      CQN_OPCODE_DROP: {
+        value: 32,
+        enumerable: true
+      },
+      CQN_OPCODE_INSERT: {
+        value: 2,
+        enumerable: true
+      },
+      CQN_OPCODE_UPDATE: {
+        value: 4,
+        enumerable: true
+      },
       DB_TYPE_VARCHAR: {
         value: 1,
         enumerable: true
@@ -391,10 +424,126 @@ function extend(oracledb) {
         value : 1112,
         enumerable : true
       },
+      STMT_TYPE_UNKNOWN: {
+        value : 0,
+        enumerable : true
+      },
+      STMT_TYPE_SELECT: {
+        value : 1,
+        enumerable : true
+      },
+      STMT_TYPE_UPDATE: {
+        value : 2,
+        enumerable : true
+      },
+      STMT_TYPE_DELETE: {
+        value : 3,
+        enumerable : true
+      },
+      STMT_TYPE_INSERT: {
+        value : 4,
+        enumerable : true
+      },
+      STMT_TYPE_CREATE: {
+        value : 5,
+        enumerable : true
+      },
+      STMT_TYPE_DROP: {
+        value : 6,
+        enumerable : true
+      },
+      STMT_TYPE_ALTER: {
+        value : 7,
+        enumerable : true
+      },
+      STMT_TYPE_BEGIN: {
+        value : 8,
+        enumerable : true
+      },
+      STMT_TYPE_DECLARE: {
+        value : 9,
+        enumerable : true
+      },
+      STMT_TYPE_CALL: {
+        value : 10,
+        enumerable : true
+      },
+      STMT_TYPE_EXPLAIN_PLAN: {
+        value : 15,
+        enumerable : true
+      },
+      STMT_TYPE_MERGE: {
+        value : 16,
+        enumerable : true
+      },
+      STMT_TYPE_ROLLBACK: {
+        value : 17,
+        enumerable : true
+      },
+      STMT_TYPE_COMMIT: {
+        value : 21,
+        enumerable : true
+      },
       STRING: {
         value: 2001,
         enumerable: true
       },
+      SUBSCR_EVENT_TYPE_DEREG: {
+        value: 5,
+        enumerable: true
+      },
+      SUBSCR_EVENT_TYPE_OBJ_CHANGE: {
+        value: 6,
+        enumerable: true
+      },
+      SUBSCR_EVENT_TYPE_QUERY_CHANGE: {
+        value: 7,
+        enumerable: true
+      },
+      SUBSCR_EVENT_TYPE_AQ: {
+        value: 100,
+        enumerable: true
+      },
+      SUBSCR_GROUPING_CLASS_TIME: {
+        value: 1,
+        enumerable: true
+      },
+      SUBSCR_GROUPING_TYPE_SUMMARY: {
+        value: 1,
+        enumerable: true
+      },
+      SUBSCR_GROUPING_TYPE_LAST: {
+        value: 2,
+        enumerable: true
+      },
+      SUBSCR_NAMESPACE_AQ: {
+        value: 1,
+        enumerable: true
+      },
+      SUBSCR_NAMESPACE_DBCHANGE: {
+        value: 2,
+        enumerable: true
+      },
+      SUBSCR_QOS_BEST_EFFORT: {
+        value: 16,
+        enumerable: true
+      },
+      SUBSCR_QOS_DEREG_NFY: {
+        value: 2,
+        enumerable: true
+      },
+      SUBSCR_QOS_QUERY: {
+        value: 8,
+        enumerable: true
+      },
+      SUBSCR_QOS_RELIABLE: {
+        value: 1,
+        enumerable: true
+      },
+      SUBSCR_QOS_ROWIDS: {
+        value: 4,
+        enumerable: true
+      },
       NUMBER: {
         value: 2002,
         enumerable: true

package/lib/pool.js

@@ -22,19 +22,19 @@
 var connection = require('./connection.js');
 var nodbUtil = require('./util.js');
 var getConnectionPromisified;
-var terminatePromisified;
+var closePromisified;
 
 // completeConnectionRequest does the actual work of getting a connection from a
 // pool when queuing is enabled. It's abstracted out so it can be called from
 // getConnection and checkRequestQueue constently.
-function completeConnectionRequest(getConnectionCb) {
+function completeConnectionRequest(config, getConnectionCb) {
   var self = this;
 
   // Incrementing _connectionsOut prior to making the async call to get a connection
   // to prevent other connection requests from exceeding the poolMax.
   self._connectionsOut += 1;
 
-  self._getConnection(function(err, connInst) {
+  self._getConnection(config, function(err, connInst) {
     if (err) {
       // Decrementing _connectionsOut if we didn't actually get a connection
       // and then rechecking the queue.
@@ -98,7 +98,8 @@ function checkRequestQueue() {
     payload.timerIdx = null;
   }
 
-  completeConnectionRequest.call(self, payload.getConnectionCb);
+  completeConnectionRequest.call(self, payload.config,
+    payload.getConnectionCb);
 }
 
 // onRequestTimeout is used to prevent requests for connections from sitting in the
@@ -129,14 +130,23 @@ function onRequestTimeout(timerIdx) {
 // directly to the C layer if queueing is disabled. If queueing is enabled and the
 // connections out is under the poolMax then the request will be completed immediately.
 // Otherwise the request will be queued and completed when a connection is avaialble.
-function getConnection(getConnectionCb) {
+function getConnection(a1, a2) {
   var self = this;
   var payload;
   var timeoutHandle;
   var timerIdx;
+  var getConnectionCb = arguments[arguments.length - 1];
+  var options = {};
 
-  nodbUtil.assert(arguments.length === 1, 'NJS-009');
-  nodbUtil.assert(typeof getConnectionCb === 'function', 'NJS-006', 1);
+  nodbUtil.assert(arguments.length >= 1 && arguments.length <= 2, 'NJS-009');
+  nodbUtil.assert(typeof getConnectionCb === 'function', 'NJS-006',
+    arguments.length);
+
+  // Optional JSON parameter
+  if (arguments.length > 1 ) {
+    options = arguments[0];
+    nodbUtil.assert(nodbUtil.isObject(options), 'NJS-006', 1 );
+  }
 
   // Added this check because if the pool isn't valid and we reference self.poolMax
   // (which is a C layer getter) an error will be thrown.
@@ -154,7 +164,7 @@ function getConnection(getConnectionCb) {
   }
 
   if (self.queueRequests === false) { // queueing is disabled for pool
-    self._getConnection(function(err, connInst) {
+    self._getConnection(options, function(err, connInst) {
       if (err) {
         if (self._enableStats) {
           self._totalFailedRequests += 1;
@@ -170,7 +180,7 @@ function getConnection(getConnectionCb) {
       getConnectionCb(null, connInst);
     });
   } else if (self._connectionsOut < self.poolMax) { // queueing enabled, but not needed
-    completeConnectionRequest.call(self, getConnectionCb);
+    completeConnectionRequest.call(self, options, getConnectionCb);
   } else { // need to queue the request
     if (self._usingQueueTimeout) {
       self._connRequestTimersIdx += 1;
@@ -187,7 +197,8 @@ function getConnection(getConnectionCb) {
     payload = {
       timerIdx: timerIdx,
       timeoutHandle: timeoutHandle,
-      getConnectionCb: getConnectionCb
+      getConnectionCb: getConnectionCb,
+      config : options
     };
 
     if (self._usingQueueTimeout) {
@@ -206,24 +217,24 @@ function getConnection(getConnectionCb) {
 
 getConnectionPromisified = nodbUtil.promisify(getConnection);
 
-function terminate(terminateCb) {
+function close(closeCb) {
   var self = this;
 
   nodbUtil.assert(arguments.length === 1, 'NJS-009');
-  nodbUtil.assert(typeof terminateCb === 'function', 'NJS-006', 1);
+  nodbUtil.assert(typeof closeCb === 'function', 'NJS-006', 1);
 
-  self._terminate(function(err) {
+  self._close(function(err) {
     if (!err) {
       self._isValid = false;
 
       self.emit('_after_close', self);
     }
 
-    terminateCb(err);
+    closeCb(err);
   });
 }
 
-terminatePromisified = nodbUtil.promisify(terminate);
+closePromisified = nodbUtil.promisify(close);
 
 // logStats is used to add a hidden method (_logStats) to each pool instance. This
 // provides an easy way to log out the statistics related information that's collected
@@ -323,7 +334,7 @@ function extend(pool, poolAttrs, poolAlias, oracledb) {
           throw new Error(nodbUtil.getErrorMessage('NJS-014', 'queueTimeout'));
         }
       },
-      _isValid: { // used to ensure operations are not done after terminate
+      _isValid: { // used to ensure operations are not done after close
         value: true,
         writable: true
       },
@@ -408,16 +419,16 @@ function extend(pool, poolAttrs, poolAlias, oracledb) {
         enumerable: true,
         writable: true
       },
-      _terminate: {
-        value: pool.terminate
+      _close: {
+        value: pool.close
       },
-      terminate: {
-        value: terminatePromisified,
+      close: {
+        value: closePromisified,
         enumerable: true,
         writable: true
       },
-      close: { // alias for terminate
-        value: terminatePromisified,
+      terminate: { // alias for close
+        value: closePromisified,
         enumerable: true,
         writable: true
       }

package/lib/querystream.js

@@ -48,7 +48,8 @@ function QueryStream(resultSet, oracledb) {
   );
 
   Readable.call(self, {
-    objectMode: true
+    objectMode: true,
+    emitClose: false // Prevents duplicate close events
   });
 
   // Check if QueryStream was created via ResultSet.toQueryStream() then the
@@ -69,7 +70,7 @@ function QueryStream(resultSet, oracledb) {
     // Using setImmediate to ensure that end event handlers are processed
     // before the destroy logic is invoked.
     setImmediate(function() {
-      self.destroy();
+      self._destroy(null, function() {});
     });
   });
 }

package/lib/rel.txt

@@ -1 +1 @@
-339089fa3be02c1506a593b47f5e994cc674b762 Mon 12 Feb 2018 04:22:26 UTC
+88e5d8dd1201e3d0244e8264cf1d0652b2be378e Tue  5 Jun 2018 07:13:28 UTC

package/odpi/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2016, 2017 Oracle and/or its affiliates.  All rights reserved.
+Copyright (c) 2016, 2018 Oracle and/or its affiliates.  All rights reserved.
 
 This program is free software: you can modify it and/or redistribute it under
 the terms of: