fix: made to work with node 14+#43

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

Open
pkeuter wants to merge 1 commit into
base:master
Choose a base branch
from
Open

fix: made to work with node 14+ #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
build
node_modules
42 changes: 42 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.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,19 @@
"author": "SQL ANYWHERE",
"name": "sqlanywhere",
"description": "SQL Anywhere JavaScript Driver.",
"version": "1.0.25",
"version": "2.0.3",
"repository": {
"url": "https://github.com/sqlanywhere/node-sqlanywhere"
},
"main": "./lib/index",
"engines": {
"node": ">=0.10"
"node": ">=14.0.0"
},
"scripts": {
"install": "node build.js"
},
"dependencies": {
"help": "^3.0.2",
"nan": "2.14.2"
"nan": "^2.15.0"
}
}
84 changes: 38 additions & 46 deletions src/h/connection.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,30 @@ using namespace node;
*/
class Connection : public ObjectWrap
{
public:
public:
/// @internal
#if v010
static void Init();
#else
static void Init( Isolate * );
#endif
static void Init(Isolate *);

/// @internal
static NODE_API_FUNC(NewInstance);
private:
static NODE_API_FUNC(NewInstance);

private:
/// @internal
#if v010
Connection( const Arguments &args );
#else
Connection( const FunctionCallbackInfo<Value> &args );
#endif
Connection(const FunctionCallbackInfo<Value> &args);
/// @internal
~Connection();

/// @internal
static Persistent<Function> constructor;

/// @internal
static void noParamAfter(uv_work_t *req);
static void noParamAfter(uv_work_t *req);
/// @internal
static void connectAfter(uv_work_t *req);
static void connectAfter(uv_work_t *req);
/// @internal
static void connectWork(uv_work_t *req);
static void connectWork(uv_work_t *req);
/// @internal
static NODE_API_FUNC(New);
static NODE_API_FUNC(New);

/// Connect using an existing connection.
//
Expand DownExpand Up@@ -202,7 +194,7 @@ class Connection : public ObjectWrap
//
// @internal
///

/** Creates a new connection.
*
* This method creates a new connection using either a connection string
Expand DownExpand Up@@ -242,7 +234,7 @@ class Connection : public ObjectWrap
*
* @see Connection::disconnect
*/
static NODE_API_FUNC(connect);
static NODE_API_FUNC(connect);

/** Closes the current connection.
*
Expand DownExpand Up@@ -275,11 +267,11 @@ class Connection : public ObjectWrap
*
* @see Connection::connect
*/
static NODE_API_FUNC(disconnect);
static NODE_API_FUNC(disconnect);

/// @internal
static void disconnectWork(uv_work_t *req);
static void disconnectWork(uv_work_t *req);

/** Executes the specified SQL statement.
*
* This method takes in a SQL statement and an optional array of bind
Expand DownExpand Up@@ -335,8 +327,8 @@ class Connection : public ObjectWrap
* @return If no callback is specified, the result is returned.
*
*/
static NODE_API_FUNC(exec);
static NODE_API_FUNC(exec);

/** Prepares the specified SQL statement.
*
* This method prepares a SQL statement and returns a Statement object
Expand DownExpand Up@@ -373,13 +365,13 @@ class Connection : public ObjectWrap
* @return If no callback is specified, a Statement object is returned.
*
*/
static NODE_API_FUNC(prepare);
static NODE_API_FUNC(prepare);

/// @internal
static void prepareAfter(uv_work_t *req);
static void prepareAfter(uv_work_t *req);
/// @internal
static void prepareWork(uv_work_t *req);
static void prepareWork(uv_work_t *req);

/** Performs a commit on the connection.
*
* This method performs a commit on the connection.
Expand DownExpand Up@@ -421,11 +413,11 @@ class Connection : public ObjectWrap
* @param callback The optional callback function. ( type: Function )
*
*/
static NODE_API_FUNC(commit);
static NODE_API_FUNC(commit);

/// @internal
static void commitWork(uv_work_t *req);
static void commitWork(uv_work_t *req);

/** Performs a rollback on the connection.
*
* This method performs a rollback on the connection.
Expand DownExpand Up@@ -465,10 +457,10 @@ class Connection : public ObjectWrap
* @param callback The optional callback function. ( type: Function )
*
*/
static NODE_API_FUNC(rollback);
static NODE_API_FUNC(rollback);

/// @internal
static void rollbackWork(uv_work_t *req);
static void rollbackWork(uv_work_t *req);

/** Indicates whether the connection is connected.
*
Expand All@@ -492,24 +484,24 @@ class Connection : public ObjectWrap
* @return true if the connection is connected, false if not.
*
*/
static NODE_API_FUNC(connected);
static NODE_API_FUNC(connected);

public:
public:
/// @internal
a_sqlany_connection*conn;
a_sqlany_connection*conn;
/// @internal
unsigned intmax_api_ver;
unsigned intmax_api_ver;
/// @internal
bool sqlca_connection;
bool sqlca_connection;
/// @internal
uv_mutex_t conn_mutex;
uv_mutex_t conn_mutex;
/// @internal
Persistent<String>_arg;
Persistent<String>_arg;
/// @internal
std::vector<void*> statements;
std::vector<void *> statements;

/// @internal
void removeStmt(class StmtObject *stmt);
void removeStmt(class StmtObject *stmt);
/// @internal
void cleanupStmts(void);
void cleanupStmts(void);
};
18 changes: 9 additions & 9 deletions src/h/errors.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// ***************************************************************************
// 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
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009
#define JS_ERR_INVALID_OBJECT-2001
#define JS_ERR_INVALID_ARGUMENTS-2002
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009
17 changes: 1 addition & 16 deletions src/h/nodever_cover.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,19 +3,4 @@
// ***************************************************************************
#include <node_version.h>

#if NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 10
#define v010 1
#define v012 0
#elif NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 12
#define v010 0
#define v012 1
#else
#define v010 0
#define v012 0
#endif

#if v010
#define NODE_API_FUNC( name ) Handle<Value> name ( const Arguments &args )
#else
#define NODE_API_FUNC( name ) void name ( const FunctionCallbackInfo<Value> &args )
#endif
#define NODE_API_FUNC(name) void name(const FunctionCallbackInfo<Value> &args)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: made to work with node 14+#43

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

 Open

