Merge with the latest version of oracledb

Author: Bigous

.npmignore

@@ -0,0 +1,10 @@
+INSTALL.md
+CONTRIBUTING.md
+/doc
+/examples
+/build
+/node_modules
+/test
+/oracle_private_test
+oracledb-*.tgz
+.npmignore

INSTALL.md

@@ -30,11 +30,11 @@ limitations under the License.
 The steps below create a standalone Node.js installation for testing.
 Adjust the steps for your environment.
 
-The node-oracledb release has been tested with Node.js 0.10.35 on
-64-bit Oracle Linux.  The driver can also build in some 32-bit Linux,
-Solaris and Mac OS X environments, but these architectures have not
-been fully tested.  Installation on those platforms is similar to the
-steps described in this document.
+This node-oracledb release currently works only with Node.js 0.10.  It
+has been tested with 0.10.35 on 64-bit Oracle Linux and Windows.  The
+driver can also build in some Mac OS X, 32-bit Linux, 32-bit Windows,
+Solaris and AIX environments, but these architectures have not been fully
+tested. 
 
 Node-oracledb is currently only available on GitHub.
 
@@ -53,15 +53,15 @@ install Xcode.
 
 Instructions may need to be adjusted for your platform and environment.
 
-
 I have ... | Follow this ...
 ----------|-----------------
 Linux.  My database is on another machine.  | [Node-oracledb Installation on Linux with Instant Client RPMs](#instrpm)
-Solaris.  My database is on another machine. | [Node-oracledb Installation on Linux with Instant Client ZIP files](#instzip)
-Linux or Solaris, with a database on the same machine. |  [Node-oracledb Installation on Linux with a Local Database](#instoh)
-Linux or Solaris, with the full Oracle client (installed via runInstaller) on the same machine. |  [Node-oracledb Installation on Linux with a Local Database](#instoh)
-Mac OS X. | [Node-oracledb Installation on OS X with Instant Client](#instosx)
-Another OS with Oracle 11.2 or 12.1 libraries available | Update binding.gyp and make any code changes required, sign the [OCA](https://www.oracle.com/technetwork/community/oca-486395.html), and submit a pull request with your patch (Windows support is already being worked on).  
+Solaris or AIX.  My database is on another machine. | [Node-oracledb Installation on Linux with Instant Client ZIP files](#instzip)
+Linux, Solaris or AIX.  My database is on the same machine. |  [Node-oracledb Installation on Linux with a Local Database](#instoh)
+Linux, Solaris or AIX. I have the full Oracle client (installed via runInstaller) on the same machine. |  [Node-oracledb Installation on Linux with a Local Database](#instoh)
+Apple OS X | [Node-oracledb Installation on OS X with Instant Client](#instosx)
+Windows | [Node-oracledb Installation on Windows](#instwin)
+Another OS with Oracle 11.2 or 12.1 libraries available | Update binding.gyp and make any code changes required, sign the [OCA](https://www.oracle.com/technetwork/community/oca-486395.html), and submit a pull request with your patch.
 
 ### Other Resources Useful for node-oracledb
 
@@ -92,6 +92,9 @@ On Linux, the node-oracledb installer looks for Oracle client libraries and head
 git clone https://github.com/oracle/node-oracledb.git
 ```
 
+Alternatively, download the ZIP file from
+https://github.com/oracle/node-oracledb and extract it.
+
 ### 2.2 Install Node.js
 
 Download the
@@ -171,6 +174,9 @@ node examples/select1.js
 git clone https://github.com/oracle/node-oracledb.git
 ```
 
+Alternatively, download the ZIP file from
+https://github.com/oracle/node-oracledb and extract it.
+
 ### 3.2 Install Node.js
 
 Download the
@@ -279,6 +285,9 @@ Oracle Database.
 git clone https://github.com/oracle/node-oracledb.git
 ```
 
+Alternatively, download the ZIP file from
+https://github.com/oracle/node-oracledb and extract it.
+
 ### 4.2 Install Node.js
 
 Download the
@@ -301,7 +310,7 @@ export PATH=$HOME/Desktop/node-v0.10.35-linux-x64/bin:$PATH
 Tell the installer where to find the Oracle client:
 
 ```
-export ORACLE_HOME=/wherever/it/is/see/etc/oratab
+export ORACLE_HOME=/whereever/it/is
 ```
 
 *Warning*: By default, the installer will look first for Oracle
@@ -367,6 +376,9 @@ Building node-oracledb requires Xcode from the Mac App store.
 git clone https://github.com/oracle/node-oracledb.git
 ```
 
+Alternatively, download the ZIP file from
+https://github.com/oracle/node-oracledb and extract it.
+
 ### 5.3 Install Node.js
 
 Node can be installed from various sources, such as via *brew*.
@@ -477,6 +489,9 @@ to add the Python directories to the path.
 git clone https://github.com/oracle/node-oracledb.git
 ```
 
+Alternatively, download the ZIP file from
+https://github.com/oracle/node-oracledb and extract it.
+
 ### 6.3 Install Node.js
 
 Install the 64 bit Node.js MSI from [nodejs.org](http://nodejs.org/download/)

README.md

@@ -1,19 +1,20 @@
-# node-oracledb version 0.3
+# node-oracledb version 0.4
 
 ## <a name="about"></a> 1. About node-oracledb
 
 The Oracle Database Node.js driver powers high performance
 Node.js applications.
 
-Node-oracledb 0.3 supports basic and advanced Oracle features, including:
+Node-oracledb 0.4 supports basic and advanced Oracle features, including:
 
 - SQL and PL/SQL Execution
-- Binding using JavaScript objects or arrays
 - Query results as JavaScript objects or array 
+- Binding using JavaScript objects or arrays
 - Conversion between JavaScript and Oracle types
 - Transaction Management
 - Connection Pooling
-- [Database Resident Connection Pooling](#http://docs.oracle.com/database/121/ADFNS/adfns_perf_scale.htm#ADFNS228) (DRCP)
+- [Database Resident Connection Pooling](http://docs.oracle.com/database/121/ADFNS/adfns_perf_scale.htm#ADFNS228) (DRCP)
+- [External Authentication](http://docs.oracle.com/database/121/DBSEG/authentication.htm#DBSEG99840)
 - [Statement Caching](http://docs.oracle.com/database/121/LNOCI/oci09adv.htm#i471377)
 - [Client Result Caching](http://docs.oracle.com/database/121/ADFNS/adfns_perf_scale.htm#ADFNS464)
 - [End-to-end tracing](http://docs.oracle.com/database/121/TGSQL/tgsql_trace.htm#CHDBDGIJ)
@@ -22,7 +23,7 @@ Node-oracledb 0.3 supports basic and advanced Oracle features, including:
   - [Runtime Load Balancing](http://docs.oracle.com/database/121/ADFNS/adfns_perf_scale.htm#ADFNS515) (RLB)
   - [Transparent Application Failover](http://docs.oracle.com/database/121/ADFNS/adfns_avail.htm#ADFNS534) (TAF)
 
-Node-oracledb 0.3 is a preview release.  We are actively working on
+Node-oracledb 0.4 is a preview release.  We are actively working on
 adding features including LOB support and batch fetching / streaming
 of large query result sets.
 
@@ -82,15 +83,15 @@ There are more examples in the [examples](examples) directory.
 
 The current release of node-oracledb is available only on GitHub.  The basic install steps are:
 
-- Install the small, free [Oracle Instant Client](http://www.oracle.com/technetwork/database/features/instant-client/index-100365.html) libraries, or have a local database such as the free [Oracle XE](http://www.oracle.com/technetwork/database/database-technologies/express-edition/overview/index.html) release.
+- Install the small, free [Oracle Instant Client](http://www.oracle.com/technetwork/database/features/instant-client/index-100365.html) libraries if your database is remote, or have a local database such as the free [Oracle XE](http://www.oracle.com/technetwork/database/database-technologies/express-edition/overview/index.html) release.
 - Clone this repository
 - Run `npm install`
 
 See [INSTALL](INSTALL.md) for details.
 
 ## <a name="doc"></a> 3. Documentation
 
-See [API Documentation](doc/api.md)
+See [Documentation for the Oracle Database Node.js Driver](doc/api.md)
 
 ## <a name="contrib"></a> 4. Contributing