only load our extension into dbs created from JS

vlcn-io · Aug 9, 2023 · de2c345 · de2c345
1 parent 8f5f47c
commit de2c345
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -123,7 +123,6 @@ WASQLITE_DEFINES ?= \
 	-DSQLITE_ENABLE_BYTECODE_VTAB \
 	-DSQLITE_THREADSAFE=0 \
 	-DSQLITE_USE_ALLOCA \
-	-DSQLITE_EXTRA_INIT=core_init \
 	-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE \
 	-DSQLITE_ENABLE_FTS5 \
 	-DCRSQLITE_WASM

diff --git a/src/exported_functions.json b/src/exported_functions.json
@@ -1,5 +1,6 @@
 [
   "_RegisterExtensionFunctions",
+  "_core_init",
   "_main",
   "_malloc",
   "_free",
@@ -53,5 +54,6 @@
   "_sqlite3_value_int64",
   "_sqlite3_value_text",
   "_sqlite3_value_type",
-  "_sqlite3_vfs_find"
+  "_sqlite3_vfs_find",
+  "_sqlite3_reset_auto_extension"
 ]
diff --git a/src/sqlite-api.js b/src/sqlite-api.js
@@ -506,6 +506,8 @@ export function Factory(Module) {
   })();
 
   sqlite3.open_v2 = (function() {
+    // setup auto-extension loading
+    Module.ccall('core_init', 'void', ['number'], [0]);
     const fname = 'sqlite3_open_v2';
     const f = Module.cwrap(fname, ...decl('snnn:n'), { async });
     return async function(zFilename, flags, zVfs) {
@@ -518,6 +520,8 @@ export function Factory(Module) {
       Module._sqlite3_free(zVfs);
 
       Module.ccall('RegisterExtensionFunctions', 'void', ['number'], [db]);
+      // tear it back down so temp dbs created by the extension (e.g., for automigrate) don't get the extension
+      Module.ccall('sqlite3_reset_auto_extension', 'void');
       check(fname, result);
       return db;
     };