pkeuter
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


fix: made to work with node 14+
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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 numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
build
node_modules

42 changes: 42 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.


6 changes: 3 additions & 3 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,19 @@
 "author": "SQL ANYWHERE",
 "name": "sqlanywhere",
 "description": "SQL Anywhere JavaScript Driver.",
 "version": "1.0.25",
 "version": "2.0.3",
 "repository": {
 "url": "https://github.com/sqlanywhere/node-sqlanywhere"
 },
 "main": "./lib/index",
 "engines": {
 "node": ">=0.10"
 "node": ">=14.0.0"
 },
 "scripts": {
 "install": "node build.js"
 },
 "dependencies": {
 "help": "^3.0.2",
 "nan": "2.14.2"
 "nan": "^2.15.0"
 }
}

84 changes: 38 additions & 46 deletions
src/h/connection.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,30 @@ using namespace node;
 */
class Connection : public ObjectWrap
{
public:
public:
 /// @internal
#if v010
 static void Init();
#else
 static void Init( Isolate * );
#endif
 static void Init(Isolate *);

 /// @internal
 static NODE_API_FUNC(NewInstance);
private:
 static NODE_API_FUNC(NewInstance);

private:
 /// @internal
#if v010
 Connection( const Arguments &args );
#else
 Connection( const FunctionCallbackInfo<Value> &args );
#endif
 Connection(const FunctionCallbackInfo<Value> &args);
 /// @internal
 ~Connection();

 /// @internal
 static Persistent<Function> constructor;

 /// @internal
 static void noParamAfter(uv_work_t *req);
 static void noParamAfter(uv_work_t *req);
 /// @internal
 static void connectAfter(uv_work_t *req);
 static void connectAfter(uv_work_t *req);
 /// @internal
 static void connectWork(uv_work_t *req);
 static void connectWork(uv_work_t *req);
 /// @internal
 static NODE_API_FUNC(New);
 static NODE_API_FUNC(New);

 /// Connect using an existing connection.
 //
Expand DownExpand Up@@ -202,7 +194,7 @@ class Connection : public ObjectWrap
 //
 // @internal
 ///

 /** Creates a new connection.
 *
 * This method creates a new connection using either a connection string
Expand DownExpand Up@@ -242,7 +234,7 @@ class Connection : public ObjectWrap
 *
 * @see Connection::disconnect
 */
 static NODE_API_FUNC(connect);
 static NODE_API_FUNC(connect);

 /** Closes the current connection.
 *
Expand DownExpand Up@@ -275,11 +267,11 @@ class Connection : public ObjectWrap
 *
 * @see Connection::connect
 */
 static NODE_API_FUNC(disconnect);
 static NODE_API_FUNC(disconnect);

 /// @internal
 static void disconnectWork(uv_work_t *req);
 static void disconnectWork(uv_work_t *req);

 /** Executes the specified SQL statement.
 *
 * This method takes in a SQL statement and an optional array of bind
Expand DownExpand Up@@ -335,8 +327,8 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, the result is returned.
 *
 */
 static NODE_API_FUNC(exec);
 static NODE_API_FUNC(exec);

 /** Prepares the specified SQL statement.
 *
 * This method prepares a SQL statement and returns a Statement object
Expand DownExpand Up@@ -373,13 +365,13 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, a Statement object is returned.
 *
 */
 static NODE_API_FUNC(prepare);
 static NODE_API_FUNC(prepare);

 /// @internal
 static void prepareAfter(uv_work_t *req);
 static void prepareAfter(uv_work_t *req);
 /// @internal
 static void prepareWork(uv_work_t *req);
 static void prepareWork(uv_work_t *req);

 /** Performs a commit on the connection.
 *
 * This method performs a commit on the connection.
Expand DownExpand Up@@ -421,11 +413,11 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(commit);
 static NODE_API_FUNC(commit);

 /// @internal
 static void commitWork(uv_work_t *req);
 static void commitWork(uv_work_t *req);

 /** Performs a rollback on the connection.
 *
 * This method performs a rollback on the connection.
Expand DownExpand Up@@ -465,10 +457,10 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(rollback);
 static NODE_API_FUNC(rollback);

 /// @internal
 static void rollbackWork(uv_work_t *req);
 static void rollbackWork(uv_work_t *req);

 /** Indicates whether the connection is connected.
 *
Expand All@@ -492,24 +484,24 @@ class Connection : public ObjectWrap
 * @return true if the connection is connected, false if not.
 *
 */
 static NODE_API_FUNC(connected);
 static NODE_API_FUNC(connected);

public:
public:
 /// @internal
 a_sqlany_connection*conn;
 a_sqlany_connection*conn;
 /// @internal
 unsigned intmax_api_ver;
 unsigned intmax_api_ver;
 /// @internal
 bool sqlca_connection;
 bool sqlca_connection;
 /// @internal
 uv_mutex_t conn_mutex;
 uv_mutex_t conn_mutex;
 /// @internal
 Persistent<String>_arg;
 Persistent<String>_arg;
 /// @internal
 std::vector<void*>	statements;
 std::vector<void *> statements;

 /// @internal
 void removeStmt(class StmtObject *stmt);
 void removeStmt(class StmtObject *stmt);
 /// @internal
 void cleanupStmts(void);
 void cleanupStmts(void);
};

18 changes: 9 additions & 9 deletions
src/h/errors.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// ***************************************************************************
// 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
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009
#define JS_ERR_INVALID_OBJECT-2001
#define JS_ERR_INVALID_ARGUMENTS-2002
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009

17 changes: 1 addition & 16 deletions
src/h/nodever_cover.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,19 +3,4 @@
// ***************************************************************************
#include <node_version.h>

#if NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 10
#define v010	1
#define v012	0
#elif NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 12
#define v010	0
#define v012	1
#else
#define v010	0
#define v012	0
#endif

#if v010
#define NODE_API_FUNC( name ) Handle<Value> name ( const Arguments &args )
#else
#define NODE_API_FUNC( name ) void name ( const FunctionCallbackInfo<Value> &args )
#endif
#define NODE_API_FUNC(name) void name(const FunctionCallbackInfo<Value> &args)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: made to work with node 14+#43

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

 Open

pkeuter
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


fix: made to work with node 14+
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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 numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
build
node_modules

