better-sqlite3-multiple-ciphers 7.4.7-beta.0 → 7.5.1-beta.0

package/deps/sqlite3.gyp

@@ -1,7 +1,6 @@
 # ===
 # This configuration defines options specific to compiling SQLite3 itself.
 # Compile-time options are loaded by the auto-generated file "defines.gypi".
-# Before SQLite3 is compiled, it gets extracted from "sqlite3.tar.gz".
 # The --sqlite3 option can be provided to use a custom amalgamation instead.
 # ===
 
@@ -15,24 +14,31 @@
       'conditions': [
         ['sqlite3 == ""', {
           'actions': [{
-            'action_name': 'extract_sqlite3',
-            'inputs': ['sqlite3.tar.gz'],
+            'action_name': 'symlink_builtin_sqlite3',
+            'inputs': [
+              'sqlite3/sqlite3.c',
+              'sqlite3/sqlite3.h',
+              'sqlite3/sqlite3ext.h',
+            ],
             'outputs': [
               '<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3.c',
               '<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3.h',
               '<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3ext.h',
             ],
-            'action': ['node', 'extract.js', '<(SHARED_INTERMEDIATE_DIR)/sqlite3'],
+            'action': ['node', 'symlink.js', '<(SHARED_INTERMEDIATE_DIR)/sqlite3', '', 'sqlite3.c', 'sqlite3.h', 'sqlite3ext.h'],
           }],
         }, {
           'actions': [{
-            'action_name': 'symlink_sqlite3',
-            'inputs': [],
+            'action_name': 'symlink_custom_sqlite3',
+            'inputs': [
+              '<(sqlite3)/sqlite3.c',
+              '<(sqlite3)/sqlite3.h',
+            ],
             'outputs': [
               '<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3.c',
               '<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3.h',
             ],
-            'action': ['node', 'symlink.js', '<(SHARED_INTERMEDIATE_DIR)/sqlite3', '<(sqlite3)'],
+            'action': ['node', 'symlink.js', '<(SHARED_INTERMEDIATE_DIR)/sqlite3', '<(sqlite3)', 'sqlite3.c', 'sqlite3.h'],
           }],
         }],
       ],
@@ -67,6 +73,10 @@
           'cflags!': ['-maes', '-msse4.2'],
           'cflags': ['-march=native'],
         }],
