Fixed regression with end-to-end tracing attributes not being set.

Author: cjbj

CHANGELOG.md

@@ -1,8 +1,12 @@
 # Change Log
 
+## node-oracledb v2.1.2 (21 Feb 2018)
+
+- Fixed regression with end-to-end tracing attributes not being set.
+
 ## node-oracledb v2.1.1 (16 Feb 2018)
 
-Fixed regression with querystream() in Node 4 & 6.
+- Fixed regression with querystream() in Node 4 & 6.
 
 ## node-oracledb v2.1.0 (15 Feb 2018)
 

INSTALL.md

@@ -104,8 +104,8 @@ version 2.0.
         - Install a C Compiler with support for C++ 11 (such as Xcode,
           GCC 4.8, Visual Studio 2015, or similar)
 
-        - Run `npm install oracle/node-oracledb.git#v2.1.1`, or add
-          `oracle/node-oracledb.git#v2.1.1` to your `package.json`
+        - Run `npm install oracle/node-oracledb.git#v2.1.2`, or add
+          `oracle/node-oracledb.git#v2.1.2` to your `package.json`
           dependencies.  Substitute your desired [GitHub tag][40].
 
 - Add Oracle 12.2, 12.1 or 11.2 client libraries to your operating
@@ -1038,19 +1038,19 @@ export CC=gcc
 ```
 
 Locate the [GitHub tag][40] of the desired node-oracledb version, for
-example `v2.1.1`, and use the `npm` package manager (which is
+example `v2.1.2`, and use the `npm` package manager (which is
 included in Node.js) to install it.
 
 If you have the `git` utility, you can install with:
 
 ```
-npm install oracle/node-oracledb.git#v2.1.1
+npm install oracle/node-oracledb.git#v2.1.2
 ```
 
 Otherwise install using:
 
 ```
-npm install https://github.com/oracle/node-oracledb/releases/download/v2.1.1/oracledb-src-2.1.1.tgz
+npm install https://github.com/oracle/node-oracledb/releases/download/v2.1.2/oracledb-src-2.1.2.tgz
 ```
 
 #### 3.9.4 Install the free Oracle Instant Client 'Basic' ZIP file
@@ -1161,19 +1161,19 @@ export MAKE=gmake
 ```
 
 Locate the [GitHub tag][40] of the desired node-oracledb version, for