42 changes: 42 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.


6 changes: 3 additions & 3 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,19 @@
 "author": "SQL ANYWHERE",
 "name": "sqlanywhere",
 "description": "SQL Anywhere JavaScript Driver.",
 "version": "1.0.25",
 "version": "2.0.3",
 "repository": {
 "url": "https://github.com/sqlanywhere/node-sqlanywhere"
 },
 "main": "./lib/index",
 "engines": {
 "node": ">=0.10"
 "node": ">=14.0.0"
 },
 "scripts": {
 "install": "node build.js"
 },
 "dependencies": {
 "help": "^3.0.2",
 "nan": "2.14.2"
 "nan": "^2.15.0"
 }
}

84 changes: 38 additions & 46 deletions
src/h/connection.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,30 @@ using namespace node;
 */
class Connection : public ObjectWrap
{
public:
public:
 /// @internal
#if v010
 static void Init();
#else
 static void Init( Isolate * );
#endif
 static void Init(Isolate *);

 /// @internal
 static NODE_API_FUNC(NewInstance);
private:
 static NODE_API_FUNC(NewInstance);

private:
 /// @internal
#if v010
 Connection( const Arguments &args );
#else
 Connection( const FunctionCallbackInfo<Value> &args );
#endif
 Connection(const FunctionCallbackInfo<Value> &args);
 /// @internal
 ~Connection();

 /// @internal
 static Persistent<Function> constructor;

 /// @internal
 static void noParamAfter(uv_work_t *req);
 static void noParamAfter(uv_work_t *req);
 /// @internal
 static void connectAfter(uv_work_t *req);
 static void connectAfter(uv_work_t *req);
 /// @internal
 static void connectWork(uv_work_t *req);
 static void connectWork(uv_work_t *req);
 /// @internal
 static NODE_API_FUNC(New);
 static NODE_API_FUNC(New);

 /// Connect using an existing connection.
 //
Expand DownExpand Up@@ -202,7 +194,7 @@ class Connection : public ObjectWrap
 //
 // @internal
 ///

 /** Creates a new connection.
 *
 * This method creates a new connection using either a connection string
Expand DownExpand Up@@ -242,7 +234,7 @@ class Connection : public ObjectWrap
 *
 * @see Connection::disconnect
 */
 static NODE_API_FUNC(connect);
 static NODE_API_FUNC(connect);

 /** Closes the current connection.
 *
Expand DownExpand Up@@ -275,11 +267,11 @@ class Connection : public ObjectWrap
 *
 * @see Connection::connect
 */
 static NODE_API_FUNC(disconnect);
 static NODE_API_FUNC(disconnect);

 /// @internal
 static void disconnectWork(uv_work_t *req);
 static void disconnectWork(uv_work_t *req);

 /** Executes the specified SQL statement.
 *
 * This method takes in a SQL statement and an optional array of bind
Expand DownExpand Up@@ -335,8 +327,8 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, the result is returned.
 *
 */
 static NODE_API_FUNC(exec);
 static NODE_API_FUNC(exec);

 /** Prepares the specified SQL statement.
 *
 * This method prepares a SQL statement and returns a Statement object
Expand DownExpand Up@@ -373,13 +365,13 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, a Statement object is returned.
 *
 */
 static NODE_API_FUNC(prepare);
 static NODE_API_FUNC(prepare);

 /// @internal
 static void prepareAfter(uv_work_t *req);
 static void prepareAfter(uv_work_t *req);
 /// @internal
 static void prepareWork(uv_work_t *req);
 static void prepareWork(uv_work_t *req);

 /** Performs a commit on the connection.
 *
 * This method performs a commit on the connection.
Expand DownExpand Up@@ -421,11 +413,11 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(commit);
 static NODE_API_FUNC(commit);

 /// @internal
 static void commitWork(uv_work_t *req);
 static void commitWork(uv_work_t *req);

 /** Performs a rollback on the connection.
 *
 * This method performs a rollback on the connection.
Expand DownExpand Up@@ -465,10 +457,10 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(rollback);
 static NODE_API_FUNC(rollback);

 /// @internal
 static void rollbackWork(uv_work_t *req);
 static void rollbackWork(uv_work_t *req);

 /** Indicates whether the connection is connected.
 *
Expand All@@ -492,24 +484,24 @@ class Connection : public ObjectWrap
 * @return true if the connection is connected, false if not.
 *
 */
 static NODE_API_FUNC(connected);
 static NODE_API_FUNC(connected);

public:
public:
 /// @internal
 a_sqlany_connection*conn;
 a_sqlany_connection*conn;
 /// @internal
 unsigned intmax_api_ver;
 unsigned intmax_api_ver;
 /// @internal
 bool sqlca_connection;
 bool sqlca_connection;
 /// @internal
 uv_mutex_t conn_mutex;
 uv_mutex_t conn_mutex;
 /// @internal
 Persistent<String>_arg;
 Persistent<String>_arg;
 /// @internal
 std::vector<void*>	statements;
 std::vector<void *> statements;

 /// @internal
 void removeStmt(class StmtObject *stmt);
 void removeStmt(class StmtObject *stmt);
 /// @internal
 void cleanupStmts(void);
 void cleanupStmts(void);
};

18 changes: 9 additions & 9 deletions
src/h/errors.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// ***************************************************************************
// 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
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009
#define JS_ERR_INVALID_OBJECT-2001
#define JS_ERR_INVALID_ARGUMENTS-2002
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009

17 changes: 1 addition & 16 deletions
src/h/nodever_cover.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,19 +3,4 @@
// ***************************************************************************
#include <node_version.h>

#if NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 10
#define v010	1
#define v012	0
#elif NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 12
#define v010	0
#define v012	1
#else
#define v010	0
#define v012	0
#endif

#if v010
#define NODE_API_FUNC( name ) Handle<Value> name ( const Arguments &args )
#else
#define NODE_API_FUNC( name ) void name ( const FunctionCallbackInfo<Value> &args )
#endif
#define NODE_API_FUNC(name) void name(const FunctionCallbackInfo<Value> &args)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: made to work with node 14+#43

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

 Open

pkeuter
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


fix: made to work with node 14+
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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 numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
build
node_modules

42 changes: 42 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.


