fix warning and installer update

bimalkjha · bimalkjha · commit bb2d1df2225d · 2017-02-22T19:00:00.000+05:30
diff --git a/installer/driverInstall.js b/installer/driverInstall.js
@@ -40,20 +40,19 @@ var install_node_ibm_db = function(file_url) {
             var ODBC_BINDINGS_V4 = 'build\/Release\/odbc_bindings.node.4.6.1';
             var ODBC_BINDINGS_V6 = 'build\/Release\/odbc_bindings.node.6.9.1';
 
-            //ERROR: NodeJs version < 0.12.x Support for node-ibm_db Windows has been discontinued.
-            if(Number(process.version.match(/^v(\d+\.\d+)/)[1]) < 0.12){
+            // Windows add-on binary for node.js v0.10.x has been discontinued.
+            if(Number(process.version.match(/^v(\d+\.\d+)/)[1]) == 0.10){
                 console.log('\nERROR: Found unsupported node.js version ' + process.version +
-                '\nnode-ibm_db is not supported for node.js version < 0.12.0 on Widnows.\n' +
-                'Please use the latest version of node.js.\n');
-
+                '\nnode-ibm_db do not have precompiled add-on file odbc_bindings.node for\n' +
+                'node.js v0.10.x on Widnows. Please use the latest version of node.js.\n');
                 process.exit(1);
             }
 
-            //WARNING: NodeJs version 0.12.x Support for node-ibm_db Windows has been depreciated.
+            // Windows add-on binary for node.js v0.12.x has been deprecated.
             if(Number(process.version.match(/^v(\d+\.\d+)/)[1]) == 0.12){
                 console.log('\nWARNING: Found node.js version ' + process.version +
-                '\nSupport for node-ibm_db on Windows for node.js version 0.12.x is deprecated and will be discontinued soon.\n' +
-                'Please use the latest version of node.js.\n');
+                '\nSupport for node-ibm_db on Windows for node.js version 0.12.x is deprecated\n' +
+                'and will be discontinued soon. Please use the latest version of node.js.\n');
             }
 
             /*
diff --git a/src/odbc_connection.cpp b/src/odbc_connection.cpp
@@ -317,7 +317,7 @@ void ODBCConnection::SetConnectionAttributes( ODBCConnection* conn )
     DEBUG_PRINTF("ODBCConnection::SetConnectionAttributes - timeOut = %i, systemNaming = %i\n",
                  timeOut, conn->systemNaming);
 
-    if(timeOut < 0 || timeOut > 32767)
+    if( timeOut > 32767 )
     {
         timeOut = DEFAULT_CONNECTION_TIMEOUT ;
         DEBUG_PRINTF("ODBCConnection::SetConnectionAttributes - Invalid connection timeout value changed to default.");
@@ -1675,17 +1675,26 @@ NAN_METHOD(ODBCConnection::SetIsolationLevel) {
 
   ODBCConnection* conn = Nan::ObjectWrap::Unwrap<ODBCConnection>(info.Holder());
 
-  OPT_INT_ARG(0, isolationLevel, SQL_TXN_READ_COMMITTED)
-
   Local<Value> objError;
-  SQLRETURN ret;
+  SQLRETURN ret = SQL_SUCCESS;
   bool error = false;
+  SQLUINTEGER isolationLevel = SQL_TXN_READ_COMMITTED;
+  
+  if (info.Length() <= 0) { 
+      isolationLevel = SQL_TXN_READ_COMMITTED;
+  }
+  else if (info[0]->IsInt32()) {
+      isolationLevel = info[0]->Int32Value();
+  }
+  else {
+      return Nan::ThrowTypeError("Argument #0 must be an integer.");
+  }
 
   //set the connection manual commits
   ret = SQLSetConnectAttr(
     conn->m_hDBC,
     SQL_ATTR_TXN_ISOLATION,
-    (SQLPOINTER) isolationLevel,
+    (SQLPOINTER)(intptr_t)isolationLevel,
     SQL_NTS);
 
   DEBUG_PRINTF("ODBCConnection::SetIsolationLevel isolationLevel=%i; ret=%d\n",
