Update driver for node12 support

DanCummins-SAP · DanCummins-SAP · commit b82fdbd017b0 · 2021-04-19T17:28:14.000-04:00
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # node-sqlanywhere
-This is a Node.js driver written for [SAP SQL Anywhere](http://www.sap.com/pc/tech/database/software/sybase-sql-anywhere/index.html).
+This is a Node.js driver written for [SAP SQL Anywhere](https://www.sap.com/products/sql-anywhere.html).
 
 [![NPM](https://nodei.co/npm/sqlanywhere.png?compact=true)](https://nodei.co/npm/sqlanywhere/)
 
@@ -22,7 +22,8 @@ Versions supported:
 <tr><td>1.0.19</td><td>8.x</td></tr>
 <tr><td>1.0.22</td><td>9.x</td></tr>
 <tr><td>1.0.23</td><td>10.x</td></tr>
-<tr><td>1.0.24</th><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.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>
 </table>
 
 ## Getting Started
diff --git a/build.js b/build.js
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 var db = null;
 var exec = require('child_process').exec;
diff --git a/examples/app1.js b/examples/app1.js
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 // This sample code is provided AS IS, without warranty or liability of any kind.
 //
diff --git a/examples/readme.txt b/examples/readme.txt
@@ -1,4 +1,4 @@
 # ***************************************************************************
-# Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+# Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 # ***************************************************************************
 These examples are intended to be used with the SQL Anywhere node.js driver.
diff --git a/lib/index.js b/lib/index.js
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 var db = null;
 var driver_file = "sqlanywhere"
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "SQL ANYWHERE",
   "name": "sqlanywhere",
   "description": "SQL Anywhere JavaScript Driver.",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "repository": {
     "url": "https://github.com/sqlanywhere/node-sqlanywhere"
   },
diff --git a/src/h/connection.h b/src/h/connection.h
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 using namespace v8;
 using namespace node;
diff --git a/src/h/errors.h b/src/h/errors.h
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 #define JS_ERR_INVALID_OBJECT				-2001
 #define JS_ERR_INVALID_ARGUMENTS			-2002
diff --git a/src/h/nodever_cover.h b/src/h/nodever_cover.h
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 #include <node_version.h>
 
diff --git a/src/h/sacapi.h b/src/h/sacapi.h
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/h/sacapidll.h b/src/h/sacapidll.h
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/h/sqlany_utils.h b/src/h/sqlany_utils.h
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 #include <iostream>
 #include <string>
@@ -15,6 +15,12 @@
 #pragma warning (disable : 4800)
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 
+#if defined( _MSC_VER )
+// According to the github page for node.js, some warnings generated by
+// Visual Studio are "overzealous". They should be fixed in VS 2017 15.6.
+// https://github.com/nodejs/node/issues/17114
+#pragma warning( disable : 4251 )
+#endif
 #include "node.h"
 #include "v8.h"
 #include "node_buffer.h"
@@ -157,8 +163,8 @@ void callBack( std::string *		str,
 #endif
 
 bool getBindParameters( std::vector<ExecuteData *>		&execData
-            , Isolate *                 isolate
-			, Local<Value>				arg
+                        , Isolate *                 isolate
+                        , Local<Value>              arg
 			, std::vector<a_sqlany_bind_param> 	&params
 			, unsigned				&num_rows
     );
diff --git a/src/h/stmt.h b/src/h/stmt.h
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 using namespace v8;
 
diff --git a/src/sacapidll.cpp b/src/sacapidll.cpp
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/sqlanywhere.cpp b/src/sqlanywhere.cpp
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 #include "nodever_cover.h"
 #include "sqlany_utils.h"
@@ -225,7 +225,7 @@ NODE_API_FUNC( StmtObject::exec )
     baton->callback_required = callback_required;
 
     if( bind_required ) {
-	if( !getBindParameters( baton->execData, isolate, args[0], baton->params,
+        if( !getBindParameters( baton->execData, isolate, args[0], baton->params,
 				baton->num_rows ) ) {
 	    delete baton;
 	    std::string error_msg;
@@ -454,7 +454,7 @@ NODE_API_FUNC( Connection::exec )
 	args.GetReturnValue().SetUndefined();
 	return;
     }
-
+    
 #if NODE_MAJOR_VERSION >= 12
     String::Utf8Value param0( isolate, (args[0]->ToString(context)).ToLocalChecked() );
 #else
@@ -469,7 +469,7 @@ NODE_API_FUNC( Connection::exec )
     baton->stmt = std::string(*param0);
 
     if( bind_required ) {
-	if( !getBindParameters( baton->execData, isolate, args[1], baton->params,
+        if( !getBindParameters( baton->execData, isolate, args[1], baton->params,
 				baton->num_rows ) ) {
 	    delete baton;
 	    std::string error_msg;
@@ -646,13 +646,13 @@ NODE_API_FUNC( Connection::prepare )
 	p_stmt.Reset();
 	return;
     }
-
+    
 #if NODE_MAJOR_VERSION >= 12
-    String::Utf8Value param0( isolate, (args[0]->ToString(context)).ToLocalChecked());
+    String::Utf8Value param0( isolate, (args[0]->ToString(context)).ToLocalChecked() );
 #else
     String::Utf8Value param0( (args[0]->ToString(context)).ToLocalChecked() );
 #endif
-    
+
     prepareBaton *baton = new prepareBaton();
     baton->obj = obj;
     baton->callback_required = callback_required;    
@@ -867,39 +867,39 @@ NODE_API_FUNC( Connection::connect )
     baton->sqlca_connection = sqlca_connection;
     
     if( sqlca_connection ) {
-	baton->sqlca = (void *)(long)(args[0]->NumberValue(context)).FromJust();
+        baton->sqlca = (void *)(long)(args[0]->NumberValue(context)).FromJust();
 	
     } else {
 	Local<String> localArg = Local<String>::New( isolate, obj->_arg );
 	if( localArg->Length() > 0 ) {
 #if NODE_MAJOR_VERSION >= 12
-        String::Utf8Value param0( isolate, localArg );
+            String::Utf8Value param0( isolate, localArg );
 #else
-	    String::Utf8Value param0( localArg );
+            String::Utf8Value param0( localArg );
 #endif
 	    baton->conn_string = std::string(*param0);
 	} else {
 	    baton->conn_string = std::string();
 	}
 	if( arg_is_string ) {
 #if NODE_MAJOR_VERSION >= 12
-        String::Utf8Value param0( isolate, (args[0]->ToString(context)).ToLocalChecked());
+            String::Utf8Value param0( isolate, (args[0]->ToString(context)).ToLocalChecked());
 #else
-        String::Utf8Value param0( (args[0]->ToString(context)).ToLocalChecked() );
+            String::Utf8Value param0( (args[0]->ToString(context)).ToLocalChecked() );
 #endif
 	    baton->conn_string.append( ";" );
 	    baton->conn_string.append(*param0);
 	} else if( arg_is_object ) {
 	    Persistent<String> arg_string;
-	    HashToString( isolate, args[0]->ToObject(isolate), arg_string );
+            HashToString( isolate, args[0]->ToObject(isolate), arg_string );
 	    Local<String> local_arg_string = 
 		Local<String>::New( isolate, arg_string );
 #if NODE_MAJOR_VERSION >= 12
-        String::Utf8Value param0( isolate, local_arg_string );
+            String::Utf8Value param0( isolate, local_arg_string );
 #else
-	    String::Utf8Value param0( local_arg_string );
+            String::Utf8Value param0( local_arg_string );
 #endif
-	    baton->conn_string.append( ";" );
+            baton->conn_string.append( ";" );
 	    baton->conn_string.append(*param0);
 	    arg_string.Reset();
 	}
diff --git a/src/utils.cpp b/src/utils.cpp