6 changes: 3 additions & 3 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,19 @@
 "author": "SQL ANYWHERE",
 "name": "sqlanywhere",
 "description": "SQL Anywhere JavaScript Driver.",
 "version": "1.0.25",
 "version": "2.0.3",
 "repository": {
 "url": "https://github.com/sqlanywhere/node-sqlanywhere"
 },
 "main": "./lib/index",
 "engines": {
 "node": ">=0.10"
 "node": ">=14.0.0"
 },
 "scripts": {
 "install": "node build.js"
 },
 "dependencies": {
 "help": "^3.0.2",
 "nan": "2.14.2"
 "nan": "^2.15.0"
 }
}

84 changes: 38 additions & 46 deletions
src/h/connection.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,30 @@ using namespace node;
 */
class Connection : public ObjectWrap
{
public:
public:
 /// @internal
#if v010
 static void Init();
#else
 static void Init( Isolate * );
#endif
 static void Init(Isolate *);

 /// @internal
 static NODE_API_FUNC(NewInstance);
private:
 static NODE_API_FUNC(NewInstance);

private:
 /// @internal
#if v010
 Connection( const Arguments &args );
#else
 Connection( const FunctionCallbackInfo<Value> &args );
#endif
 Connection(const FunctionCallbackInfo<Value> &args);
 /// @internal
 ~Connection();

 /// @internal
 static Persistent<Function> constructor;

 /// @internal
 static void noParamAfter(uv_work_t *req);
 static void noParamAfter(uv_work_t *req);
 /// @internal
 static void connectAfter(uv_work_t *req);
 static void connectAfter(uv_work_t *req);
 /// @internal
 static void connectWork(uv_work_t *req);
 static void connectWork(uv_work_t *req);
 /// @internal
 static NODE_API_FUNC(New);
 static NODE_API_FUNC(New);

 /// Connect using an existing connection.
 //
Expand DownExpand Up@@ -202,7 +194,7 @@ class Connection : public ObjectWrap
 //
 // @internal
 ///

 /** Creates a new connection.
 *
 * This method creates a new connection using either a connection string
Expand DownExpand Up@@ -242,7 +234,7 @@ class Connection : public ObjectWrap
 *
 * @see Connection::disconnect
 */
 static NODE_API_FUNC(connect);
 static NODE_API_FUNC(connect);

 /** Closes the current connection.
 *
Expand DownExpand Up@@ -275,11 +267,11 @@ class Connection : public ObjectWrap
 *
 * @see Connection::connect
 */
 static NODE_API_FUNC(disconnect);
 static NODE_API_FUNC(disconnect);

 /// @internal
 static void disconnectWork(uv_work_t *req);
 static void disconnectWork(uv_work_t *req);

 /** Executes the specified SQL statement.
 *
 * This method takes in a SQL statement and an optional array of bind
Expand DownExpand Up@@ -335,8 +327,8 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, the result is returned.
 *
 */
 static NODE_API_FUNC(exec);
 static NODE_API_FUNC(exec);

 /** Prepares the specified SQL statement.
 *
 * This method prepares a SQL statement and returns a Statement object
Expand DownExpand Up@@ -373,13 +365,13 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, a Statement object is returned.
 *
 */
 static NODE_API_FUNC(prepare);
 static NODE_API_FUNC(prepare);

 /// @internal
 static void prepareAfter(uv_work_t *req);
 static void prepareAfter(uv_work_t *req);
 /// @internal
 static void prepareWork(uv_work_t *req);
 static void prepareWork(uv_work_t *req);

 /** Performs a commit on the connection.
 *
 * This method performs a commit on the connection.
Expand DownExpand Up@@ -421,11 +413,11 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(commit);
 static NODE_API_FUNC(commit);

 /// @internal
 static void commitWork(uv_work_t *req);
 static void commitWork(uv_work_t *req);

 /** Performs a rollback on the connection.
 *
 * This method performs a rollback on the connection.
Expand DownExpand Up@@ -465,10 +457,10 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(rollback);
 static NODE_API_FUNC(rollback);

 /// @internal
 static void rollbackWork(uv_work_t *req);
 static void rollbackWork(uv_work_t *req);

 /** Indicates whether the connection is connected.
 *
Expand All@@ -492,24 +484,24 @@ class Connection : public ObjectWrap
 * @return true if the connection is connected, false if not.
 *
 */
 static NODE_API_FUNC(connected);
 static NODE_API_FUNC(connected);

public:
public:
 /// @internal
 a_sqlany_connection*conn;
 a_sqlany_connection*conn;
 /// @internal
 unsigned intmax_api_ver;
 unsigned intmax_api_ver;
 /// @internal
 bool sqlca_connection;
 bool sqlca_connection;
 /// @internal
 uv_mutex_t conn_mutex;
 uv_mutex_t conn_mutex;
 /// @internal
 Persistent<String>_arg;
 Persistent<String>_arg;
 /// @internal
 std::vector<void*>	statements;
 std::vector<void *> statements;

 /// @internal
 void removeStmt(class StmtObject *stmt);
 void removeStmt(class StmtObject *stmt);
 /// @internal
 void cleanupStmts(void);
 void cleanupStmts(void);
};

18 changes: 9 additions & 9 deletions
src/h/errors.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// ***************************************************************************
// 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
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009
#define JS_ERR_INVALID_OBJECT-2001
#define JS_ERR_INVALID_ARGUMENTS-2002
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009

17 changes: 1 addition & 16 deletions
src/h/nodever_cover.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,19 +3,4 @@
// ***************************************************************************
#include <node_version.h>

#if NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 10
#define v010	1
#define v012	0
#elif NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 12
#define v010	0
#define v012	1
#else
#define v010	0
#define v012	0
#endif

#if v010
#define NODE_API_FUNC( name ) Handle<Value> name ( const Arguments &args )
#else
#define NODE_API_FUNC( name ) void name ( const FunctionCallbackInfo<Value> &args )
#endif
#define NODE_API_FUNC(name) void name(const FunctionCallbackInfo<Value> &args)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: made to work with node 14+#43

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

 Open

pkeuter
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


fix: made to work with node 14+
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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 numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
build
node_modules

42 changes: 42 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.


