Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to work with Node v12 #36

Closed
wants to merge 3 commits into from
Closed

Migrate to work with Node v12 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e0bafd
Add node v12 compatibility
pkeuter Oct 31, 2019
3b4e0d1
Add gitignore file
pkeuter Oct 31, 2019
a2089b6
Uncomment wrongly commented code
pkeuter Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
build
18 changes: 18 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "SQL ANYWHERE",
"name": "sqlanywhere",
"description": "SQL Anywhere JavaScript Driver.",
"version": "1.0.24",
"version": "2.0.0",
"repository": {
"url": "https://github.com/sqlanywhere/node-sqlanywhere"
},
Expand All @@ -15,6 +15,6 @@
},
"dependencies": {
"help": "^3.0.2",
"nan": "2.11.1"
"nan": "^2.14.0"
}
}
2 changes: 1 addition & 1 deletion src/h/sqlany_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ void callBack( std::string * str,
#endif

bool getBindParameters( std::vector<ExecuteData *> &execData
, Handle<Value> arg
, Local<Value> arg
, std::vector<a_sqlany_bind_param> &params
, unsigned &num_rows
);
Expand Down
16 changes: 9 additions & 7 deletions src/sqlanywhere.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// ***************************************************************************
#include "nodever_cover.h"
#include "sqlany_utils.h"
#include "nan.h"

#if !v010

Expand Down Expand Up @@ -454,7 +455,7 @@ NODE_API_FUNC( Connection::exec )
return;
}

String::Utf8Value param0( args[0]->ToString() );
Nan::Utf8String param0( args[0]->ToString(isolate) );

executeBaton *baton = new executeBaton();
baton->obj = obj;
Expand Down Expand Up @@ -641,7 +642,7 @@ NODE_API_FUNC( Connection::prepare )
return;
}

String::Utf8Value param0( args[0]->ToString() );
Nan::Utf8String param0( args[0]->ToString(isolate) );

prepareBaton *baton = new prepareBaton();
baton->obj = obj;
Expand Down Expand Up @@ -797,6 +798,7 @@ NODE_API_FUNC( Connection::connect )
/**********************************/
{
Isolate *isolate = args.GetIsolate();
Local<Context> context = isolate->GetCurrentContext();
HandleScope scope( isolate );
int num_args = args.Length();
Connection *obj;
Expand Down Expand Up @@ -856,26 +858,26 @@ NODE_API_FUNC( Connection::connect )
baton->sqlca_connection = sqlca_connection;

if( sqlca_connection ) {
baton->sqlca = (void *)(long)args[0]->NumberValue();
baton->sqlca = (void *)(long)args[0]->NumberValue(context).ToChecked();

} else {
Local<String> localArg = Local<String>::New( isolate, obj->_arg );
if( localArg->Length() > 0 ) {
String::Utf8Value param0( localArg );
Nan::Utf8String param0( localArg );
baton->conn_string = std::string(*param0);
} else {
baton->conn_string = std::string();
}
if( arg_is_string ) {
String::Utf8Value param0( args[0]->ToString() );
Nan::Utf8String param0( args[0]->ToString(isolate) );
baton->conn_string.append( ";" );
baton->conn_string.append(*param0);
} else if( arg_is_object ) {
Persistent<String> arg_string;
HashToString( args[0]->ToObject(), arg_string );
HashToString( args[0]->ToObject(context).ToLocalChecked(), arg_string );
Local<String> local_arg_string =
Local<String>::New( isolate, arg_string );
String::Utf8Value param0( local_arg_string );
Nan::Utf8String param0( local_arg_string );
baton->conn_string.append( ";" );
baton->conn_string.append(*param0);
arg_string.Reset();
Expand Down
Loading