duckdb 0.6.2-dev708.0 → 0.6.2-dev716.0

package/binding.gyp

@@ -240,7 +240,7 @@
                 "src/duckdb/extension/json/yyjson/yyjson.cpp"
             ], 
             "include_dirs": [
-                "<!@(node -p \"require('node-addon-api').include\")", 
+                "<!(node -p \"require('node-addon-api').include_dir\")", 
                 "src/duckdb/src/include", 
                 "src/duckdb/third_party/fmt/include", 
                 "src/duckdb/third_party/fsst", 

package/binding.gyp.in

@@ -12,7 +12,7 @@
                 "${SOURCE_FILES}"
             ],
             "include_dirs": [
-                "<!@(node -p \"require('node-addon-api').include\")",
+                "<!(node -p \"require('node-addon-api').include_dir\")",
                 "${INCLUDE_FILES}"
             ],
             "defines": [

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.6.2-dev708.0",
+  "version": "0.6.2-dev716.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.6.2-dev708"
+#define DUCKDB_VERSION "0.6.2-dev716"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "3261ee59be"
+#define DUCKDB_SOURCE_ID "a3ea165426"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/include/duckdb/main/extension_helper.hpp

@@ -57,6 +57,9 @@ public:
 	static void ReplacementOpenPost(ClientContext &context, const string &extension, DatabaseInstance &instance,
 	                                ReplacementOpenData *open_data);
 
+	// Returns extension name, or empty string if not a replacement open path
+	static string ExtractExtensionPrefixFromPath(const string &path);
+
 private:
 	static const vector<string> PathComponents();
 	static ExtensionInitResult InitialLoad(DBConfig &context, FileOpener *opener, const string &extension);

package/src/duckdb/src/main/database.cpp

@@ -27,8 +27,7 @@ DBConfig::DBConfig() {
 	error_manager = make_unique<ErrorManager>();
 }
 
-DBConfig::DBConfig(std::unordered_map<string, string> &config_dict, bool read_only) {
-	compression_functions = make_unique<CompressionFunctionSet>();
+DBConfig::DBConfig(std::unordered_map<string, string> &config_dict, bool read_only) : DBConfig::DBConfig() {
 	if (read_only) {
 		options.access_mode = AccessMode::READ_ONLY;
 	}

package/src/duckdb/src/main/db_instance_cache.cpp

@@ -1,5 +1,5 @@
 #include "duckdb/main/db_instance_cache.hpp"
-
+#include "duckdb/main/extension_helper.hpp"
 namespace duckdb {
 
 string GetDBAbsolutePath(const string &database) {
@@ -10,6 +10,10 @@ string GetDBAbsolutePath(const string &database) {
 		// this is a memory db, just return it.
 		return database;
 	}
+	if (!ExtensionHelper::ExtractExtensionPrefixFromPath(database).empty()) {
+		// this database path is handled by a replacement open and is not a file path
+		return database;
+	}
 	if (FileSystem::IsPathAbsolute(database)) {
 		return database;
 	}

package/src/duckdb/src/main/extension/extension_load.cpp

@@ -176,4 +176,20 @@ void ExtensionHelper::ReplacementOpenPost(ClientContext &context, const string &
 	}
 }
 
+string ExtensionHelper::ExtractExtensionPrefixFromPath(const string &path) {
+	auto first_colon = path.find(':');
+	if (first_colon == string::npos || first_colon < 2) { // needs to be at least two characters because windows c: ...
+		return "";
+	}
+	auto extension = path.substr(0, first_colon);
+	D_ASSERT(extension.size() > 1);
+	// needs to be alphanumeric
+	for (auto &ch : extension) {
+		if (!isalnum(ch) && ch != '_') {
+			return "";
+		}
+	}
+	return extension;
+}
+
 } // namespace duckdb

package/src/duckdb/src/main/extension_prefix_opener.cpp

@@ -16,18 +16,10 @@ struct ExtensionPrefixOpenData : public ReplacementOpenData {
 
 static unique_ptr<ReplacementOpenData> ExtensionPrefixPreOpen(DBConfig &config, ReplacementOpenStaticData *) {
 	auto path = config.options.database_path;
-	auto first_colon = path.find(':');
-	if (first_colon == string::npos || first_colon < 2) { // needs to be at least two characters because windows c: ...
+	string extension = ExtensionHelper::ExtractExtensionPrefixFromPath(path);
+	if (extension.empty()) {
 		return nullptr;
 	}
-	auto extension = path.substr(0, first_colon);
-	D_ASSERT(extension.size() > 1);
-	// needs to be alphanumeric
-	for (auto &ch : extension) {
-		if (!isalnum(ch) && ch != '_') {
-			return nullptr;
-		}
-	}
 	auto extension_data = ExtensionHelper::ReplacementOpenPre(extension, config);
 	if (extension_data) {
 		return make_unique<ExtensionPrefixOpenData>(extension, path, move(extension_data));