6 changes: 3 additions & 3 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,19 @@
 "author": "SQL ANYWHERE",
 "name": "sqlanywhere",
 "description": "SQL Anywhere JavaScript Driver.",
 "version": "1.0.25",
 "version": "2.0.3",
 "repository": {
 "url": "https://github.com/sqlanywhere/node-sqlanywhere"
 },
 "main": "./lib/index",
 "engines": {
 "node": ">=0.10"
 "node": ">=14.0.0"
 },
 "scripts": {
 "install": "node build.js"
 },
 "dependencies": {
 "help": "^3.0.2",
 "nan": "2.14.2"
 "nan": "^2.15.0"
 }
}

84 changes: 38 additions & 46 deletions
src/h/connection.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,30 @@ using namespace node;
 */
class Connection : public ObjectWrap
{
public:
public:
 /// @internal
#if v010
 static void Init();
#else
 static void Init( Isolate * );
#endif
 static void Init(Isolate *);

 /// @internal
 static NODE_API_FUNC(NewInstance);
private:
 static NODE_API_FUNC(NewInstance);

private:
 /// @internal
#if v010
 Connection( const Arguments &args );
#else
 Connection( const FunctionCallbackInfo<Value> &args );
#endif
 Connection(const FunctionCallbackInfo<Value> &args);
 /// @internal
 ~Connection();

 /// @internal
 static Persistent<Function> constructor;

 /// @internal
 static void noParamAfter(uv_work_t *req);
 static void noParamAfter(uv_work_t *req);
 /// @internal
 static void connectAfter(uv_work_t *req);
 static void connectAfter(uv_work_t *req);
 /// @internal
 static void connectWork(uv_work_t *req);
 static void connectWork(uv_work_t *req);
 /// @internal
 static NODE_API_FUNC(New);
 static NODE_API_FUNC(New);

 /// Connect using an existing connection.
 //
Expand DownExpand Up@@ -202,7 +194,7 @@ class Connection : public ObjectWrap
 //
 // @internal
 ///

 /** Creates a new connection.
 *
 * This method creates a new connection using either a connection string
Expand DownExpand Up@@ -242,7 +234,7 @@ class Connection : public ObjectWrap
 *
 * @see Connection::disconnect
 */
 static NODE_API_FUNC(connect);
 static NODE_API_FUNC(connect);

 /** Closes the current connection.
 *
Expand DownExpand Up@@ -275,11 +267,11 @@ class Connection : public ObjectWrap
 *
 * @see Connection::connect
 */
 static NODE_API_FUNC(disconnect);
 static NODE_API_FUNC(disconnect);

 /// @internal
 static void disconnectWork(uv_work_t *req);
 static void disconnectWork(uv_work_t *req);

 /** Executes the specified SQL statement.
 *
 * This method takes in a SQL statement and an optional array of bind
Expand DownExpand Up@@ -335,8 +327,8 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, the result is returned.
 *
 */
 static NODE_API_FUNC(exec);
 static NODE_API_FUNC(exec);

 /** Prepares the specified SQL statement.
 *
 * This method prepares a SQL statement and returns a Statement object
Expand DownExpand Up@@ -373,13 +365,13 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, a Statement object is returned.
 *
 */
 static NODE_API_FUNC(prepare);
 static NODE_API_FUNC(prepare);

 /// @internal
 static void prepareAfter(uv_work_t *req);
 static void prepareAfter(uv_work_t *req);
 /// @internal
 static void prepareWork(uv_work_t *req);
 static void prepareWork(uv_work_t *req);

 /** Performs a commit on the connection.
 *
 * This method performs a commit on the connection.
Expand DownExpand Up@@ -421,11 +413,11 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(commit);
 static NODE_API_FUNC(commit);

 /// @internal
 static void commitWork(uv_work_t *req);
 static void commitWork(uv_work_t *req);

 /** Performs a rollback on the connection.
 *
 * This method performs a rollback on the connection.
Expand DownExpand Up@@ -465,10 +457,10 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(rollback);
 static NODE_API_FUNC(rollback);

 /// @internal
 static void rollbackWork(uv_work_t *req);
 static void rollbackWork(uv_work_t *req);

 /** Indicates whether the connection is connected.
 *
Expand All@@ -492,24 +484,24 @@ class Connection : public ObjectWrap
 * @return true if the connection is connected, false if not.
 *
 */
 static NODE_API_FUNC(connected);
 static NODE_API_FUNC(connected);

public:
public:
 /// @internal
 a_sqlany_connection*conn;
 a_sqlany_connection*conn;
 /// @internal
 unsigned intmax_api_ver;
 unsigned intmax_api_ver;
 /// @internal
 bool sqlca_connection;
 bool sqlca_connection;
 /// @internal
 uv_mutex_t conn_mutex;
 uv_mutex_t conn_mutex;
 /// @internal
 Persistent<String>_arg;
 Persistent<String>_arg;
 /// @internal
 std::vector<void*>	statements;
 std::vector<void *> statements;

 /// @internal
 void removeStmt(class StmtObject *stmt);
 void removeStmt(class StmtObject *stmt);
 /// @internal
 void cleanupStmts(void);
 void cleanupStmts(void);
};

18 changes: 9 additions & 9 deletions
src/h/errors.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// ***************************************************************************
// 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
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009
#define JS_ERR_INVALID_OBJECT-2001
#define JS_ERR_INVALID_ARGUMENTS-2002
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009

17 changes: 1 addition & 16 deletions
src/h/nodever_cover.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,19 +3,4 @@
// ***************************************************************************
#include <node_version.h>

#if NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 10
#define v010	1
#define v012	0
#elif NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 12
#define v010	0
#define v012	1
#else
#define v010	0
#define v012	0
#endif

#if v010
#define NODE_API_FUNC( name ) Handle<Value> name ( const Arguments &args )
#else
#define NODE_API_FUNC( name ) void name ( const FunctionCallbackInfo<Value> &args )
#endif
#define NODE_API_FUNC(name) void name(const FunctionCallbackInfo<Value> &args)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: made to work with node 14+#43

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

 Open

pkeuter
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


fix: made to work with node 14+
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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 numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
build
node_modules

42 changes: 42 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.


