[QTS: 826141] Node.js silently ignored fetch errors

Node.js could ignore fetch errors such as SQLE_OVERFLOW_ERROR.  This has been fixed.

Author: DanCummins-SAP

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,7 @@ 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>5.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 );
 	}

package.json

@@ -2,7 +2,7 @@
   "author": "SQL ANYWHERE",
   "name": "sqlanywhere",
   "description": "SQL Anywhere JavaScript Driver.",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "repository": {
     "url": "https://github.com/sqlanywhere/node-sqlanywhere"
   },

src/h/sqlany_utils.h

@@ -133,6 +133,7 @@ class ExecuteData {
 };
 
 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 );   

src/sqlanywhere.cpp

@@ -85,6 +85,9 @@ static bool fillResult( executeBaton *baton, Persistent<Value> &ResultSet )
 void executeWork( uv_work_t *req )
 /********************************/
 {
+    int rc = 0;
+    int sqlcode = 0;
+
     executeBaton *baton = static_cast<executeBaton*>(req->data);
     scoped_lock lock( baton->obj->conn_mutex );
 
@@ -112,7 +115,7 @@ void executeWork( uv_work_t *req )
 	    return;
 	}
 	baton->stmt_obj->sqlany_stmt = sqlany_stmt;
-	
+
     } else if( sqlany_stmt == NULL ) {
 	baton->err = true;
 	getErrorMsg( JS_ERR_INVALID_OBJECT, baton->error_msg );
@@ -155,12 +158,17 @@ void executeWork( uv_work_t *req )
 	getErrorMsg( baton->obj->conn, baton->error_msg );
 	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;
+	}
     }
 }
 
@@ -283,6 +291,9 @@ NODE_API_FUNC( StmtObject::exec )
 void getMoreResultsWork( uv_work_t *req )
 /***************************************/
 {
+    int rc = 0;
+    int sqlcode = 0;
+
     executeBaton *baton = static_cast<executeBaton*>(req->data);
     scoped_lock lock( baton->obj->conn_mutex );
 
@@ -314,11 +325,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;
+	}
     }
 }
 
@@ -563,7 +579,6 @@ void Connection::prepareWork( uv_work_t *req )
 
     baton->obj->sqlany_stmt = api.sqlany_prepare( baton->obj->connection->conn,
 						  baton->stmt.c_str() );
-    
     if( baton->obj->sqlany_stmt == NULL ) {
 	baton->err = true;
 	getErrorMsg( baton->obj->connection->conn, baton->error_msg );

src/utils.cpp

@@ -10,6 +10,14 @@
 using namespace v8;
 using namespace node;
 
+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 )
 /********************************************/
 {
@@ -57,11 +65,11 @@ void getErrorMsg( a_sqlany_connection *conn, std::string &str )
 /*************************************************************/
 {
     char buffer[SACAPI_ERROR_SIZE];
-    int rc;
-    rc = api.sqlany_error( conn, buffer, sizeof(buffer) );
+    int sqlcode;
+    sqlcode = getError( conn, buffer, sizeof(buffer) );
     std::ostringstream message;
     message << "Code: ";
-    message << rc;
+    message << sqlcode;
     message << " Msg: ";
     message << buffer;
     str = message.str();
@@ -568,13 +576,16 @@ bool fetchResultSet( a_sqlany_stmt *			sqlany_stmt,
 	}
 
 	int count_string = 0, count_num = 0, count_int = 0;
-	while( api.sqlany_fetch_next( sqlany_stmt ) ) {
+	while( true ) {
+
+	    if( !api.sqlany_fetch_next( sqlany_stmt ) ) {
+		return false;
+	    }
 
 	    for( int i = 0; i < num_cols; i++ ) {
 
 		if( !api.sqlany_get_column( sqlany_stmt, i, &value ) ) {
 		    return false;
-		    break;
 		}
 
 		if( *(value.is_null) ) {