duckdb 0.3.5-dev894.0 → 0.3.5-dev962.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-dev894.0",
+  "version": "0.3.5-dev962.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -41350,26 +41350,23 @@ hugeint_t hugeint_t::operator-() const {
 }
 
 hugeint_t hugeint_t::operator>>(const hugeint_t &rhs) const {
-	if (upper < 0) {
-		return hugeint_t(0);
-	}
 	hugeint_t result;
 	uint64_t shift = rhs.lower;
 	if (rhs.upper != 0 || shift >= 128) {
 		return hugeint_t(0);
-	} else if (shift == 64) {
-		result.upper = 0;
-		result.lower = upper;
 	} else if (shift == 0) {
 		return *this;
+	} else if (shift == 64) {
+		result.upper = (upper < 0) ? -1 : 0;
+		result.lower = upper;
 	} else if (shift < 64) {
-		// perform upper shift in unsigned integer, and mask away the most significant bit
-		result.lower = (uint64_t(upper) << (64 - shift)) + (lower >> shift);
-		result.upper = uint64_t(upper) >> shift;
+		// perform lower shift in unsigned integer, and mask away the most significant bit
+		result.lower = (uint64_t(upper) << (64 - shift)) | (lower >> shift);
+		result.upper = upper >> shift;
 	} else {
 		D_ASSERT(shift < 128);
-		result.lower = uint64_t(upper) >> (shift - 64);
-		result.upper = 0;
+		result.lower = upper >> (shift - 64);
+		result.upper = (upper < 0) ? -1 : 0;
 	}
 	return result;
 }
@@ -125506,9 +125503,25 @@ void ExtensionHelper::LoadExternalExtension(DatabaseInstance &db, const string &
 	init_fun = LoadFunctionFromDLL<ext_init_fun_t>(lib_hdl, init_fun_name, filename);
 	version_fun = LoadFunctionFromDLL<ext_version_fun_t>(lib_hdl, version_fun_name, filename);
 
-	auto extension_version = std::string((*version_fun)());
-	auto engine_version = DuckDB::LibraryVersion();
-	if (extension_version != engine_version) {
+	std::string engine_version = std::string(DuckDB::LibraryVersion());
+
+	auto version_fun_result = (*version_fun)();
+	if (version_fun_result == nullptr) {
+		throw InvalidInputException("Extension \"%s\" returned a nullptr", filename);
+	}
+	std::string extension_version = std::string(version_fun_result);
+
+	// Trim v's if necessary
+	std::string extension_version_trimmed = extension_version;
+	std::string engine_version_trimmed = engine_version;
+	if (extension_version.length() > 0 && extension_version[0] == 'v') {
+		extension_version_trimmed = extension_version.substr(1);
+	}
+	if (engine_version.length() > 0 && engine_version[0] == 'v') {
+		engine_version_trimmed = engine_version.substr(1);
+	}
+
+	if (extension_version_trimmed != engine_version_trimmed) {
 		throw InvalidInputException("Extension \"%s\" version (%s) does not match DuckDB version (%s)", filename,
 		                            extension_version, engine_version);
 	}

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "5287a381f"
-#define DUCKDB_VERSION "v0.3.5-dev894"
+#define DUCKDB_SOURCE_ID "ad0a90309"
+#define DUCKDB_VERSION "v0.3.5-dev962"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //