Fix results.metaData for queries with {resultSet:true}

Author: Christopher Jones

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## node-oracledb v1.9.2 (DD Mon YYYY)
+
+- Fix `results.metaData` for queries with `{resultSet: true}`
+
 ## node-oracledb v1.9.1 (18 May 2016)
 
 - Upgraded to NAN 2.3 for Node 6 support.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "1.9.1",
+  "version": "1.9.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/njs/src/njsConnection.cpp

@@ -1509,17 +1509,17 @@ void Connection::Async_Execute (uv_work_t *req)
 
       executeBaton->dpistmt->execute(0, executeBaton->autoCommit);
 
-      if ( executeBaton->getRS )
-      {
-        goto exitAsyncExecute;
-      }
-
       const dpi::MetaData* meta   = executeBaton->dpistmt->getMetaData();
       executeBaton->numCols       = executeBaton->dpistmt->numCols();
       executeBaton->columnNames   = new std::string[executeBaton->numCols];
       Connection::CopyMetaData( executeBaton->columnNames, meta,
                                 executeBaton->numCols );
 
+      if ( executeBaton->getRS )
+      {
+        goto exitAsyncExecute;
+      }
+
       Connection::DoDefines(executeBaton, meta, executeBaton->numCols);
       /* If any errors while creating define structures, bail out */
       if ( !executeBaton->error.empty() )

src/njs/src/njsOracle.h

@@ -70,7 +70,7 @@ using namespace v8;
 /* Keep the version in sync with package.json */
 #define NJS_NODE_ORACLEDB_MAJOR       1
 #define NJS_NODE_ORACLEDB_MINOR       9
-#define NJS_NODE_ORACLEDB_PATCH       1
+#define NJS_NODE_ORACLEDB_PATCH       2
 
 /* Used for Oracledb.version */
 #define NJS_NODE_ORACLEDB_VERSION   ( (NJS_NODE_ORACLEDB_MAJOR * 10000) + \