Chore/merge v1.4.6

.gitignore

@@ -2,4 +2,7 @@ a.out
 build
 node_modules
 deps
-.idea
+.idea
+core
+.env
+.vscode

README.md

@@ -1,3 +1,15 @@
+# node-odbc 2.0.0 is now in beta!
+A new version of `odbc` has been released in beta! The initial release of this beta can be found at [https://www.npmjs.com/package/odbc/v/2.0.0-beta.0](https://www.npmjs.com/package/odbc/v/2.0.0-beta.0), while later releases can be found under the Versions tab on npm. This URL contains information including the README file outlining the new API.
+
+To install the beta version, include the `beta` tag with your command:
+```
+npm install odbc@beta
+```
+
+Test it out and give feedback on the issues of the official git repository!
+
+---
+
 node-odbc
 ---------
 
@@ -10,7 +22,10 @@ requirements
 * unixODBC binaries and development libraries for module compilation
   * on Ubuntu/Debian `sudo apt-get install unixodbc unixodbc-dev`
   * on RedHat/CentOS `sudo yum install unixODBC unixODBC-devel`
-  * on OSX using macports.org `sudo port unixODBC`
+  * on OSX
+    * using macports.org `sudo port unixODBC`
+    * using brew `brew install unixODBC`
+  * on IBM i `yum install unixODBC unixODBC-devel` (requires [yum](http://ibm.biz/ibmi-rpms))
 * odbc drivers for target database
 * properly configured odbc.ini and odbcinst.ini.
 
@@ -83,6 +98,16 @@ var Database = require("odbc").Database
   , db = new Database();
 ```
 
+#### .connected
+
+Returns a Boolean of whether the database is currently connected.
+
+```javascript
+var db = require("odbc")();
+
+console.log( "Connected: " + db.connected );
+```
+
 #### .open(connectionString, callback)
 
 Open a connection to a database.

binding.gyp

@@ -38,6 +38,18 @@
           ],
           'libraries' : [ 
           ]
+        }],
+        [ 'OS=="aix"', {
+          'variables': {
+            'os_name': '<!(uname -s)',
+          },
+          'conditions': [
+             [ '"<(os_name)"=="OS400"', {
+               'ldflags': [
+                  '-Wl,-brtl,-bnoquiet,-blibpath:/QOpenSys/pkgs/lib,-lodbc'
+                ]
+             }]
+          ]
         }]
       ]
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "odbc",
   "description": "unixodbc bindings for node",
-  "version": "1.3.0",
+  "version": "1.4.6",
   "main": "lib/odbc.js",
   "types": "./lib/odbc.d.ts",
   "homepage": "http://github.com/wankdanker/node-odbc/",
@@ -33,8 +33,8 @@
     "test": "cd test && node run-tests.js"
   },
   "dependencies": {
-    "bindings": "^1.2.1",
-    "nan": "^2.0.9",
+    "bindings": "^1.3.0",
+    "nan": "^2.10.0",
     "node-gyp": "^3.0.3"
   },
   "gypfile": true

src/odbc.cpp

@@ -68,6 +68,7 @@ void ODBC::Init(v8::Handle<Object> exports) {
   constructor_template->Set(Nan::New<String>("SQL_RESET_PARAMS").ToLocalChecked(), Nan::New<Number>(SQL_RESET_PARAMS), constant_attributes);
   constructor_template->Set(Nan::New<String>("SQL_DESTROY").ToLocalChecked(), Nan::New<Number>(SQL_DESTROY), constant_attributes);
   constructor_template->Set(Nan::New<String>("FETCH_ARRAY").ToLocalChecked(), Nan::New<Number>(FETCH_ARRAY), constant_attributes);
+  constructor_template->Set(Nan::New<String>("SQL_USER_NAME").ToLocalChecked(), Nan::New<Number>(SQL_USER_NAME), constant_attributes);
   NODE_ODBC_DEFINE_CONSTANT(constructor_template, FETCH_OBJECT);
 
   // Prototype Methods
@@ -204,7 +205,7 @@ void ODBC::UV_AfterCreateConnection(uv_work_t* req, int status) {
     info[0] = Nan::New<External>(data->dbo->m_hEnv);
     info[1] = Nan::New<External>(data->hDBC);
 
-    Local<Value> js_result = Nan::New<Function>(ODBCConnection::constructor)->NewInstance(2, info);
+    Local<Object> js_result = Nan::NewInstance(Nan::New(ODBCConnection::constructor), 2, info).ToLocalChecked();
 
     info[0] = Nan::Null();
     info[1] = js_result;
@@ -251,7 +252,7 @@ NAN_METHOD(ODBC::CreateConnectionSync) {
   params[0] = Nan::New<External>(dbo->m_hEnv);
   params[1] = Nan::New<External>(hDBC);
 
-  Local<Object> js_result = Nan::New<Function>(ODBCConnection::constructor)->NewInstance(2, params);
+  Local<Object> js_result = Nan::NewInstance(Nan::New(ODBCConnection::constructor), 2, params).ToLocalChecked();
 
   info.GetReturnValue().Set(js_result);
 }
@@ -445,8 +446,10 @@ Handle<Value> ODBC::GetColumnValue( SQLHSTMT hStmt, Column column,
         , tm_wday : 0
         , tm_yday : 0
         , tm_isdst : 0
+        #ifndef _AIX //AIX does not have these 
         , tm_gmtoff : 0
         , tm_zone : 0
+        #endif
       };
 
       SQL_TIMESTAMP_STRUCT odbcTime;
@@ -482,6 +485,9 @@ Handle<Value> ODBC::GetColumnValue( SQLHSTMT hStmt, Column column,
         return scope.Escape(Nan::New<Date>((double(timegm(&timeInfo)) * 1000)
                           + (odbcTime.fraction / 1000000)).ToLocalChecked());
 #else
+#ifdef _AIX
+    #define timelocal mktime
+#endif
         return scope.Escape(Nan::New<Date>((double(timelocal(&timeInfo)) * 1000)
                           + (odbcTime.fraction / 1000000)).ToLocalChecked());
 #endif
@@ -847,11 +853,11 @@ Local<Object> ODBC::GetSQLError (SQLSMALLINT handleType, SQLHANDLE handle, char*
         // First error is assumed the primary error
         objError->Set(Nan::New("error").ToLocalChecked(), Nan::New(message).ToLocalChecked());
 #ifdef UNICODE
-        objError->SetPrototype(Exception::Error(Nan::New((uint16_t *)errorMessage).ToLocalChecked()));
+        Nan::SetPrototype(objError, Exception::Error(Nan::New((uint16_t *) errorMessage).ToLocalChecked()));
         objError->Set(Nan::New("message").ToLocalChecked(), Nan::New((uint16_t *)errorMessage).ToLocalChecked());
         objError->Set(Nan::New("state").ToLocalChecked(), Nan::New((uint16_t *)errorSQLState).ToLocalChecked());
 #else
-        objError->SetPrototype(Exception::Error(Nan::New(errorMessage).ToLocalChecked()));
+        Nan::SetPrototype(objError, Exception::Error(Nan::New(errorMessage).ToLocalChecked()));
         objError->Set(Nan::New("message").ToLocalChecked(), Nan::New(errorMessage).ToLocalChecked());
         objError->Set(Nan::New("state").ToLocalChecked(), Nan::New(errorSQLState).ToLocalChecked());
 #endif
@@ -876,7 +882,7 @@ Local<Object> ODBC::GetSQLError (SQLSMALLINT handleType, SQLHANDLE handle, char*
   if (statusRecCount == 0) {
     //Create a default error object if there were no diag records
     objError->Set(Nan::New("error").ToLocalChecked(), Nan::New(message).ToLocalChecked());
-    objError->SetPrototype(Exception::Error(Nan::New(message).ToLocalChecked()));
+    Nan::SetPrototype(objError, Exception::Error(Nan::New(message).ToLocalChecked()));
     objError->Set(Nan::New("message").ToLocalChecked(), Nan::New(
       (const char *) "[node-odbc] An error occurred but no diagnostic information was available.").ToLocalChecked());
   }

src/odbc_connection.cpp

@@ -72,7 +72,9 @@ void ODBCConnection::Init(v8::Handle<Object> exports) {
   Nan::SetPrototypeMethod(constructor_template, "beginTransactionSync", BeginTransactionSync);
   Nan::SetPrototypeMethod(constructor_template, "endTransaction", EndTransaction);
   Nan::SetPrototypeMethod(constructor_template, "endTransactionSync", EndTransactionSync);
-
+
+  Nan::SetPrototypeMethod(constructor_template, "getInfoSync", GetInfoSync);
+
   Nan::SetPrototypeMethod(constructor_template, "columns", Columns);
   Nan::SetPrototypeMethod(constructor_template, "tables", Tables);
 
@@ -554,7 +556,7 @@ NAN_METHOD(ODBCConnection::CreateStatementSync) {
   params[1] = Nan::New<External>(conn->m_hDBC);
   params[2] = Nan::New<External>(hSTMT);
 
-  Local<Object> js_result(Nan::New<Function>(ODBCStatement::constructor)->NewInstance(3, params));
+  Local<Object> js_result(Nan::NewInstance(Nan::New(ODBCStatement::constructor), 3, params).ToLocalChecked());
 
   info.GetReturnValue().Set(js_result);
 }
@@ -643,12 +645,11 @@ void ODBCConnection::UV_AfterCreateStatement(uv_work_t* req, int status) {
   info[1] = Nan::New<External>(data->conn->m_hDBC);
   info[2] = Nan::New<External>(data->hSTMT);
 
-  Local<Value> js_result = Nan::New<Function>(ODBCStatement::constructor)->NewInstance(3, info);
+  Local<Object> js_result = Nan::NewInstance(Nan::New(ODBCStatement::constructor), 3, info).ToLocalChecked();
 
   info[0] = Nan::Null();
   info[1] = js_result;
 
-
   Nan::TryCatch try_catch;
 
   data->cb->Call( 2, info);
@@ -888,7 +889,7 @@ void ODBCConnection::UV_AfterQuery(uv_work_t* req, int status) {
     info[2] = Nan::New<External>(data->hSTMT);
     info[3] = Nan::New<External>(canFreeHandle);
 
-    Local<Object> js_result = Nan::New<Function>(ODBCResult::constructor)->NewInstance(4, info);
+    Local<Object> js_result = Nan::NewInstance(Nan::New(ODBCResult::constructor), 4, info).ToLocalChecked();
 
     // Check now to see if there was an error (as there may be further result sets)
     if (data->result == SQL_ERROR) {
@@ -1137,12 +1138,57 @@ NAN_METHOD(ODBCConnection::QuerySync) {
     result[2] = Nan::New<External>(hSTMT);
     result[3] = Nan::New<External>(canFreeHandle);
 
-    Local<Object> js_result = Nan::New<Function>(ODBCResult::constructor)->NewInstance(4, result);
+    Local<Object> js_result = Nan::NewInstance(Nan::New(ODBCResult::constructor), 4, result).ToLocalChecked();
 
     info.GetReturnValue().Set(js_result);
   }
 }
 
+
+/*
+ * GetInfoSync
+ */
+
+NAN_METHOD(ODBCConnection::GetInfoSync) {
+  DEBUG_PRINTF("ODBCConnection::GetInfoSync\n");
+  Nan::HandleScope scope;
+
+  ODBCConnection* conn = Nan::ObjectWrap::Unwrap<ODBCConnection>(info.Holder());
+
+  if (info.Length() == 1) {
+    if ( !info[0]->IsNumber() ) {
+        return Nan::ThrowTypeError("ODBCConnection::GetInfoSync(): Argument 0 must be a Number.");
+    }
+  }
+  else {
+    return Nan::ThrowTypeError("ODBCConnection::GetInfoSync(): Requires 1 Argument.");
+  }
+
+  SQLUSMALLINT InfoType = info[0]->NumberValue();
+
+  switch (InfoType) {
+    case SQL_USER_NAME:
+      SQLRETURN ret;
+      SQLTCHAR userName[255];
+      SQLSMALLINT userNameLength;
+
+      ret = SQLGetInfo(conn->m_hDBC, SQL_USER_NAME, userName, sizeof(userName), &userNameLength);
+
+      if (SQL_SUCCEEDED(ret)) {
+#ifdef UNICODE
+        info.GetReturnValue().Set(Nan::New((uint16_t *)userName).ToLocalChecked());
+#else
+        info.GetReturnValue().Set(Nan::New((const char *) userName).ToLocalChecked());
+#endif
+      }
+      break;
+
+    default:
+      return Nan::ThrowTypeError("ODBCConnection::GetInfoSync(): The only supported Argument is SQL_USER_NAME.");
+  }
+}
+
+
 /*
  * Tables
  */

src/odbc_connection.h

@@ -106,6 +106,7 @@ class ODBCConnection : public Nan::ObjectWrap {
     static NAN_METHOD(QuerySync);
     static NAN_METHOD(BeginTransactionSync);
     static NAN_METHOD(EndTransactionSync);
+    static NAN_METHOD(GetInfoSync);
 protected:
 
     struct Fetch_Request {

src/odbc_result.cpp

@@ -54,6 +54,7 @@ void ODBCResult::Init(v8::Handle<Object> exports) {
   Nan::SetPrototypeMethod(constructor_template, "fetchSync", FetchSync);
   Nan::SetPrototypeMethod(constructor_template, "fetchAllSync", FetchAllSync);
   Nan::SetPrototypeMethod(constructor_template, "getColumnNamesSync", GetColumnNamesSync);
+  Nan::SetPrototypeMethod(constructor_template, "getRowCountSync", GetRowCountSync);
 
   // Properties
   OPTION_FETCH_MODE.Reset(Nan::New("fetchMode").ToLocalChecked());
@@ -184,7 +185,7 @@ NAN_METHOD(ODBCResult::Fetch) {
 
     Local<String> fetchModeKey = Nan::New<String>(OPTION_FETCH_MODE);
     if (obj->Has(fetchModeKey) && obj->Get(fetchModeKey)->IsInt32()) {
-      data->fetchMode = obj->Get(fetchModeKey)->ToInt32()->Value();
+      data->fetchMode = Nan::To<Uint32>(obj->Get(fetchModeKey)).ToLocalChecked()->Value();
     }
   }
   else {
@@ -337,7 +338,7 @@ NAN_METHOD(ODBCResult::FetchSync) {
 
     Local<String> fetchModeKey = Nan::New<String>(OPTION_FETCH_MODE);
     if (obj->Has(fetchModeKey) && obj->Get(fetchModeKey)->IsInt32()) {
-      fetchMode = obj->Get(fetchModeKey)->ToInt32()->Value();
+      fetchMode = Nan::To<Uint32>(obj->Get(fetchModeKey)).ToLocalChecked()->Value();
     }
   }
 
@@ -433,7 +434,7 @@ NAN_METHOD(ODBCResult::FetchAll) {
 
     Local<String> fetchModeKey = Nan::New<String>(OPTION_FETCH_MODE);
     if (obj->Has(fetchModeKey) && obj->Get(fetchModeKey)->IsInt32()) {
-      data->fetchMode = obj->Get(fetchModeKey)->ToInt32()->Value();
+      data->fetchMode = Nan::To<Uint32>(obj->Get(fetchModeKey)).ToLocalChecked()->Value();
     }
   }
   else {
@@ -594,7 +595,7 @@ NAN_METHOD(ODBCResult::FetchAllSync) {
 
     Local<String> fetchModeKey = Nan::New<String>(OPTION_FETCH_MODE);
     if (obj->Has(fetchModeKey) && obj->Get(fetchModeKey)->IsInt32()) {
-      fetchMode = obj->Get(fetchModeKey)->ToInt32()->Value();
+      fetchMode = Nan::To<Uint32>(obj->Get(fetchModeKey)).ToLocalChecked()->Value();
     }
   }
 
@@ -744,9 +745,36 @@ NAN_METHOD(ODBCResult::GetColumnNamesSync) {
   }
 
   for (int i = 0; i < self->colCount; i++) {
+#ifdef UNICODE
     cols->Set(Nan::New(i),
-              Nan::New((const char *) self->columns[i].name).ToLocalChecked());
+              Nan::New((uint16_t*) self->columns[i].name).ToLocalChecked());
+#else
+    cols->Set(Nan::New(i),
+              Nan::New((char *) self->columns[i].name).ToLocalChecked());
+#endif
+
   }
 
   info.GetReturnValue().Set(cols);
 }
+
+/*
+ * GetRowCountSync
+ */
+
+NAN_METHOD(ODBCResult::GetRowCountSync) {
+  DEBUG_PRINTF("ODBCResult::GetRowCountSync\n");
+  Nan::HandleScope scope;
+
+  ODBCResult* self = Nan::ObjectWrap::Unwrap<ODBCResult>(info.Holder());
+
+  SQLLEN rowCount = 0;
+
+  SQLRETURN ret = SQLRowCount(self->m_hSTMT, &rowCount);
+
+  if (!SQL_SUCCEEDED(ret)) {
+    rowCount = 0;
+  }
+
+  info.GetReturnValue().Set(Nan::New<Number>(rowCount));
+}

src/odbc_result.h

@@ -62,6 +62,7 @@ class ODBCResult : public Nan::ObjectWrap {
     static NAN_METHOD(FetchSync);
     static NAN_METHOD(FetchAllSync);
     static NAN_METHOD(GetColumnNamesSync);
+    static NAN_METHOD(GetRowCountSync);
 
     //property getter/setters
     static NAN_GETTER(FetchModeGetter);