-example `v2.1.1`, and use the `npm` package manager (which is
+example `v2.1.2`, and use the `npm` package manager (which is
 included in Node.js) to install it.
 
 If you have the `git` utility, you can install with:
 
 ```
-npm install oracle/node-oracledb.git#v2.1.1
+npm install oracle/node-oracledb.git#v2.1.2
 ```
 
 Otherwise install using:
 
 ```
-npm install https://github.com/oracle/node-oracledb/releases/download/v2.1.1/oracledb-src-2.1.1.tgz
+npm install https://github.com/oracle/node-oracledb/releases/download/v2.1.2/oracledb-src-2.1.2.tgz
 ```
 
 #### 3.10.4 Install the free Oracle Instant Client 'Basic' ZIP file
@@ -1280,12 +1280,12 @@ The `git` utility is required for this method.
 
 Build node-oracledb from source code by changing the package specifier
 so that `npm` downloads from GitHub instead of from npmjs.com.  For
-example, to install the code from the GitHub tag 'v2.1.1', add
-`oracle/node-oracledb#v2.1.1` to your `package.json` dependencies, or
+example, to install the code from the GitHub tag 'v2.1.2', add
+`oracle/node-oracledb#v2.1.2` to your `package.json` dependencies, or
 use the command:
 
 ```
-npm install oracle/node-oracledb#v2.1.1
+npm install oracle/node-oracledb#v2.1.2
 ```
 
 This will download, compile and install node-oracledb.
@@ -1299,7 +1299,7 @@ Users without `git`, or with older versions of `npm` such as included in
 Node 4, may alternatively need to use pre-bundled source code:
 
 ```
-npm install https://github.com/oracle/node-oracledb/releases/download/v2.1.1/oracledb-src-2.1.1.tgz
+npm install https://github.com/oracle/node-oracledb/releases/download/v2.1.2/oracledb-src-2.1.2.tgz
 ```
 
 Note it may take some time before compilation begins due to the slow
@@ -1354,21 +1354,21 @@ of Node.js and operating system, you can install manually:
   on the [GitHub Release][41] page.
 
   Download the release's main node-oracledb package, for example
-  `oracledb-2.1.1.tgz`.
+  `oracledb-2.1.2.tgz`.
 
   Also download the appropriate binary package, for example
-  `oracledb-v2.1.1-node-v57-darwin-x64.gz`. To determine the correct
+  `oracledb-v2.1.2-node-v57-darwin-x64.gz`. To determine the correct
   binary package, find your Node.js module version, platform and
   architecture using:
 
   - `node -p 'process.versions.modules'`
   - `node -p 'process.platform'`
   - `node -p 'process.arch'`
 
-  For example, when installing node-oracledb 2.1.1 on macOS with
+  For example, when installing node-oracledb 2.1.2 on macOS with
   Node.js 8, these commands will show the module version is '57', the
   platform is 'darwin' and the architecture is 'x64'.  The package to
-  download is `oracledb-v2.1.1-node-v57-darwin-x64.gz`
+  download is `oracledb-v2.1.2-node-v57-darwin-x64.gz`
 
   If an appropriate package is not available, follow the
   [Node-oracledb Installation Instructions](#instructions) for your
@@ -1380,7 +1380,7 @@ of Node.js and operating system, you can install manually:
   ```
   mkdir node_modules/oracledb
   cd node_modules/oracledb
-  tar -xzf oracledb-2.1.1.tgz
+  tar -xzf oracledb-2.1.2.tgz
   ```
 
   The node_modules directory will contain:
@@ -1416,7 +1416,7 @@ of Node.js and operating system, you can install manually:
   to unarchive the binary package, for example:
 
   ```
-  node extractpackage.js path=oracledb-v2.1.1-node-v57-darwin-x64.gz
+  node extractpackage.js path=oracledb-v2.1.2-node-v57-darwin-x64.gz
   ```
 
 - Create the subdirectory `node_modules/oracledb/build/Release` and
@@ -1432,7 +1432,7 @@ of Node.js and operating system, you can install manually:
 
 Some companies block access to github.com so `npm install oracledb`
 will fail to download binaries, as will installing source code from
-GitHub with `npm install oracle/node-oracledb.git#v2.1.1`.
+GitHub with `npm install oracle/node-oracledb.git#v2.1.2`.
 
 There are two suggested methods for installation.
 
@@ -1456,16 +1456,16 @@ Alternatively you can compile the source code that is included in the
 npm package:
 
 - Download the node-oracledb package from npm, for example
-  `https://registry.npmjs.com/oracledb/-/oracledb-2.1.1.tgz`
+  `https://registry.npmjs.com/oracledb/-/oracledb-2.1.2.tgz`
 
 - Create a directory such as `oracledb_build` and extract the package
   inside it:
 
   ```
   mkdir oracledb_build
-  mv oracledb-2.1.1.tgz oracledb_build
+  mv oracledb-2.1.2.tgz oracledb_build
   cd oracledb_build
-  tar -xzf oracledb-2.1.1.tgz
+  tar -xzf oracledb-2.1.2.tgz
   ```
 
   The directory contents will be the same as shown in the previous
@@ -1520,7 +1520,7 @@ sudo ldconfig
 Install the node-oracledb package:
 
 ```
-yum install node-oracledb-12c-node8-2.1.1
+yum install node-oracledb-12c-node8-2.1.2
 ```
 
 Since node-oracledb is installed globally, set `NODE_PATH` before

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Oracle Database driver by Oracle Corp.",
   "license": "Apache-2.0",
   "homepage": "http://www.oracle.com/technetwork/database/database-technologies/scripting-languages/node_js/",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Oracle Database driver by Oracle Corp.",
   "license": "Apache-2.0",
   "homepage": "http://www.oracle.com/technetwork/database/database-technologies/scripting-languages/node_js/",

src/njsConnection.cpp

@@ -1310,8 +1310,8 @@ void njsConnection::SetTextAttribute(Nan::NAN_SETTER_ARGS_TYPE args,
         return;
     }
     v8::String::Utf8Value utfstr(value->ToString());
-    if ((*setter)(connection->dpiConnHandle, *utfstr,
-                  static_cast<int32_t> (utfstr.length()) < 0))
+    uint32_t valueLength = static_cast<uint32_t>(utfstr.length());
+    if ((*setter)(connection->dpiConnHandle, *utfstr, valueLength) < 0)
         njsOracledb::ThrowDPIError();
 }
 

src/njsOracle.h

@@ -71,7 +71,7 @@ using namespace v8;
 // For production, leave NJS_NODE_ORACLEDB_SUFFIX undefined (not "")
 #define NJS_NODE_ORACLEDB_MAJOR       2
 #define NJS_NODE_ORACLEDB_MINOR       1
-#define NJS_NODE_ORACLEDB_PATCH       1
+#define NJS_NODE_ORACLEDB_PATCH       2
 #define NJS_NODE_ORACLEDB_SUFFIX
 
 // define stringified version and driver name