duckdb 0.3.5-dev90.0 → 0.3.5-dev964.0

package/configure

@@ -10,5 +10,5 @@ if [ ! -f "../../scripts/amalgamation.py" ]; then
 	exit 1
 fi
 
-(cd ../.. && python scripts/amalgamation.py --extended --source=tools/nodejs/src/duckdb.cpp --header=tools/nodejs/src/duckdb.hpp)
-(cd ../.. && python scripts/parquet_amalgamation.py && cp src/amalgamation/parquet-amalgamation* tools/nodejs/src/)
+(cd ../.. && python3 scripts/amalgamation.py --extended --source=tools/nodejs/src/duckdb.cpp --header=tools/nodejs/src/duckdb.hpp)
+(cd ../.. && python3 scripts/parquet_amalgamation.py && cp src/amalgamation/parquet-amalgamation* tools/nodejs/src/)

package/lib/duckdb-binding.js

@@ -1,8 +1,6 @@
-var os = require('os');
 var binary = require('@mapbox/node-pre-gyp');
 var path = require('path');
 var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));
+var binding = require(binding_path);
 
-// // dlopen is used because we need to specify the RTLD_GLOBAL flag to be able to resolve duckdb symbols
-// on linux where RTLD_LOCAL is the default.
-process.dlopen(module, binding_path, os.constants.dlopen.RTLD_NOW | os.constants.dlopen.RTLD_GLOBAL)
+module.exports = exports = binding;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.3.5-dev90.0",
+  "version": "0.3.5-dev964.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/connection.cpp

@@ -363,6 +363,13 @@ struct ExecTask : public Task {
 			}
 		}
 	}
+
+	void Callback() override {
+		auto env = object.Env();
+		Napi::HandleScope scope(env);
+		callback.Value().MakeCallback(object.Value(), {success ? env.Null() : Napi::String::New(env, error)});
+	};
+
 	std::string sql;
 	bool success;
 	std::string error;