diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b1fa55..db7b3382 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## node-oracledb v2.1.0 (DD Mon YYYY) + ## node-oracledb v2.0.15 (15 Dec 2017) changes since node-oracledb version 1 - Release testing is now done for Node.js 4, 6, 8 and 9. diff --git a/INSTALL.md b/INSTALL.md index c466703c..57be9745 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -103,8 +103,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.0.15`, or add - `oracle/node-oracledb.git#v2.0.15` to your `package.json` + - Run `npm install oracle/node-oracledb.git#v2.1.0`, or add + `oracle/node-oracledb.git#v2.1.0` 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 @@ -1027,19 +1027,19 @@ export CC=gcc ``` Locate the [GitHub tag][40] of the desired node-oracledb version, for -example `v2.0.15`, and use the `npm` package manager (which is +example `v2.1.0`, 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.0.15 +npm install oracle/node-oracledb.git#v2.1.0 ``` Otherwise install using: ``` -npm install https://github.com/oracle/node-oracledb/releases/download/v2.0.15/oracledb-src-2.0.15.tgz +npm install https://github.com/oracle/node-oracledb/releases/download/v2.1.0/oracledb-src-2.1.0.tgz ``` #### 3.9.4 Install the free Oracle Instant Client 'Basic' ZIP file @@ -1150,19 +1150,19 @@ export MAKE=gmake ``` Locate the [GitHub tag][40] of the desired node-oracledb version, for -example `v2.0.15`, and use the `npm` package manager (which is +example `v2.1.0`, 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.0.15 +npm install oracle/node-oracledb.git#v2.1.0 ``` Otherwise install using: ``` -npm install https://github.com/oracle/node-oracledb/releases/download/v2.0.15/oracledb-src-2.0.15.tgz +npm install https://github.com/oracle/node-oracledb/releases/download/v2.1.0/oracledb-src-2.1.0.tgz ``` #### 3.10.4 Install the free Oracle Instant Client 'Basic' ZIP file @@ -1269,12 +1269,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.0.15', add -`oracle/node-oracledb#v2.0.15` to your `package.json` dependencies, or +example, to install the code from the GitHub tag 'v2.1.0', add +`oracle/node-oracledb#v2.1.0` to your `package.json` dependencies, or use the command: ``` -npm install oracle/node-oracledb#v2.0.15 +npm install oracle/node-oracledb#v2.1.0 ``` This will download, compile and install node-oracledb. @@ -1288,7 +1288,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.0.15/oracledb-src-2.0.15.tgz +npm install https://github.com/oracle/node-oracledb/releases/download/v2.1.0/oracledb-src-2.1.0.tgz ``` Note it may take some time before compilation begins due to the slow @@ -1343,10 +1343,10 @@ 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.0.15.tgz`. + `oracledb-2.1.0.tgz`. Also download the appropriate binary package, for example - `oracledb-v2.0.15-node-v57-darwin-x64.gz`. To determine the correct + `oracledb-v2.1.0-node-v57-darwin-x64.gz`. To determine the correct binary package, find your Node.js module version, platform and architecture using: @@ -1354,10 +1354,10 @@ of Node.js and operating system, you can install manually: - `node -p 'process.platform'` - `node -p 'process.arch'` - For example, when installing node-oracledb 2.0.15 on macOS with + For example, when installing node-oracledb 2.1.0 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.0.15-node-v57-darwin-x64.gz` + download is `oracledb-v2.1.0-node-v57-darwin-x64.gz` If an appropriate package is not available, follow the [Node-oracledb Installation Instructions](#instructions) for your @@ -1369,7 +1369,7 @@ of Node.js and operating system, you can install manually: ``` mkdir node_modules/oracledb cd node_modules/oracledb - tar -xzf oracledb-2.0.15.tgz + tar -xzf oracledb-2.1.0.tgz ``` The node_modules directory will contain: @@ -1405,7 +1405,7 @@ of Node.js and operating system, you can install manually: to unarchive the binary package, for example: ``` - node extractpackage.js path=oracledb-v2.0.15-node-v57-darwin-x64.gz + node extractpackage.js path=oracledb-v2.1.0-node-v57-darwin-x64.gz ``` - Create the subdirectory `node_modules/oracledb/build/Release` and @@ -1421,22 +1421,22 @@ 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.0.15`. +GitHub with `npm install oracle/node-oracledb.git#v2.1.0`. To install node-oracledb in this case, compile the source code included in the npm package: - Download the node-oracledb package from npm, for example - `https://registry.npmjs.com/oracledb/-/oracledb-2.0.15.tgz` + `https://registry.npmjs.com/oracledb/-/oracledb-2.1.0.tgz` - Create a directory such as `oracledb_build` and extract the package inside it: ``` mkdir oracledb_build - mv oracledb-2.0.15.tgz oracledb_build + mv oracledb-2.1.0.tgz oracledb_build cd oracledb_build - tar -xzf oracledb-2.0.15.tgz + tar -xzf oracledb-2.1.0.tgz ``` The directory contents will be the same as shown in the previous diff --git a/doc/api.md b/doc/api.md index 9d3269b0..d730676a 100644 --- a/doc/api.md +++ b/doc/api.md @@ -6290,8 +6290,8 @@ SQL> SELECT UNIQUE sid, client_driver SID CLIENT_DRIVER ---------- ------------------------------ - 16 node-oracledb : 2.0.14 - 33 node-oracledb : 2.0.14 + 16 node-oracledb : 2.1.0 + 33 node-oracledb : 2.1.0 ``` Note if [`oracledb.connectionClass`](#propdbconclass) is set for a diff --git a/package.json b/package.json index 1c533950..b2c89483 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oracledb", - "version": "2.0.15", + "version": "2.1.0", "description": "Oracle Database driver by Oracle Corp.", "license": "Apache-2.0", "homepage": "http://www.oracle.com/technetwork/database/database-technologies/scripting-languages/node_js/", diff --git a/package/package.json b/package/package.json index a2affa26..4255ca46 100644 --- a/package/package.json +++ b/package/package.json @@ -1,6 +1,6 @@ { "name": "oracledb", - "version": "2.0.15", + "version": "2.1.0", "description": "Oracle Database driver by Oracle Corp.", "license": "Apache-2.0", "homepage": "http://www.oracle.com/technetwork/database/database-technologies/scripting-languages/node_js/", diff --git a/src/njsOracle.h b/src/njsOracle.h index 10cd2215..52f2a36f 100644 --- a/src/njsOracle.h +++ b/src/njsOracle.h @@ -68,8 +68,8 @@ using namespace v8; // Keep the version in sync with package.json #define NJS_NODE_ORACLEDB_MAJOR 2 -#define NJS_NODE_ORACLEDB_MINOR 0 -#define NJS_NODE_ORACLEDB_PATCH 15 +#define NJS_NODE_ORACLEDB_MINOR 1 +#define NJS_NODE_ORACLEDB_PATCH 0 // define stringified version and driver name #define NJS_STR_HELPER(x) #x