6 changes: 3 additions & 3 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,19 @@
 "author": "SQL ANYWHERE",
 "name": "sqlanywhere",
 "description": "SQL Anywhere JavaScript Driver.",
 "version": "1.0.25",
 "version": "2.0.3",
 "repository": {
 "url": "https://github.com/sqlanywhere/node-sqlanywhere"
 },
 "main": "./lib/index",
 "engines": {
 "node": ">=0.10"
 "node": ">=14.0.0"
 },
 "scripts": {
 "install": "node build.js"
 },
 "dependencies": {
 "help": "^3.0.2",
 "nan": "2.14.2"
 "nan": "^2.15.0"
 }
}

84 changes: 38 additions & 46 deletions
src/h/connection.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,30 @@ using namespace node;
 */
class Connection : public ObjectWrap
{
public:
public:
 /// @internal
#if v010
 static void Init();
#else
 static void Init( Isolate * );
#endif
 static void Init(Isolate *);

 /// @internal
 static NODE_API_FUNC(NewInstance);
private:
 static NODE_API_FUNC(NewInstance);

private:
 /// @internal
#if v010
 Connection( const Arguments &args );
#else
 Connection( const FunctionCallbackInfo<Value> &args );
#endif
 Connection(const FunctionCallbackInfo<Value> &args);
 /// @internal
 ~Connection();

 /// @internal
 static Persistent<Function> constructor;

 /// @internal
 static void noParamAfter(uv_work_t *req);
 static void noParamAfter(uv_work_t *req);
 /// @internal
 static void connectAfter(uv_work_t *req);
 static void connectAfter(uv_work_t *req);
 /// @internal
 static void connectWork(uv_work_t *req);
 static void connectWork(uv_work_t *req);
 /// @internal
 static NODE_API_FUNC(New);
 static NODE_API_FUNC(New);

 /// Connect using an existing connection.
 //
Expand DownExpand Up@@ -202,7 +194,7 @@ class Connection : public ObjectWrap
 //
 // @internal
 ///

 /** Creates a new connection.
 *
 * This method creates a new connection using either a connection string
Expand DownExpand Up@@ -242,7 +234,7 @@ class Connection : public ObjectWrap
 *
 * @see Connection::disconnect
 */
 static NODE_API_FUNC(connect);
 static NODE_API_FUNC(connect);

 /** Closes the current connection.
 *
Expand DownExpand Up@@ -275,11 +267,11 @@ class Connection : public ObjectWrap
 *
 * @see Connection::connect
 */
 static NODE_API_FUNC(disconnect);
 static NODE_API_FUNC(disconnect);

 /// @internal
 static void disconnectWork(uv_work_t *req);
 static void disconnectWork(uv_work_t *req);

 /** Executes the specified SQL statement.
 *
 * This method takes in a SQL statement and an optional array of bind
Expand DownExpand Up@@ -335,8 +327,8 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, the result is returned.
 *
 */
 static NODE_API_FUNC(exec);
 static NODE_API_FUNC(exec);

 /** Prepares the specified SQL statement.
 *
 * This method prepares a SQL statement and returns a Statement object
Expand DownExpand Up@@ -373,13 +365,13 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, a Statement object is returned.
 *
 */
 static NODE_API_FUNC(prepare);
 static NODE_API_FUNC(prepare);

 /// @internal
 static void prepareAfter(uv_work_t *req);
 static void prepareAfter(uv_work_t *req);
 /// @internal
 static void prepareWork(uv_work_t *req);
 static void prepareWork(uv_work_t *req);

 /** Performs a commit on the connection.
 *
 * This method performs a commit on the connection.
Expand DownExpand Up@@ -421,11 +413,11 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(commit);
 static NODE_API_FUNC(commit);

 /// @internal
 static void commitWork(uv_work_t *req);
 static void commitWork(uv_work_t *req);

 /** Performs a rollback on the connection.
 *
 * This method performs a rollback on the connection.
Expand DownExpand Up@@ -465,10 +457,10 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(rollback);
 static NODE_API_FUNC(rollback);

 /// @internal
 static void rollbackWork(uv_work_t *req);
 static void rollbackWork(uv_work_t *req);

 /** Indicates whether the connection is connected.
 *
Expand All@@ -492,24 +484,24 @@ class Connection : public ObjectWrap
 * @return true if the connection is connected, false if not.
 *
 */
 static NODE_API_FUNC(connected);
 static NODE_API_FUNC(connected);

public:
public:
 /// @internal
 a_sqlany_connection*conn;
 a_sqlany_connection*conn;
 /// @internal
 unsigned intmax_api_ver;
 unsigned intmax_api_ver;
 /// @internal
 bool sqlca_connection;
 bool sqlca_connection;
 /// @internal
 uv_mutex_t conn_mutex;
 uv_mutex_t conn_mutex;
 /// @internal
 Persistent<String>_arg;
 Persistent<String>_arg;
 /// @internal
 std::vector<void*>	statements;
 std::vector<void *> statements;

 /// @internal
 void removeStmt(class StmtObject *stmt);
 void removeStmt(class StmtObject *stmt);
 /// @internal
 void cleanupStmts(void);
 void cleanupStmts(void);
};

18 changes: 9 additions & 9 deletions
src/h/errors.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// ***************************************************************************
// 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
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009
#define JS_ERR_INVALID_OBJECT-2001
#define JS_ERR_INVALID_ARGUMENTS-2002
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009

17 changes: 1 addition & 16 deletions
src/h/nodever_cover.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,19 +3,4 @@
// ***************************************************************************
#include <node_version.h>

#if NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 10
#define v010	1
#define v012	0
#elif NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 12
#define v010	0
#define v012	1
#else
#define v010	0
#define v012	0
#endif

#if v010
#define NODE_API_FUNC( name ) Handle<Value> name ( const Arguments &args )
#else
#define NODE_API_FUNC( name ) void name ( const FunctionCallbackInfo<Value> &args )
#endif
#define NODE_API_FUNC(name) void name(const FunctionCallbackInfo<Value> &args)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: made to work with node 14+#43

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

 Open

pkeuter
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


fix: made to work with node 14+
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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 numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
build
node_modules

42 changes: 42 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.


6 changes: 3 additions & 3 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,19 @@
 "author": "SQL ANYWHERE",
 "name": "sqlanywhere",
 "description": "SQL Anywhere JavaScript Driver.",
 "version": "1.0.25",
 "version": "2.0.3",
 "repository": {
 "url": "https://github.com/sqlanywhere/node-sqlanywhere"
 },
 "main": "./lib/index",
 "engines": {
 "node": ">=0.10"
 "node": ">=14.0.0"
 },
 "scripts": {
 "install": "node build.js"
 },
 "dependencies": {
 "help": "^3.0.2",
 "nan": "2.14.2"
 "nan": "^2.15.0"
 }
}

