Merge pull request #16 from romanbalayan/release-6.2.0

6.2.0

Author: romanbalayan

README.md

@@ -1,26 +1,27 @@
 # node-oracledb-prebuilt-for-lambda
 
  - This module is forked from the currently un-maintained [node-oracledb-for-lambda](https://github.com/nalbion/node-oracledb-for-lambda).
- - Core oracledb libraries are derived from [node-oracledb](https://github.com/oracle/node-oracledb) v6.1.0
- - 6.1.0: Prebuilt for use with AWS Lambda nodejs18.x Runtime
+ - Core oracledb libraries are derived from [node-oracledb](https://github.com/oracle/node-oracledb) v6.2.0
+ - 6.2.0: Prebuilt for use with AWS Lambda nodejs18.x Runtime
  - Also tested to work with AWS Lambda nodejs14.x, nodejs16.x, and nodejs18.x Runtime
 
 The scripts to reproduce the build process can be found at [node-oracledb-lambda-test](https://github.com/romanbalayan/node-oracledb-lambda-test). 
 
 # Usage
 
 ```bash
-npm install --save oracledb-prebuilt-for-lambda@6.1.0
+npm install --save oracledb-prebuilt-for-lambda@6.2.0
 ```
 
 # Versioning
  - Changed release version to match that of underlying node-oracledb version. 
- - i.e. for release based on oracledb 6.1.0, release will be oracledb-prebuilt-for-lambda@6.1.0
+ - i.e. for release based on oracledb 6.2.0, release will be oracledb-prebuilt-for-lambda@6.2.0
 
 
  # Releases
  | node-oracledb       | oracledb-prebuilt-for-lambda    |
  | ------------------- | ---------- |
+ | 6.2.0               | 6.2.0      |
  | 6.1.0               | 6.1.0      |
  | 6.0.3               | 6.0.3      |
  | 6.0.1               | 6.0.1      |
@@ -36,6 +37,7 @@ npm install --save oracledb-prebuilt-for-lambda@6.1.0
 
 
  # Changelog
+ - v6.2.0: [node-oracledb v6.2.0 changelog](https://node-oracledb.readthedocs.io/en/latest/release_notes.html#node-oracledb-v6-2-0-11-oct-2023)
  - v6.1.0: [node-oracledb v6.1.0 changelog](https://node-oracledb.readthedocs.io/en/latest/release_notes.html#node-oracledb-v6-1-0-30-aug-2023)
  - v6.0.3: [node-oracledb v6.0.3 changelog](https://node-oracledb.readthedocs.io/en/latest/release_notes.html#node-oracledb-v6-0-3-12-jul-2023)
  - v6.0.1: [node-oracledb v6.0.1 changelog](https://node-oracledb.readthedocs.io/en/latest/release_notes.html#node-oracledb-v6-0-1-07-jun-2023)

build/Release/oracledb.node

@@ -1074,7 +1074,7 @@ class Connection extends EventEmitter {
   //
   // Returns the health status of the connection. If this function returns
   // false, the caller should close the connection.
-  // ---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
   isHealthy() {
     return (this._impl !== undefined && !this._closing &&
       this._impl.isHealthy());

lib/connection.js

@@ -319,6 +319,15 @@ class BaseDbObject {
     return this._objType.schema;
   }
 
+  //---------------------------------------------------------------------------
+  // packageName
+  //
+  // Property for the packageName of the database object type.
+  //---------------------------------------------------------------------------
+  get packageName() {
+    return this._objType.packageName;
+  }
+
   //---------------------------------------------------------------------------
   // setElement()
   //

lib/dbObject.js

@@ -466,7 +466,7 @@ function assertArgCount(args, minArgCount, maxArgCount) {
 //-----------------------------------------------------------------------------
 // assertParamPropBool()
 //
-// Asserts that the property value of a parmeter is a boolean value (or
+// Asserts that the property value of a parameter is a boolean value (or
 // undefined).
 //-----------------------------------------------------------------------------
 function assertParamPropBool(obj, parameterNum, propName) {
@@ -479,7 +479,7 @@ function assertParamPropBool(obj, parameterNum, propName) {
 //-----------------------------------------------------------------------------
 // assertParamPropFunction()
 //
-// Asserts that the property value of a parmeter is a function (or undefined).
+// Asserts that the property value of a parameter is a function (or undefined).
 //-----------------------------------------------------------------------------
 function assertParamPropFunction(obj, parameterNum, propName) {
   if (obj[propName] !== undefined) {
@@ -491,7 +491,7 @@ function assertParamPropFunction(obj, parameterNum, propName) {
 //-----------------------------------------------------------------------------
 // assertParamPropInt()
 //
-// Asserts that the property value of a parmeter is an integer value (or
+// Asserts that the property value of a parameter is an integer value (or
 // undefined).
 //-----------------------------------------------------------------------------
 function assertParamPropInt(obj, parameterNum, propName) {
@@ -504,7 +504,7 @@ function assertParamPropInt(obj, parameterNum, propName) {
 //-----------------------------------------------------------------------------
 // assertParamPropUnsignedInt()
 //
-// Asserts that the property value of a parmeter is a positive integer value
+// Asserts that the property value of a parameter is a positive integer value
 // (or undefined).
 //-----------------------------------------------------------------------------
 function assertParamPropUnsignedInt(obj, parameterNum, propName) {
@@ -517,7 +517,7 @@ function assertParamPropUnsignedInt(obj, parameterNum, propName) {
 //-----------------------------------------------------------------------------
 // assertParamPropString()
 //
-// Asserts that the property value of a parmeter is a function (or undefined).
+// Asserts that the property value of a parameter is a string value (or undefined).
 //-----------------------------------------------------------------------------
 function assertParamPropString(obj, parameterNum, propName) {
   if (obj[propName] !== undefined) {
@@ -529,7 +529,7 @@ function assertParamPropString(obj, parameterNum, propName) {
 //-----------------------------------------------------------------------------
 // assertParamPropValue()
 //
-// Asserts that the property value of a parmeter passes the specified
+// Asserts that the property value of a parameter passes the specified
 // condition.
 //-----------------------------------------------------------------------------
 function assertParamPropValue(condition, parameterNum, propName) {
@@ -540,7 +540,7 @@ function assertParamPropValue(condition, parameterNum, propName) {
 //-----------------------------------------------------------------------------
 // assertParamValue()
 //
-// Asserts that the parmeter value passes the specified condition.
+// Asserts that the parameter value passes the specified condition.
 //-----------------------------------------------------------------------------
 function assertParamValue(condition, parameterNum) {
   assert(condition, ERR_INVALID_PARAMETER_VALUE, parameterNum);

lib/errors.js

@@ -69,22 +69,26 @@ const defaultPoolAlias = 'default';
 let _initOracleClientArgs;
 
 // Load the Oracledb binary
-function _initCLib() {
+function _initCLib(options) {
   /*global __non_webpack_require__*/  // quieten eslint
   const requireBinary = (typeof __non_webpack_require__ === 'function') ? __non_webpack_require__ : require; // See Issue 1156
-
   const binaryLocations = [
     '../' + nodbUtil.RELEASE_DIR + '/' + nodbUtil.BINARY_FILE,  // pre-built binary
-    '../' + nodbUtil.RELEASE_DIR + '/' + 'oracledb.node',       // binary built from source
-    '../build/Debug/oracledb.node',                             // debug binary
+    '../' + nodbUtil.RELEASE_DIR + '/' + nodbUtil.BUILD_FILE,   // binary built from source
+    '../build/Debug/' + nodbUtil.BUILD_FILE,                    // debug binary
     // Paths for Webpack.
     // Note: to use node-oracledb Thick mode, you will need a Webpack copy plugin to
     // copy 'node_modules/oracledb/build/' to the output directory,
     // see https://github.com/oracle/node-oracledb/issues/1156
     // If you want to use only node-oracledb Thin mode, a copy plugin is not needed.
     './node_modules/oracledb/' + nodbUtil.RELEASE_DIR + '/' + nodbUtil.BINARY_FILE,
-    './node_modules/oracledb/' + nodbUtil.RELEASE_DIR + '/' + 'oracledb.node'
+    './node_modules/oracledb/' + nodbUtil.RELEASE_DIR + '/' + nodbUtil.BUILD_FILE
   ];
+
+  if (options.binaryDir !== undefined) {
+    binaryLocations.splice(0, 0, options.binaryDir + '/' + nodbUtil.BINARY_FILE,
+      options.binaryDir + '/' + nodbUtil.BUILD_FILE);
+  }
   let oracledbCLib;
   for (let i = 0; i < binaryLocations.length; i++) {
     try {
@@ -682,12 +686,13 @@ function initOracleClient(arg1) {
     errors.assertParamPropString(options, 1, "configDir");
     errors.assertParamPropString(options, 1, "errorUrl");
     errors.assertParamPropString(options, 1, "driverName");
+    errors.assertParamPropString(options, 1, "binaryDir");
   }
   if (settings.thinDriverInitialized) {
     errors.throwErr(errors.ERR_THIN_CONNECTION_ALREADY_CREATED);
   }
   if (_initOracleClientArgs === undefined) {
-    const oracledbCLib = _initCLib();
+    const oracledbCLib = _initCLib(options);
     if (options.driverName === undefined)
       options.driverName = constants.DEFAULT_DRIVER_NAME + " thk";
     if (options.errorUrl === undefined)

lib/oracledb.js

@@ -188,6 +188,16 @@ class SodaCollection {
     return doc;
   }
 
+  //---------------------------------------------------------------------------
+  // listIndexes()
+  //
+  //   To obtain all indices from the collection
+  //---------------------------------------------------------------------------
+  async listIndexes() {
+    const arr = await this._impl.listIndexes();
+    return arr.map(i => JSON.parse(i));
+  }
+
   //---------------------------------------------------------------------------
   // metaData()
   //
@@ -262,6 +272,7 @@ nodbUtil.wrapFns(SodaCollection.prototype,
   "insertManyAndGet",
   "insertOne",
   "insertOneAndGet",
+  "listIndexes",
   "save",
   "saveAndGet",
   "truncate");

lib/sodaCollection.js

@@ -94,6 +94,22 @@ class SodaOperation {
     }
   }
 
+
+  //---------------------------------------------------------------------------
+  // lock()
+  //
+  //  Pessimistic locking - similar to SELECT FOR UPDATE, these documents
+  //  cannot be updated by other threads until an explicit commit/rollback is
+  //  called.  With autoCommit set to true is applicable only for one immediate
+  //  operation and is not recommended in this context
+  //---------------------------------------------------------------------------
+  lock()  {
+    errors.assertArgCount(arguments, 0, 0);
+    this._options.lock = true;
+    return this;
+  }
+
+
   //---------------------------------------------------------------------------
   // replaceOne()
   //