Merge branch 'master' into nodev16-2

Author: not-night-but

README.md

@@ -9,7 +9,7 @@ npm install sqlanywhere
 ```
 #### Prerequisites
 This driver communicates with the native SQL Anywhere libraries, and thus requires
-native compilation. Native compilation is managed by [`node-gyp`](https://github.com/TooTallNate/node-gyp/). Please see that project for additional prerequisites including Python 2.7, and C/C++ tool chain.
+native compilation. Native compilation is managed by [`node-gyp`](https://github.com/TooTallNate/node-gyp/). Please see that project for additional prerequisites including Python and a C/C++ tool chain.
 
 The official version hosted on NPM includes precompiled libraries for Windows (64-bit).
 
@@ -24,6 +24,8 @@ Versions supported:
 <tr><td>1.0.23</td><td>10.x</td></tr>
 <tr><td>1.0.24<td><b>Only</b> 5.x through 10.x (support for 0.10, 0.12, and 4.x is dropped)</td></tr>
 <tr><td>1.0.25<td>5.x through 12.x</td></tr>
+<tr><td>1.0.26<td>6.x through 12.x</td></tr>
+<tr><td>1.0.27<td>6.x through 12.x</td></tr>
 </table>
 
 ## Getting Started

build.js

@@ -21,12 +21,14 @@ exec( "rm ./build/Release/sqlanywhere.node", function( error, out, err ) {
 		if( error ) {
 		    console.log( error, out );
 		    console.log( "Error when executing node-gyp configure" );
+                    console.log( "Make sure node-gyp is installed and in the PATH");
 		    process.exit( -1 );
 		}
 		var build = require('child_process').exec;
 		build( "node-gyp build", function( error, out ) {
 		    if( error ) {
-			console.log( "Error when executing node-gyp configure" );
+			console.log( "Error when executing node-gyp build" );
+                        console.log( "Make sure a C++ tool chain is installed and in the PATH");
 			process.exit( -1 );
 		    }
 		    db = require( "./lib/index" );
@@ -37,7 +39,7 @@ exec( "rm ./build/Release/sqlanywhere.node", function( error, out, err ) {
 		});
 	    });
 	} catch( err ) {
-	    console.log( "Error Building Binaries. Make sure node-gyp is installed and in the PATH")
+	    console.log( "Error Building Binaries. Make sure node-gyp is installed and in the PATH");
             throw new Error( "Could not build binaries" );
 	    process.exit( -1 );
 	}

src/h/sqlany_utils.h

@@ -138,11 +138,12 @@ class ExecuteData
     std::vector<sacapi_bool *> null_vals;
 };
 
-bool cleanAPI(); // Finalizes the API and frees up resources
-void getErrorMsg(a_sqlany_connection *conn, std::string &str);
-void getErrorMsg(int code, std::string &str);
-void throwError(a_sqlany_connection *conn);
-void throwError(int code);
+bool cleanAPI (); // Finalizes the API and frees up resources
+int  getError( a_sqlany_connection *conn, char *str, size_t len );
+void getErrorMsg( a_sqlany_connection *conn, std::string &str );
+void getErrorMsg( int code, std::string &str );
+void throwError( a_sqlany_connection *conn );   
+void throwError( int code );
 
 void callBack(std::string *str,
               Persistent<Function> &callback,

src/sqlanywhere.cpp

@@ -90,8 +90,11 @@ static bool fillResult(executeBaton *baton, Persistent<Value> &ResultSet)
 void executeWork(uv_work_t *req)
 /********************************/
 {
-    executeBaton *baton = static_cast<executeBaton *>(req->data);
-    scoped_lock lock(baton->obj->conn_mutex);
+    int rc = 0;
+    int sqlcode = 0;
+
+    executeBaton *baton = static_cast<executeBaton*>(req->data);
+    scoped_lock lock( baton->obj->conn_mutex );
 
     if (baton->obj->conn == NULL)
     {
@@ -112,17 +115,20 @@ void executeWork(uv_work_t *req)
         sqlany_stmt = baton->stmt_obj->sqlany_stmt;
     }
 
-    if (sqlany_stmt == NULL && baton->stmt.length() > 0)
-    {
-        sqlany_stmt = api.sqlany_prepare(baton->obj->conn,
-                                         baton->stmt.c_str());
-        if (sqlany_stmt == NULL)
-        {
-            baton->err = true;
-            getErrorMsg(baton->obj->conn, baton->error_msg);
-            return;
-        }
-        baton->stmt_obj->sqlany_stmt = sqlany_stmt;
+    if( sqlany_stmt == NULL && baton->stmt.length() > 0 ) {
+	sqlany_stmt = api.sqlany_prepare( baton->obj->conn,
+					  baton->stmt.c_str() );
+	if( sqlany_stmt == NULL ) {
+	    baton->err = true;
+	    getErrorMsg( baton->obj->conn, baton->error_msg );
+	    return;
+	}
+	baton->stmt_obj->sqlany_stmt = sqlany_stmt;
+
+    } else if( sqlany_stmt == NULL ) {
+	baton->err = true;
+	getErrorMsg( JS_ERR_INVALID_OBJECT, baton->error_msg );
+	return;
     }
     else if (sqlany_stmt == NULL)
     {
@@ -174,12 +180,16 @@ void executeWork(uv_work_t *req)
         return;
     }
 
-    if (!fetchResultSet(sqlany_stmt, baton->rows_affected, baton->colNames,
-                        baton->execData[0], baton->col_types))
-    {
-        baton->err = true;
-        getErrorMsg(baton->obj->conn, baton->error_msg);
-        return;
+    rc = fetchResultSet( sqlany_stmt, baton->rows_affected, baton->colNames,
+		    baton->execData[0], baton->col_types );
+
+    if( !rc ) {
+	sqlcode = getError( baton->obj->conn, NULL, 0 );
+	if( (sqlcode != 0) && (sqlcode != 100) ) {
+	    baton->err = true;
+	    getErrorMsg( baton->obj->conn, baton->error_msg );
+	    return;
+	}
     }
 }
 
@@ -315,8 +325,11 @@ NODE_API_FUNC(StmtObject::exec)
 void getMoreResultsWork(uv_work_t *req)
 /***************************************/
 {
-    executeBaton *baton = static_cast<executeBaton *>(req->data);
-    scoped_lock lock(baton->obj->conn_mutex);
+    int rc = 0;
+    int sqlcode = 0;
+
+    executeBaton *baton = static_cast<executeBaton*>(req->data);
+    scoped_lock lock( baton->obj->conn_mutex );
 
     if (baton->obj->conn == NULL)
     {
@@ -350,12 +363,16 @@ void getMoreResultsWork(uv_work_t *req)
     }
 
     baton->execData[0]->clear();
-    if (!fetchResultSet(stmt, baton->rows_affected, baton->colNames,
-                        baton->execData[0], baton->col_types))
-    {
-        baton->err = true;
-        getErrorMsg(baton->obj->conn, baton->error_msg);
-        return;
+    rc = fetchResultSet( stmt, baton->rows_affected, baton->colNames,
+		    baton->execData[0], baton->col_types );
+
+    if( !rc ) {
+	sqlcode = getError( baton->obj->conn, NULL, 0 );
+	if( (sqlcode != 0 ) && (sqlcode != 100) ) {
+	    baton->err = true;
+	    getErrorMsg( baton->obj->conn, baton->error_msg );
+	    return;
+	}
     }
 }
 

src/utils.cpp

@@ -8,7 +8,15 @@
 using namespace v8;
 using namespace node;
 
-void getErrorMsg(int code, std::string &str)
+int getError( a_sqlany_connection *conn, char *str, size_t len )
+/**************************************************************/
+{
+    int sqlcode;
+    sqlcode = api.sqlany_error( conn, str, len );
+    return sqlcode;
+}
+
+void getErrorMsg( int code, std::string &str )
 /********************************************/
 {
 	std::ostringstream message;
@@ -54,15 +62,15 @@ void getErrorMsg(int code, std::string &str)
 void getErrorMsg(a_sqlany_connection *conn, std::string &str)
 /*************************************************************/
 {
-	char buffer[SACAPI_ERROR_SIZE];
-	int rc;
-	rc = api.sqlany_error(conn, buffer, sizeof(buffer));
-	std::ostringstream message;
-	message << "Code: ";
-	message << rc;
-	message << " Msg: ";
-	message << buffer;
-	str = message.str();
+    char buffer[SACAPI_ERROR_SIZE];
+    int sqlcode;
+    sqlcode = getError( conn, buffer, sizeof(buffer) );
+    std::ostringstream message;
+    message << "Code: ";
+    message << sqlcode;
+    message << " Msg: ";
+    message << buffer;
+    str = message.str();
 }
 
 void throwError(a_sqlany_connection *conn)