84 changes: 38 additions & 46 deletions
src/h/connection.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,30 @@ using namespace node;
 */
class Connection : public ObjectWrap
{
public:
public:
 /// @internal
#if v010
 static void Init();
#else
 static void Init( Isolate * );
#endif
 static void Init(Isolate *);

 /// @internal
 static NODE_API_FUNC(NewInstance);
private:
 static NODE_API_FUNC(NewInstance);

private:
 /// @internal
#if v010
 Connection( const Arguments &args );
#else
 Connection( const FunctionCallbackInfo<Value> &args );
#endif
 Connection(const FunctionCallbackInfo<Value> &args);
 /// @internal
 ~Connection();

 /// @internal
 static Persistent<Function> constructor;

 /// @internal
 static void noParamAfter(uv_work_t *req);
 static void noParamAfter(uv_work_t *req);
 /// @internal
 static void connectAfter(uv_work_t *req);
 static void connectAfter(uv_work_t *req);
 /// @internal
 static void connectWork(uv_work_t *req);
 static void connectWork(uv_work_t *req);
 /// @internal
 static NODE_API_FUNC(New);
 static NODE_API_FUNC(New);

 /// Connect using an existing connection.
 //
Expand DownExpand Up@@ -202,7 +194,7 @@ class Connection : public ObjectWrap
 //
 // @internal
 ///

 /** Creates a new connection.
 *
 * This method creates a new connection using either a connection string
Expand DownExpand Up@@ -242,7 +234,7 @@ class Connection : public ObjectWrap
 *
 * @see Connection::disconnect
 */
 static NODE_API_FUNC(connect);
 static NODE_API_FUNC(connect);

 /** Closes the current connection.
 *
Expand DownExpand Up@@ -275,11 +267,11 @@ class Connection : public ObjectWrap
 *
 * @see Connection::connect
 */
 static NODE_API_FUNC(disconnect);
 static NODE_API_FUNC(disconnect);

 /// @internal
 static void disconnectWork(uv_work_t *req);
 static void disconnectWork(uv_work_t *req);

 /** Executes the specified SQL statement.
 *
 * This method takes in a SQL statement and an optional array of bind
Expand DownExpand Up@@ -335,8 +327,8 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, the result is returned.
 *
 */
 static NODE_API_FUNC(exec);
 static NODE_API_FUNC(exec);

 /** Prepares the specified SQL statement.
 *
 * This method prepares a SQL statement and returns a Statement object
Expand DownExpand Up@@ -373,13 +365,13 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, a Statement object is returned.
 *
 */
 static NODE_API_FUNC(prepare);
 static NODE_API_FUNC(prepare);

 /// @internal
 static void prepareAfter(uv_work_t *req);
 static void prepareAfter(uv_work_t *req);
 /// @internal
 static void prepareWork(uv_work_t *req);
 static void prepareWork(uv_work_t *req);

 /** Performs a commit on the connection.
 *
 * This method performs a commit on the connection.
Expand DownExpand Up@@ -421,11 +413,11 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(commit);
 static NODE_API_FUNC(commit);

 /// @internal
 static void commitWork(uv_work_t *req);
 static void commitWork(uv_work_t *req);

 /** Performs a rollback on the connection.
 *
 * This method performs a rollback on the connection.
Expand DownExpand Up@@ -465,10 +457,10 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(rollback);
 static NODE_API_FUNC(rollback);

 /// @internal
 static void rollbackWork(uv_work_t *req);
 static void rollbackWork(uv_work_t *req);

 /** Indicates whether the connection is connected.
 *
Expand All@@ -492,24 +484,24 @@ class Connection : public ObjectWrap
 * @return true if the connection is connected, false if not.
 *
 */
 static NODE_API_FUNC(connected);
 static NODE_API_FUNC(connected);

public:
public:
 /// @internal
 a_sqlany_connection*conn;
 a_sqlany_connection*conn;
 /// @internal
 unsigned intmax_api_ver;
 unsigned intmax_api_ver;
 /// @internal
 bool sqlca_connection;
 bool sqlca_connection;
 /// @internal
 uv_mutex_t conn_mutex;
 uv_mutex_t conn_mutex;
 /// @internal
 Persistent<String>_arg;
 Persistent<String>_arg;
 /// @internal
 std::vector<void*>	statements;
 std::vector<void *> statements;

 /// @internal
 void removeStmt(class StmtObject *stmt);
 void removeStmt(class StmtObject *stmt);
 /// @internal
 void cleanupStmts(void);
 void cleanupStmts(void);
};

18 changes: 9 additions & 9 deletions
src/h/errors.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// ***************************************************************************
// 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
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009
#define JS_ERR_INVALID_OBJECT-2001
#define JS_ERR_INVALID_ARGUMENTS-2002
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009

17 changes: 1 addition & 16 deletions
src/h/nodever_cover.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,19 +3,4 @@
// ***************************************************************************
#include <node_version.h>

#if NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 10
#define v010	1
#define v012	0
#elif NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 12
#define v010	0
#define v012	1
#else
#define v010	0
#define v012	0
#endif

#if v010
#define NODE_API_FUNC( name ) Handle<Value> name ( const Arguments &args )
#else
#define NODE_API_FUNC( name ) void name ( const FunctionCallbackInfo<Value> &args )
#endif
#define NODE_API_FUNC(name) void name(const FunctionCallbackInfo<Value> &args)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: made to work with node 14+#43

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

 Open

pkeuter
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


fix: made to work with node 14+
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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 numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
build
node_modules

42 changes: 42 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.


6 changes: 3 additions & 3 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,19 @@
 "author": "SQL ANYWHERE",
 "name": "sqlanywhere",
 "description": "SQL Anywhere JavaScript Driver.",
 "version": "1.0.25",
 "version": "2.0.3",
 "repository": {
 "url": "https://github.com/sqlanywhere/node-sqlanywhere"
 },
 "main": "./lib/index",
 "engines": {
 "node": ">=0.10"
 "node": ">=14.0.0"
 },
 "scripts": {
 "install": "node build.js"
 },
 "dependencies": {
 "help": "^3.0.2",
 "nan": "2.14.2"
 "nan": "^2.15.0"
 }
}