+        ['target_arch=="arm"', {
+          'cflags!': ['-maes', '-msse4.2'],
+          'cflags': ['-march=native'],
+        }],
       ],
       'configurations': {
         'Debug': {

package/deps/symlink.js

@@ -3,14 +3,17 @@ const path = require('path');
 const fs = require('fs');
 
 const dest = process.argv[2];
-const source = path.resolve(path.sep, process.argv[3]);
+const source = path.resolve(path.sep, process.argv[3] || path.join(__dirname, 'sqlite3'));
+const filenames = process.argv.slice(4).map(str => path.basename(str));
 
 /*
-	This creates symlinks inside the <$2> directory, linking to the SQLite3
-	amalgamation files inside the directory specified by the absolute path <$3>.
+	This creates symlinks inside the <$2> directory, linking to files inside the
+	directory specified by the absolute path <$3>. If no path <$3> is provided,
+	the default path of "./deps/sqlite3" is used. The basenames of the files to
+	link are specified by <$4...>.
  */
 
-for (const filename of ['sqlite3.c', 'sqlite3.h']) {
+for (const filename of filenames) {
 	fs.accessSync(path.join(source, filename));
 	fs.symlinkSync(path.join(source, filename), path.join(dest, filename), 'file');
 }

package/lib/database.js

@@ -2,11 +2,9 @@
 const fs = require('fs');
 const path = require('path');
 const util = require('./util');
+const SqliteError = require('./sqlite-error');
 
-const {
-	Database: CPPDatabase,
-	setErrorConstructor,
-} = require('bindings')('better_sqlite3.node');
+let DEFAULT_ADDON;
 
 function Database(filenameGiven, options) {
 	if (new.target == null) {
@@ -35,12 +33,26 @@ function Database(filenameGiven, options) {
 	const fileMustExist = util.getBooleanOption(options, 'fileMustExist');
 	const timeout = 'timeout' in options ? options.timeout : 5000;
 	const verbose = 'verbose' in options ? options.verbose : null;
+	const nativeBindingPath = 'nativeBinding' in options ? options.nativeBinding : null;
 
 	// Validate interpreted options
 	if (readonly && anonymous && !buffer) throw new TypeError('In-memory/temporary databases cannot be readonly');
 	if (!Number.isInteger(timeout) || timeout < 0) throw new TypeError('Expected the "timeout" option to be a positive integer');
 	if (timeout > 0x7fffffff) throw new RangeError('Option "timeout" cannot be greater than 2147483647');
 	if (verbose != null && typeof verbose !== 'function') throw new TypeError('Expected the "verbose" option to be a function');
+	if (nativeBindingPath != null && typeof nativeBindingPath !== 'string') throw new TypeError('Expected the "nativeBinding" option to be a string');
+
+	// Load the native addon
+	let addon;
+	if (nativeBindingPath == null) {
+		addon = DEFAULT_ADDON || (DEFAULT_ADDON = require('bindings')('better_sqlite3.node'));
+	} else {
+		addon = require(path.resolve(nativeBindingPath).replace(/(\.node)?$/, '.node'));
+	}
+	if (!addon.isInitialized) {
+		addon.setErrorConstructor(SqliteError);
+		addon.isInitialized = true;
+	}
 
 	// Make sure the specified directory exists
 	if (!anonymous && !fs.existsSync(path.dirname(filename))) {
@@ -48,7 +60,7 @@ function Database(filenameGiven, options) {
 	}
 
 	Object.defineProperties(this, {
-		[util.cppdb]: { value: new CPPDatabase(filename, filenameGiven, anonymous, readonly, fileMustExist, timeout, verbose || null, buffer || null) },
+		[util.cppdb]: { value: new addon.Database(filename, filenameGiven, anonymous, readonly, fileMustExist, timeout, verbose || null, buffer || null) },
 		...wrappers.getters,
 	});
 }
@@ -70,4 +82,3 @@ Database.prototype.unsafeMode = wrappers.unsafeMode;
 Database.prototype[util.inspect] = require('./methods/inspect');
 
 module.exports = Database;
-setErrorConstructor(require('./sqlite-error'));

package/lib/sqlite-error.js

@@ -12,8 +12,7 @@ function SqliteError(message, code) {
 	descriptor.value = '' + message;
 	Object.defineProperty(this, 'message', descriptor);
 	Error.captureStackTrace(this, SqliteError);
-	descriptor.value = code;
-	Object.defineProperty(this, 'code', descriptor);
+	this.code = code;
 }
 Object.setPrototypeOf(SqliteError, Error);
 Object.setPrototypeOf(SqliteError.prototype, Error.prototype);

package/package.json

@@ -1,18 +1,23 @@
 {
   "name": "better-sqlite3-multiple-ciphers",
-  "version": "7.4.7-beta.0",
+  "version": "7.5.1-beta.0",
   "description": "better-sqlite3 with multiple-cipher encryption support",
   "homepage": "https://github.com/m4heshd/better-sqlite3-multiple-ciphers",
   "author": "Mahesh Bandara Wijerathna (m4heshd) <m4heshd@gmail.com>",
-  "main": "lib/index.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/m4heshd/better-sqlite3-multiple-ciphers.git"
   },
+  "main": "lib/index.js",
+  "files": [
+    "binding.gyp",
+    "src/*.[ch]pp",
+    "lib/**",
+    "deps/**"
+  ],
   "dependencies": {
     "bindings": "^1.5.0",
-    "prebuild-install": "^7.0.0",
-    "tar": "^6.1.11"
+    "prebuild-install": "^7.0.0"
   },
   "devDependencies": {
     "chai": "^4.3.4",
@@ -30,7 +35,7 @@
     "build-debug": "node-gyp rebuild --debug",
     "rebuild-release": "npm run lzz && npm run build-release",
     "rebuild-debug": "npm run lzz && npm run build-debug",
-    "test": "mocha --exit --slow=75 --timeout=5000",
+    "test": "mocha --exit --slow=75 --timeout=30000",
     "benchmark": "node benchmark",
     "download": "bash ./deps/download.sh",
     "setup": "powershell ./deps/setup.ps1",
@@ -52,6 +57,7 @@
     "sqlite3",
     "sqleet",
     "sqlcipher",
+    "sqlite3multipleciphers",
     "encryption",
     "transactions",
     "user-defined functions",

package/src/better_sqlite3.cpp

@@ -759,11 +759,12 @@ v8::Local <v8 :: Function> Statement::Init (v8::Isolate * isolate, v8::Local <v8
                 SetPrototypeMethod(isolate, data, t, "raw", JS_raw);
                 SetPrototypeMethod(isolate, data, t, "safeIntegers", JS_safeIntegers);
                 SetPrototypeMethod(isolate, data, t, "columns", JS_columns);
+                SetPrototypeGetter(isolate, data, t, "busy", JS_busy);
                 return t->GetFunction( isolate -> GetCurrentContext ( ) ).ToLocalChecked();
 }
-#line 25 "./src/objects/statement.lzz"
+#line 26 "./src/objects/statement.lzz"
 BindMap * Statement::GetBindMap (v8::Isolate * isolate)
-#line 25 "./src/objects/statement.lzz"
+#line 26 "./src/objects/statement.lzz"
                                                   {
                 if (has_bind_map) return &extras->bind_map;
                 BindMap* bind_map = &extras->bind_map;
@@ -775,34 +776,34 @@ BindMap * Statement::GetBindMap (v8::Isolate * isolate)
                 has_bind_map = true;
                 return bind_map;
 }
-#line 38 "./src/objects/statement.lzz"
+#line 39 "./src/objects/statement.lzz"
 void Statement::CloseHandles ()
-#line 38 "./src/objects/statement.lzz"
+#line 39 "./src/objects/statement.lzz"
                             {
                 if (alive) {
                         alive = false;
                         sqlite3_finalize(handle);
                 }
 }
-#line 45 "./src/objects/statement.lzz"
+#line 46 "./src/objects/statement.lzz"
 Statement::~ Statement ()
-#line 45 "./src/objects/statement.lzz"
+#line 46 "./src/objects/statement.lzz"
                      {
                 if (alive) db->RemoveStatement(this);
                 CloseHandles();
                 delete extras;
 }
-#line 55 "./src/objects/statement.lzz"
+#line 56 "./src/objects/statement.lzz"
 Statement::Extras::Extras (sqlite3_uint64 id)
-#line 55 "./src/objects/statement.lzz"
+#line 56 "./src/objects/statement.lzz"
   : bind_map (0), id (id)
-#line 55 "./src/objects/statement.lzz"
+#line 56 "./src/objects/statement.lzz"
                                                                          {}
-#line 60 "./src/objects/statement.lzz"
+#line 61 "./src/objects/statement.lzz"
 Statement::Statement (Database * db, sqlite3_stmt * handle, sqlite3_uint64 id, bool returns_data)
-#line 65 "./src/objects/statement.lzz"
+#line 66 "./src/objects/statement.lzz"
   : node::ObjectWrap (), db (db), handle (handle), extras (new Extras(id)), alive (true), locked (false), bound (false), has_bind_map (false), safe_ints (db->GetState()->safe_ints), mode (Data::FLAT), returns_data (returns_data)
-#line 76 "./src/objects/statement.lzz"
+#line 77 "./src/objects/statement.lzz"
                                            {
                 assert(db != NULL);
                 assert(handle != NULL);
@@ -810,9 +811,9 @@ Statement::Statement (Database * db, sqlite3_stmt * handle, sqlite3_uint64 id, b
                 assert(!db->GetState()->busy);
                 db->AddStatement(this);
 }
-#line 84 "./src/objects/statement.lzz"
+#line 85 "./src/objects/statement.lzz"
 void Statement::JS_new (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 84 "./src/objects/statement.lzz"
+#line 85 "./src/objects/statement.lzz"
                             {
                 Addon * addon = static_cast < Addon * > ( info . Data ( ) . As < v8 :: External > ( ) -> Value ( ) ) ;
                 if (!addon->privileged_info) {
@@ -876,11 +877,11 @@ void Statement::JS_new (v8::FunctionCallbackInfo <v8 :: Value> const & info)
 
                 info.GetReturnValue().Set(info.This());
 }
-#line 148 "./src/objects/statement.lzz"
+#line 149 "./src/objects/statement.lzz"
 void Statement::JS_run (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 148 "./src/objects/statement.lzz"
+#line 149 "./src/objects/statement.lzz"
                             {
-                Statement * stmt = node :: ObjectWrap :: Unwrap < Statement > ( info . This ( ) ) ; ( ( void ) 0 ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; assert ( ! stmt -> locked ) ; if ( ! db -> GetState ( ) -> unsafe_mode ) { if ( db -> GetState ( ) -> iterators ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; } ( ( void ) 0 ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
+                Statement * stmt = node :: ObjectWrap :: Unwrap < Statement > ( info . This ( ) ) ; ( ( void ) 0 ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; if ( ! db -> GetState ( ) -> unsafe_mode ) { if ( db -> GetState ( ) -> iterators ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; } ( ( void ) 0 ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
                 sqlite3* db_handle = db->GetHandle();
                 int total_changes_before = sqlite3_total_changes(db_handle);
 
@@ -901,9 +902,9 @@ void Statement::JS_run (v8::FunctionCallbackInfo <v8 :: Value> const & info)
                 }
                 db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ;
 }
-#line 171 "./src/objects/statement.lzz"
+#line 172 "./src/objects/statement.lzz"
 void Statement::JS_get (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 171 "./src/objects/statement.lzz"
+#line 172 "./src/objects/statement.lzz"
                             {
                 Statement * stmt = node :: ObjectWrap :: Unwrap < Statement > ( info . This ( ) ) ; if ( ! stmt -> returns_data ) return ThrowTypeError ( "This statement does not return data. Use run() instead" ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
                 int status = sqlite3_step(handle);
@@ -918,9 +919,9 @@ void Statement::JS_get (v8::FunctionCallbackInfo <v8 :: Value> const & info)
                 sqlite3_reset(handle);
                 db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ;
 }
-#line 186 "./src/objects/statement.lzz"
+#line 187 "./src/objects/statement.lzz"
 void Statement::JS_all (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 186 "./src/objects/statement.lzz"
+#line 187 "./src/objects/statement.lzz"
                             {
                 Statement * stmt = node :: ObjectWrap :: Unwrap < Statement > ( info . This ( ) ) ; if ( ! stmt -> returns_data ) return ThrowTypeError ( "This statement does not return data. Use run() instead" ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
                 v8 :: Local < v8 :: Context > ctx = isolate -> GetCurrentContext ( ) ;
@@ -941,9 +942,9 @@ void Statement::JS_all (v8::FunctionCallbackInfo <v8 :: Value> const & info)
                 if (js_error) db->GetState()->was_js_error = true;
                 db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ;
 }
-#line 207 "./src/objects/statement.lzz"
+#line 208 "./src/objects/statement.lzz"
 void Statement::JS_iterate (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 207 "./src/objects/statement.lzz"
+#line 208 "./src/objects/statement.lzz"
                                 {
                 Addon * addon = static_cast < Addon * > ( info . Data ( ) . As < v8 :: External > ( ) -> Value ( ) ) ;
                 v8 :: Isolate * isolate = info . GetIsolate ( ) ;
@@ -953,9 +954,9 @@ void Statement::JS_iterate (v8::FunctionCallbackInfo <v8 :: Value> const & info)
                 addon->privileged_info = NULL;
                 if (!maybeIterator.IsEmpty()) info.GetReturnValue().Set(maybeIterator.ToLocalChecked());
 }
-#line 217 "./src/objects/statement.lzz"
+#line 218 "./src/objects/statement.lzz"
 void Statement::JS_bind (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 217 "./src/objects/statement.lzz"
+#line 218 "./src/objects/statement.lzz"
                              {
                 Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
                 if (stmt->bound) return ThrowTypeError("The bind() method can only be invoked once per statement object");
@@ -966,9 +967,9 @@ void Statement::JS_bind (v8::FunctionCallbackInfo <v8 :: Value> const & info)
                 stmt->bound = true;
                 info.GetReturnValue().Set(info.This());
 }
-#line 228 "./src/objects/statement.lzz"
+#line 229 "./src/objects/statement.lzz"
 void Statement::JS_pluck (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 228 "./src/objects/statement.lzz"
+#line 229 "./src/objects/statement.lzz"
                               {
                 Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
                 if (!stmt->returns_data) return ThrowTypeError("The pluck() method is only for statements that return data");
@@ -979,9 +980,9 @@ void Statement::JS_pluck (v8::FunctionCallbackInfo <v8 :: Value> const & info)
                 stmt->mode = use ? Data::PLUCK : stmt->mode == Data::PLUCK ? Data::FLAT : stmt->mode;
                 info.GetReturnValue().Set(info.This());
 }
-#line 239 "./src/objects/statement.lzz"
+#line 240 "./src/objects/statement.lzz"
 void Statement::JS_expand (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 239 "./src/objects/statement.lzz"
+#line 240 "./src/objects/statement.lzz"
                                {
                 Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
                 if (!stmt->returns_data) return ThrowTypeError("The expand() method is only for statements that return data");
@@ -992,9 +993,9 @@ void Statement::JS_expand (v8::FunctionCallbackInfo <v8 :: Value> const & info)
                 stmt->mode = use ? Data::EXPAND : stmt->mode == Data::EXPAND ? Data::FLAT : stmt->mode;
                 info.GetReturnValue().Set(info.This());
 }
-#line 250 "./src/objects/statement.lzz"
+#line 251 "./src/objects/statement.lzz"
 void Statement::JS_raw (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 250 "./src/objects/statement.lzz"
+#line 251 "./src/objects/statement.lzz"
                             {
                 Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
                 if (!stmt->returns_data) return ThrowTypeError("The raw() method is only for statements that return data");
@@ -1005,9 +1006,9 @@ void Statement::JS_raw (v8::FunctionCallbackInfo <v8 :: Value> const & info)
                 stmt->mode = use ? Data::RAW : stmt->mode == Data::RAW ? Data::FLAT : stmt->mode;
                 info.GetReturnValue().Set(info.This());
 }
-#line 261 "./src/objects/statement.lzz"
+#line 262 "./src/objects/statement.lzz"
 void Statement::JS_safeIntegers (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 261 "./src/objects/statement.lzz"
+#line 262 "./src/objects/statement.lzz"
                                      {
                 Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
                 if ( stmt -> db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
@@ -1016,9 +1017,9 @@ void Statement::JS_safeIntegers (v8::FunctionCallbackInfo <v8 :: Value> const &
                 else { if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsBoolean ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a boolean" ) ; stmt -> safe_ints = ( info [ 0 ] . As < v8 :: Boolean > ( ) ) -> Value ( ) ; }
                 info.GetReturnValue().Set(info.This());
 }
-#line 270 "./src/objects/statement.lzz"
+#line 271 "./src/objects/statement.lzz"
 void Statement::JS_columns (v8::FunctionCallbackInfo <v8 :: Value> const & info)
-#line 270 "./src/objects/statement.lzz"
+#line 271 "./src/objects/statement.lzz"
                                 {
                 Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
                 if (!stmt->returns_data) return ThrowTypeError("The columns() method is only for statements that return data");
@@ -1061,6 +1062,13 @@ void Statement::JS_columns (v8::FunctionCallbackInfo <v8 :: Value> const & info)
 
                 info.GetReturnValue().Set(columns);
 }
+#line 314 "./src/objects/statement.lzz"
+void Statement::JS_busy (v8::Local <v8 :: String> _, v8::PropertyCallbackInfo <v8 :: Value> const & info)
+#line 314 "./src/objects/statement.lzz"
+                             {
+                Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
+                info.GetReturnValue().Set(stmt->alive && stmt->locked);
+}
 #line 4 "./src/objects/statement-iterator.lzz"
 v8::Local <v8 :: Function> StatementIterator::Init (v8::Isolate * isolate, v8::Local <v8 :: External> data)
 #line 4 "./src/objects/statement-iterator.lzz"
@@ -2077,6 +2085,9 @@ Binder::Result Binder::BindArgs (v8::FunctionCallbackInfo <v8 :: Value> const &
                                         count += BindObject(isolate, obj, stmt);
                                         if (!success) break;
                                         continue;
+                                } else if (stmt->GetBindMap(isolate)->GetSize()) {
+                                        Fail(ThrowTypeError, "Named parameters can only be passed within plain objects");
+                                        break;
                                 }
                         }
 

package/src/better_sqlite3.hpp

@@ -312,71 +312,73 @@ class Statement : public node::ObjectWrap
 public:
 #line 4 "./src/objects/statement.lzz"
   static v8::Local <v8 :: Function> Init (v8::Isolate * isolate, v8::Local <v8 :: External> data);
-#line 20 "./src/objects/statement.lzz"
+#line 21 "./src/objects/statement.lzz"
   static bool Compare (Statement const * const a, Statement const * const b);
-#line 25 "./src/objects/statement.lzz"
+#line 26 "./src/objects/statement.lzz"
   BindMap * GetBindMap (v8::Isolate * isolate);
-#line 38 "./src/objects/statement.lzz"
+#line 39 "./src/objects/statement.lzz"
   void CloseHandles ();
-#line 45 "./src/objects/statement.lzz"
+#line 46 "./src/objects/statement.lzz"
   ~ Statement ();
-#line 51 "./src/objects/statement.lzz"
+#line 52 "./src/objects/statement.lzz"
 private:
-#line 54 "./src/objects/statement.lzz"
+#line 55 "./src/objects/statement.lzz"
   class Extras
   {
-#line 54 "./src/objects/statement.lzz"
-    friend class Statement;
 #line 55 "./src/objects/statement.lzz"
-    explicit Extras (sqlite3_uint64 id);
+    friend class Statement;
 #line 56 "./src/objects/statement.lzz"
-    BindMap bind_map;
+    explicit Extras (sqlite3_uint64 id);
 #line 57 "./src/objects/statement.lzz"
+    BindMap bind_map;
+#line 58 "./src/objects/statement.lzz"
     sqlite3_uint64 const id;
   };
-#line 60 "./src/objects/statement.lzz"
+#line 61 "./src/objects/statement.lzz"
   explicit Statement (Database * db, sqlite3_stmt * handle, sqlite3_uint64 id, bool returns_data);
-#line 84 "./src/objects/statement.lzz"
+#line 85 "./src/objects/statement.lzz"
   static void JS_new (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 148 "./src/objects/statement.lzz"
+#line 149 "./src/objects/statement.lzz"
   static void JS_run (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 171 "./src/objects/statement.lzz"
+#line 172 "./src/objects/statement.lzz"
   static void JS_get (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 186 "./src/objects/statement.lzz"
+#line 187 "./src/objects/statement.lzz"
   static void JS_all (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 207 "./src/objects/statement.lzz"
+#line 208 "./src/objects/statement.lzz"
   static void JS_iterate (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 217 "./src/objects/statement.lzz"
+#line 218 "./src/objects/statement.lzz"
   static void JS_bind (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 228 "./src/objects/statement.lzz"
+#line 229 "./src/objects/statement.lzz"
   static void JS_pluck (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 239 "./src/objects/statement.lzz"
+#line 240 "./src/objects/statement.lzz"
   static void JS_expand (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 250 "./src/objects/statement.lzz"
+#line 251 "./src/objects/statement.lzz"
   static void JS_raw (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 261 "./src/objects/statement.lzz"
+#line 262 "./src/objects/statement.lzz"
   static void JS_safeIntegers (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 270 "./src/objects/statement.lzz"
+#line 271 "./src/objects/statement.lzz"
   static void JS_columns (v8::FunctionCallbackInfo <v8 :: Value> const & info);
-#line 313 "./src/objects/statement.lzz"
-  Database * const db;
 #line 314 "./src/objects/statement.lzz"
+  static void JS_busy (v8::Local <v8 :: String> _, v8::PropertyCallbackInfo <v8 :: Value> const & info);
+#line 319 "./src/objects/statement.lzz"
+  Database * const db;
+#line 320 "./src/objects/statement.lzz"
   sqlite3_stmt * const handle;
-#line 315 "./src/objects/statement.lzz"
+#line 321 "./src/objects/statement.lzz"
   Extras * const extras;
-#line 316 "./src/objects/statement.lzz"
+#line 322 "./src/objects/statement.lzz"
   bool alive;
-#line 317 "./src/objects/statement.lzz"
+#line 323 "./src/objects/statement.lzz"
   bool locked;
-#line 318 "./src/objects/statement.lzz"
+#line 324 "./src/objects/statement.lzz"
   bool bound;
-#line 319 "./src/objects/statement.lzz"
+#line 325 "./src/objects/statement.lzz"
   bool has_bind_map;
-#line 320 "./src/objects/statement.lzz"
+#line 326 "./src/objects/statement.lzz"
   bool safe_ints;
-#line 321 "./src/objects/statement.lzz"
+#line 327 "./src/objects/statement.lzz"
   char mode;
-#line 322 "./src/objects/statement.lzz"
+#line 328 "./src/objects/statement.lzz"
   bool const returns_data;
 };
 #line 1 "./src/objects/statement-iterator.lzz"
@@ -764,13 +766,13 @@ private:
   int BindObject (v8::Isolate * isolate, v8::Local <v8::Object> obj, Statement * stmt);
 #line 149 "./src/util/binder.lzz"
   Result BindArgs (v8::FunctionCallbackInfo <v8 :: Value> const & info, int argc, Statement * stmt);
-#line 186 "./src/util/binder.lzz"
+#line 189 "./src/util/binder.lzz"
   sqlite3_stmt * handle;
-#line 187 "./src/util/binder.lzz"
+#line 190 "./src/util/binder.lzz"
   int param_count;
-#line 188 "./src/util/binder.lzz"
+#line 191 "./src/util/binder.lzz"
   int anon_index;
-#line 189 "./src/util/binder.lzz"
+#line 192 "./src/util/binder.lzz"
   bool success;
 };
 #line 34 "./src/better_sqlite3.lzz"
@@ -916,9 +918,9 @@ LZZ_INLINE Addon * Database::GetAddon ()
                                  {
                 return addon;
 }
-#line 20 "./src/objects/statement.lzz"
+#line 21 "./src/objects/statement.lzz"
 LZZ_INLINE bool Statement::Compare (Statement const * const a, Statement const * const b)
-#line 20 "./src/objects/statement.lzz"
+#line 21 "./src/objects/statement.lzz"
                                                                                          {
                 return a->extras->id < b->extras->id;
 }

package/.gitattributes

@@ -1 +0,0 @@
-*.lzz linguist-language=C++

package/.github/workflows/prebuild.yml

@@ -1,49 +0,0 @@
-name: prebuild
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  prebuild:
-    strategy:
-      matrix:
-        os:
-          - ubuntu-18.04
-          - macos-latest
-          - windows-latest
-    name: Prebuild on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - run: npm install --ignore-scripts
-      - run: npx --no-install prebuild -r node -t 10.20.0 -t 12.0.0 -t 14.0.0 -t 16.0.0 --include-regex 'better_sqlite3.node$' -u ${{ secrets.GITHUB_TOKEN }}
-      - run: npx --no-install prebuild -r electron -t 10.0.0 -t 11.0.0 -t 12.0.0 -t 13.0.0 -t 14.0.0 -t 15.0.0 -t 16.0.0 --include-regex 'better_sqlite3.node$' -u ${{ secrets.GITHUB_TOKEN }}
-      - if: matrix.os == 'windows-latest'
-        run: npx --no-install prebuild -r electron -t 10.0.0 -t 11.0.0 -t 12.0.0 -t 13.0.0 -t 14.0.0 -t 15.0.0 -t 16.0.0 --include-regex 'better_sqlite3.node$' --arch ia32 -u ${{ secrets.GITHUB_TOKEN }}
-
-  prebuild-alpine:
-    name: Prebuild on alpine
-    runs-on: ubuntu-latest
-    container: node:16-alpine
-    steps:
-      - uses: actions/checkout@v2
-      - run: apk add build-base git python3 --update-cache
-      - run: npm install --ignore-scripts
-      - run: npx --no-install prebuild -r node -t 10.20.0 -t 12.0.0 -t 14.0.0 -t 16.0.0 --include-regex 'better_sqlite3.node$' -u ${{ secrets.GITHUB_TOKEN }}
-
-  prebuild-alpine-arm64:
-    name: Prebuild on alpine (arm64)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: docker/setup-qemu-action@v1
-      - run: |
-          docker run --rm --entrypoint /bin/sh --platform linux/arm64 node:16-alpine -c "apk add build-base git python3 --update-cache && \
-          git clone ${{ github.event.repository.clone_url }} && \
-          cd ${{ github.event.repository.name }} && \
-          npm install --ignore-scripts && \
-          npx --no-install prebuild -r node -t 10.20.0 -t 12.0.0 -t 14.0.0 -t 16.0.0 --include-regex 'better_sqlite3.node$' -u ${{ secrets.GITHUB_TOKEN }}"