Skip to content

Commit

Permalink
Bump version to 4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cjbj committed Nov 21, 2019
1 parent e937b8a commit 787524f
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 25 deletions.
37 changes: 18 additions & 19 deletions INSTALL.md
@@ -1,5 +1,4 @@

# Installing node-oracledb Version 4.0
# Installing node-oracledb Version 4.1

*Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.*

Expand Down Expand Up @@ -105,8 +104,8 @@ information about older versions.
- Install a C Compiler such as Xcode, GCC, Visual Studio
2017, or similar.

- Run `npm install oracle/node-oracledb.git#v4.0.2`, or add
`oracle/node-oracledb.git#v4.0.2` to your `package.json`
- Run `npm install oracle/node-oracledb.git#v4.1.0`, or add
`oracle/node-oracledb.git#v4.1.0` to your `package.json`
dependencies. Substitute your desired [GitHub tag][40].

- Add Oracle 19, 18, 12, or 11.2 client libraries to your operating
Expand Down Expand Up @@ -1006,19 +1005,19 @@ export CC=gcc
```

Locate the [GitHub tag][40] of the desired node-oracledb version, for
example `v4.0.2`, and use the `npm` package manager (which is
example `v4.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#v4.0.2
npm install oracle/node-oracledb.git#v4.1.0
```

Otherwise install using:

```
npm install https://github.com/oracle/node-oracledb/releases/download/v4.0.2/oracledb-src-4.0.2.tgz
npm install https://github.com/oracle/node-oracledb/releases/download/v4.1.0/oracledb-src-4.1.0.tgz
```

#### 3.9.4 Install the free Oracle Instant Client 'Basic' ZIP file
Expand Down Expand Up @@ -1125,19 +1124,19 @@ export MAKE=gmake
```