84 changes: 38 additions & 46 deletions
src/h/connection.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,30 @@ using namespace node;
 */
class Connection : public ObjectWrap
{
public:
public:
 /// @internal
#if v010
 static void Init();
#else
 static void Init( Isolate * );
#endif
 static void Init(Isolate *);

 /// @internal
 static NODE_API_FUNC(NewInstance);
private:
 static NODE_API_FUNC(NewInstance);

private:
 /// @internal
#if v010
 Connection( const Arguments &args );
#else
 Connection( const FunctionCallbackInfo<Value> &args );
#endif
 Connection(const FunctionCallbackInfo<Value> &args);
 /// @internal
 ~Connection();

 /// @internal
 static Persistent<Function> constructor;

 /// @internal
 static void noParamAfter(uv_work_t *req);
 static void noParamAfter(uv_work_t *req);
 /// @internal
 static void connectAfter(uv_work_t *req);
 static void connectAfter(uv_work_t *req);
 /// @internal
 static void connectWork(uv_work_t *req);
 static void connectWork(uv_work_t *req);
 /// @internal
 static NODE_API_FUNC(New);
 static NODE_API_FUNC(New);

 /// Connect using an existing connection.
 //
Expand DownExpand Up@@ -202,7 +194,7 @@ class Connection : public ObjectWrap
 //
 // @internal
 ///

 /** Creates a new connection.
 *
 * This method creates a new connection using either a connection string
Expand DownExpand Up@@ -242,7 +234,7 @@ class Connection : public ObjectWrap
 *
 * @see Connection::disconnect
 */
 static NODE_API_FUNC(connect);
 static NODE_API_FUNC(connect);

 /** Closes the current connection.
 *
Expand DownExpand Up@@ -275,11 +267,11 @@ class Connection : public ObjectWrap
 *
 * @see Connection::connect
 */
 static NODE_API_FUNC(disconnect);
 static NODE_API_FUNC(disconnect);

 /// @internal
 static void disconnectWork(uv_work_t *req);
 static void disconnectWork(uv_work_t *req);

 /** Executes the specified SQL statement.
 *
 * This method takes in a SQL statement and an optional array of bind
Expand DownExpand Up@@ -335,8 +327,8 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, the result is returned.
 *
 */
 static NODE_API_FUNC(exec);
 static NODE_API_FUNC(exec);

 /** Prepares the specified SQL statement.
 *
 * This method prepares a SQL statement and returns a Statement object
Expand DownExpand Up@@ -373,13 +365,13 @@ class Connection : public ObjectWrap
 * @return If no callback is specified, a Statement object is returned.
 *
 */
 static NODE_API_FUNC(prepare);
 static NODE_API_FUNC(prepare);

 /// @internal
 static void prepareAfter(uv_work_t *req);
 static void prepareAfter(uv_work_t *req);
 /// @internal
 static void prepareWork(uv_work_t *req);
 static void prepareWork(uv_work_t *req);

 /** Performs a commit on the connection.
 *
 * This method performs a commit on the connection.
Expand DownExpand Up@@ -421,11 +413,11 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(commit);
 static NODE_API_FUNC(commit);

 /// @internal
 static void commitWork(uv_work_t *req);
 static void commitWork(uv_work_t *req);

 /** Performs a rollback on the connection.
 *
 * This method performs a rollback on the connection.
Expand DownExpand Up@@ -465,10 +457,10 @@ class Connection : public ObjectWrap
 * @param callback The optional callback function. ( type: Function )
 *
 */
 static NODE_API_FUNC(rollback);
 static NODE_API_FUNC(rollback);

 /// @internal
 static void rollbackWork(uv_work_t *req);
 static void rollbackWork(uv_work_t *req);

 /** Indicates whether the connection is connected.
 *
Expand All@@ -492,24 +484,24 @@ class Connection : public ObjectWrap
 * @return true if the connection is connected, false if not.
 *
 */
 static NODE_API_FUNC(connected);
 static NODE_API_FUNC(connected);

public:
public:
 /// @internal
 a_sqlany_connection*conn;
 a_sqlany_connection*conn;
 /// @internal
 unsigned intmax_api_ver;
 unsigned intmax_api_ver;
 /// @internal
 bool sqlca_connection;
 bool sqlca_connection;
 /// @internal
 uv_mutex_t conn_mutex;
 uv_mutex_t conn_mutex;
 /// @internal
 Persistent<String>_arg;
 Persistent<String>_arg;
 /// @internal
 std::vector<void*>	statements;
 std::vector<void *> statements;

 /// @internal
 void removeStmt(class StmtObject *stmt);
 void removeStmt(class StmtObject *stmt);
 /// @internal
 void cleanupStmts(void);
 void cleanupStmts(void);
};

18 changes: 9 additions & 9 deletions
src/h/errors.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// ***************************************************************************
// 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
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009
#define JS_ERR_INVALID_OBJECT-2001
#define JS_ERR_INVALID_ARGUMENTS-2002
#define JS_ERR_CONNECTION_ALREADY_EXISTS-2003
#define JS_ERR_INITIALIZING_DBCAPI-2004
#define JS_ERR_NOT_CONNECTED-2005
#define JS_ERR_BINDING_PARAMETERS-2006
#define JS_ERR_GENERAL_ERROR-2007
#define JS_ERR_RESULTSET-2008
#define JS_ERR_NO_WIDE_STATEMENTS-2009

17 changes: 1 addition & 16 deletions
src/h/nodever_cover.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,19 +3,4 @@
// ***************************************************************************
#include <node_version.h>

#if NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 10
#define v010	1
#define v012	0
#elif NODE_MAJOR_VERSION == 0 && NODE_MINOR_VERSION == 12
#define v010	0
#define v012	1
#else
#define v010	0
#define v012	0
#endif

#if v010
#define NODE_API_FUNC( name ) Handle<Value> name ( const Arguments &args )
#else
#define NODE_API_FUNC( name ) void name ( const FunctionCallbackInfo<Value> &args )
#endif
#define NODE_API_FUNC(name) void name(const FunctionCallbackInfo<Value> &args)
Loading