Version 1.0.23: Add node.js v10 support

gperrow-SAP · gperrow-SAP · commit 8e8c93317ee9 · 2018-05-29T23:16:09.000-04:00
Change-Id: I98489c9b962e25bcc5ec677e860edcadbca5746e
diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@ Versions supported:
 <tr><td>1.0.9</td><td>6.x, 7.x</td></tr>
 <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>
 </table>
 
 ## Getting Started
diff --git a/build.js b/build.js
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+# Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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.22",
+  "version": "1.0.23",
   "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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 #include <iostream>
 #include <string>
diff --git a/src/h/stmt.h b/src/h/stmt.h
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 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) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 #include "nodever_cover.h"
 #include "sqlany_utils.h"
diff --git a/src/sqlanywhere_v0_10.cpp b/src/sqlanywhere_v0_10.cpp
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 #include "nodever_cover.h"
 
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 #include "nodever_cover.h"
 #include "sqlany_utils.h"
@@ -114,7 +114,11 @@ void callBack( std::string *		str,
 	int argc = 2;
 	Local<Value> argv[2] = { Err, Result };
 	
+#if v012
 	TryCatch try_catch;
+#else
+        TryCatch try_catch( isolate );
+#endif
 	local_callback->Call( isolate->GetCurrentContext()->Global(), argc, argv );
 	if( try_catch.HasCaught()) {
 	    node::FatalException( isolate, try_catch );
@@ -168,7 +172,11 @@ void callBack( std::string *		str,
 	int argc = 2;
 	Local<Value> argv[2] = { Err,  Result };
 	
+#if v012
 	TryCatch try_catch;
+#else
+        TryCatch try_catch( isolate );
+#endif
 	callback->Call( isolate->GetCurrentContext()->Global(), argc, argv );
 	if( try_catch.HasCaught()) {
 	    node::FatalException( isolate, try_catch );
@@ -782,7 +790,15 @@ void StmtObject::CreateNewInstance( const FunctionCallbackInfo<Value> &	args,
     const unsigned argc = 1;
     Handle<Value> argv[argc] = { args[0] };
     Local<Function>cons = Local<Function>::New( isolate, constructor );
+#if NODE_MAJOR_VERSION >= 10
+    Local<Context> env = isolate->GetCurrentContext();
+    MaybeLocal<Object> mlObj = cons->NewInstance( env, argc, argv );
+    Local<Object> instance = mlObj.ToLocalChecked();
+
+    obj.Reset( isolate, instance );
+#else
     obj.Reset( isolate, cons->NewInstance( argc, argv ) );
+#endif
 }
 
 void StmtObject::cleanup( void )
@@ -990,7 +1006,14 @@ void Connection::New( const FunctionCallbackInfo<Value> &args )
 	const int argc = 1;
 	Local<Value> argv[argc] = { args[0] };
 	Local<Function> cons = Local<Function>::New( isolate, constructor );
+#if NODE_MAJOR_VERSION >= 10
+        Local<Context> env = isolate->GetCurrentContext();
+        MaybeLocal<Object> mlObj = cons->NewInstance( env, argc, argv );
+        const Local<Object> obj = mlObj.ToLocalChecked();
+	args.GetReturnValue().Set( obj );
+#else
 	args.GetReturnValue().Set( cons->NewInstance( argc, argv ) );
+#endif
     }
 }
 
@@ -1002,7 +1025,13 @@ void Connection::NewInstance( const FunctionCallbackInfo<Value> &args )
     const unsigned argc = 1;
     Handle<Value> argv[argc] = { args[0] };
     Local<Function> cons = Local<Function>::New( isolate, constructor );
+#if NODE_MAJOR_VERSION >= 10
+    Local<Context> env = isolate->GetCurrentContext();
+    MaybeLocal<Object> mlObj = cons->NewInstance( env, argc, argv );
+    Local<Object> instance = mlObj.ToLocalChecked();
+#else
     Local<Object> instance = cons->NewInstance( argc, argv );
+#endif
     args.GetReturnValue().Set( instance );
 }
 
diff --git a/src/utils_v0_10.cpp b/src/utils_v0_10.cpp
@@ -1,5 +1,5 @@
 // ***************************************************************************
-// Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
+// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
 // ***************************************************************************
 #include "nodever_cover.h"
 
