support the SQLITE_USE_URI environment variable

Author: JoshuaWise

lib/database.js

@@ -61,7 +61,7 @@ function Database(filenameGiven, options) {
 	}
 
 	// Make sure the specified directory exists
-	if (!anonymous && !fs.existsSync(path.dirname(filename))) {
+	if (!anonymous && !filename.startsWith('file:') && !fs.existsSync(path.dirname(filename))) {
 		throw new TypeError('Cannot open database because the directory does not exist');
 	}
 

src/addon.cpp

@@ -15,6 +15,22 @@ struct Addon {
 		return next_id++;
 	}
 
+	static void ConfigureURI() {
+		static std::once_flag init_flag;
+		std::call_once(init_flag, [](){
+			const char* env = getenv("SQLITE_USE_URI");
+			if (env != NULL) {
+				if (strcmp(env, "1") == 0) {
+					int status = sqlite3_config(SQLITE_CONFIG_URI, 1);
+					assert(status == SQLITE_OK); ((void)status);
+				} else if (strcmp(env, "0") == 0) {
+					int status = sqlite3_config(SQLITE_CONFIG_URI, 0);
+					assert(status == SQLITE_OK); ((void)status);
+				}
+			}
+		});
+	}
+
 	static NODE_METHOD(JS_setErrorConstructor) {
 		REQUIRE_ARGUMENT_FUNCTION(first, v8::Local<v8::Function> SqliteError);
 		OnlyAddon->SqliteError.Reset(OnlyIsolate, SqliteError);

src/better_sqlite3.cpp

@@ -6,6 +6,7 @@
 #include <set>
 #include <unordered_map>
 #include <algorithm>
+#include <mutex>
 #include <sqlite3.h>
 #include <node.h>
 #include <node_object_wrap.h>
@@ -47,6 +48,7 @@ class Backup;
 NODE_MODULE_INIT(/* exports, context */) {
 	v8::Isolate* isolate = context->GetIsolate();
 	v8::HandleScope scope(isolate);
+	Addon::ConfigureURI();
 
 	// Initialize addon instance.
 	Addon* addon = new Addon(isolate);

src/objects/database.cpp

@@ -173,9 +173,9 @@ NODE_METHOD(Database::JS_new) {
 	sqlite3_limit(db_handle, SQLITE_LIMIT_LENGTH, MAX_BUFFER_SIZE < MAX_STRING_SIZE ? MAX_BUFFER_SIZE : MAX_STRING_SIZE);
 	sqlite3_limit(db_handle, SQLITE_LIMIT_SQL_LENGTH, MAX_STRING_SIZE);
 	int status = sqlite3_db_config(db_handle, SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION, 1, NULL);
-	assert(status == SQLITE_OK);
+	assert(status == SQLITE_OK); ((void)status);
 	status = sqlite3_db_config(db_handle, SQLITE_DBCONFIG_DEFENSIVE, 1, NULL);
-	assert(status == SQLITE_OK);
+	assert(status == SQLITE_OK); ((void)status);
 
 	if (node::Buffer::HasInstance(buffer) && !Deserialize(buffer.As<v8::Object>(), addon, db_handle, readonly)) {
 		int status = sqlite3_close(db_handle);

src/objects/statement.cpp

@@ -363,7 +363,7 @@ NODE_METHOD(Statement::JS_columns) {
 		);
 		columns.emplace_back(
 			v8::Object::New(isolate,
-				v8::Null(isolate),
+				v8::Object::New(isolate)->GetPrototype(),
 				keys.data(),
 				values.data(),
 				keys.size()

src/util/data.cpp

@@ -146,7 +146,7 @@ namespace Data {
 		}
 		return v8::Object::New(
 			isolate,
-			v8::Null(isolate),
+			v8::Object::New(isolate)->GetPrototype(),
 			keys.data(),
 			values.data(),
 			column_count

src/util/row-builder.cpp

@@ -33,7 +33,7 @@ class RowBuilder {
 		}
 
 		return v8::Object::New(isolate,
-			v8::Null(isolate),
+			v8::Object::New(isolate)->GetPrototype(),
 			keys.data(),
 			values.data(),
 			column_count