Locate the [GitHub tag][40] of the desired node-oracledb version, for
example `v4.0.2`, and use the `npm` package manager (which is
example `v4.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#v4.0.2
npm install oracle/node-oracledb.git#v4.1.0
```

Otherwise install using:

```
npm install https://github.com/oracle/node-oracledb/releases/download/v4.0.2/oracledb-src-4.0.2.tgz
npm install https://github.com/oracle/node-oracledb/releases/download/v4.1.0/oracledb-src-4.1.0.tgz
```

#### 3.9.4 Install the free Oracle Instant Client 'Basic' ZIP file
Expand Down Expand Up @@ -1240,12 +1239,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 'v4.0.2', add
`oracle/node-oracledb#v4.0.2` to your `package.json` dependencies, or
example, to install the code from the GitHub tag 'v4.1.0', add
`oracle/node-oracledb#v4.1.0` to your `package.json` dependencies, or
use the command:

```
npm install oracle/node-oracledb#v4.0.2
npm install oracle/node-oracledb#v4.1.0
```

This will download, compile and install node-oracledb.
Expand All @@ -1259,7 +1258,7 @@ Users without `git`, or with older versions of `npm` such as included in
Node.js 6, may alternatively need to use pre-bundled source code:

```
npm install https://github.com/oracle/node-oracledb/releases/download/v4.0.2/oracledb-src-4.0.2.tgz
npm install https://github.com/oracle/node-oracledb/releases/download/v4.1.0/oracledb-src-4.1.0.tgz
```

Note it may take some time before compilation begins due to the slow
Expand Down Expand Up @@ -1293,7 +1292,7 @@ installing.
#### <a name="nogithubaccess"></a> 3.10.3 Compiling node-oracledb without GitHub Access

Some companies block access to github.com so compiling source code
from GitHub with `npm install oracle/node-oracledb.git#v4.0.2` will
from GitHub with `npm install oracle/node-oracledb.git#v4.1.0` will
fail.

Oracle has a mirror of the GitHub repository source code that can be
Expand Down Expand Up @@ -1398,7 +1397,7 @@ See [Node.js for Oracle Linux][46] for details.
You can host node-oracledb packages locally.

Download the node-oracledb package from npm, for example from
[`https://registry.npmjs.com/oracledb/-/oracledb-4.0.2.tgz`](https://registry.npmjs.com/oracledb/-/oracledb-4.0.2.tgz)
[`https://registry.npmjs.com/oracledb/-/oracledb-4.1.0.tgz`](https://registry.npmjs.com/oracledb/-/oracledb-4.1.0.tgz)
Alternatively, if you want to build your own binaries and
node-oracledb package, the maintainer scripts in
[/package](https://github.com/oracle/node-oracledb/tree/master/package)
Expand All @@ -1407,19 +1406,19 @@ can be used. See
for details.

If you make the package accessible on your local web server, for
example at www.example.com/oracledb-4.0.2.tgz, then your
example at www.example.com/oracledb-4.1.0.tgz, then your
install command would be:

```
npm install https://www.example.com/oracledb-4.0.2.tgz
npm install https://www.example.com/oracledb-4.1.0.tgz
```

or your `package.json` would contain:

```
. . .
"dependencies": {
"oracledb": "https://www.example.com/oracledb-4.0.2.tgz"
"oracledb": "https://www.example.com/oracledb-4.1.0.tgz"
},
. . .
```
Expand Down
4 changes: 2 additions & 2 deletions README.md
@@ -1,9 +1,9 @@
# node-oracledb version 4.0
# node-oracledb version 4.1

The node-oracledb add-on for Node.js powers high performance Oracle
Database applications.

Use node-oracledb 4.0 to connect Node.js 8.16, 10.16, 12, or later, to Oracle Database.
Use node-oracledb 4.1 to connect Node.js 8.16, 10.16, 12, or later, to Oracle Database.
Older versions of node-oracledb may work with older versions of Node.js.

Node-oracledb supports basic and advanced features of Oracle Database
Expand Down
11 changes: 10 additions & 1 deletion doc/api.md
@@ -1,4 +1,4 @@
# node-oracledb 4.0 Documentation for the Oracle Database Node.js Add-on
# node-oracledb 4.1 Documentation for the Oracle Database Node.js Add-on

*Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.*

Expand Down Expand Up @@ -475,6 +475,7 @@ For installation information, see the [Node-oracledb Installation Instructions][
- 33.3 [Migrating from node-oracledb 2.3 to node-oracledb 3.0](#migratev23v30)
- 33.4 [Migrating from node-oracledb 3.0 to node-oracledb 3.1](#migratev30v31)
- 33.5 [Migrating from node-oracledb 3.1 to node-oracledb 4.0](#migratev31v40)
- 33.6 [Migrating from node-oracledb 4.0 to node-oracledb 4.1](#migratev40v41)
34. [Useful Resources for Node-oracledb](#otherresources)

## <a name="apimanual"></a> NODE-ORACLEDB API MANUAL
Expand Down Expand Up @@ -13958,6 +13959,14 @@ When upgrading from node-oracledb version 3.1 to version 4.0:
[`OUT_FORMAT_ARRAY`](#oracledbconstantsoutformat) and
[`OUT_FORMAT_OBJECT`](#oracledbconstantsoutformat).

### <a name="migratev40v41"></a> 33.6 Migrating from node-oracledb 4.0 to node-oracledb 4.1

When upgrading from node-oracledb version 4.0 to version 4.1:

- Review the [CHANGELOG][83] and take advantage of new features.

- Review any programmatic or test use of node-oracledb error messages since some have changed.

## <a name="otherresources"></a> 34. Useful Resources for Node-oracledb

Node-oracledb can be installed on the pre-built [*Database App Development
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "oracledb",
"version": "4.0.2",
"version": "4.1.0",
"description": "A Node.js module for Oracle Database access",
"license": "Apache-2.0",
"homepage": "http://oracle.github.io/node-oracledb/",
Expand Down
4 changes: 2 additions & 2 deletions src/njsModule.h
Expand Up @@ -40,8 +40,8 @@
// The suffix should be something like "-dev" or "-beta.1".
// For production, use: #define NJS_NODE_ORACLEDB_SUFFIX ""
#define NJS_NODE_ORACLEDB_MAJOR 4
#define NJS_NODE_ORACLEDB_MINOR 0
#define NJS_NODE_ORACLEDB_PATCH 2
#define NJS_NODE_ORACLEDB_MINOR 1
#define NJS_NODE_ORACLEDB_PATCH 0
#define NJS_NODE_ORACLEDB_SUFFIX ""

// define stringified version and driver name
Expand Down

0 comments on commit 787524f

Please sign in to comment.