Make Database.exec() actually async

Author: penberg

index.d.ts

@@ -25,6 +25,8 @@ export interface SyncResult {
 export declare function databasePrepareSync(db: Database, sql: string): Statement
 /** Syncs the database in blocking mode. */
 export declare function databaseSyncSync(db: Database): SyncResult
+/** Executes SQL in blocking mode. */
+export declare function databaseExecSync(db: Database, sql: string): void
 export declare function statementIterateSync(stmt: Statement, params?: unknown | undefined | null): RowsIterator
 /** SQLite `run()` result object */
 export interface RunResult {
@@ -109,7 +111,7 @@ export declare class Database {
    * * `env` - The environment.
    * * `sql` - The SQL statement to execute.
    */
-  exec(sql: string): void
+  exec(sql: string): Promise<void>
   /**
    * Syncs the database.
    *

index.js

@@ -310,11 +310,12 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { Database, databasePrepareSync, databaseSyncSync, Statement, statementIterateSync, RowsIterator, iteratorNextSync, Record } = nativeBinding
+const { Database, databasePrepareSync, databaseSyncSync, databaseExecSync, Statement, statementIterateSync, RowsIterator, iteratorNextSync, Record } = nativeBinding
 
 module.exports.Database = Database
 module.exports.databasePrepareSync = databasePrepareSync
 module.exports.databaseSyncSync = databaseSyncSync
+module.exports.databaseExecSync = databaseExecSync
 module.exports.Statement = Statement
 module.exports.statementIterateSync = statementIterateSync
 module.exports.RowsIterator = RowsIterator

promise.js

@@ -88,14 +88,14 @@ class Database {
 
     const db = this;
     const wrapTxn = (mode) => {
-      return (...bindParameters) => {
-        db.exec("BEGIN " + mode);
+      return async (...bindParameters) => {
+        await db.exec("BEGIN " + mode);
         try {
-          const result = fn(...bindParameters);
-          db.exec("COMMIT");
+          const result = await fn(...bindParameters);
+          await db.exec("COMMIT");
           return result;
         } catch (err) {
-          db.exec("ROLLBACK");
+          await db.exec("ROLLBACK");
           throw err;
         }
       };
@@ -172,9 +172,9 @@ class Database {
    *
    * @param {string} sql - The SQL statement string to execute.
    */
-  exec(sql) {
+  async exec(sql) {
     try {
-      this.db.exec(sql);
+      await this.db.exec(sql);
     } catch (err) {
       throw convertError(err);
     }

src/lib.rs

@@ -501,14 +501,18 @@ impl Database {
     /// * `env` - The environment.
     /// * `sql` - The SQL statement to execute.
     #[napi]
-    pub fn exec(&self, env: Env, sql: String) -> Result<()> {
-        let rt = runtime()?;
+    pub async fn exec(&self, sql: String) -> Result<()> {
         let conn = match &self.conn {
             Some(conn) => conn.clone(),
-            None => return Err(throw_database_closed_error(&env).into()),
+            None => {
+                return Err(throw_sqlite_error(
+                    "The database connection is not open".to_string(),
+                    "SQLITE_NOTOPEN".to_string(),
+                    0,
+                ));
+            }
         };
-        rt.block_on(async move { conn.execute_batch(&sql).await })
-            .map_err(Error::from)?;
+        conn.execute_batch(&sql).await.map_err(Error::from)?;
         Ok(())
     }
 
@@ -584,6 +588,13 @@ pub fn database_sync_sync(db: &Database) -> Result<SyncResult> {
     rt.block_on(async move { db.sync().await })
 }
 
+/// Executes SQL in blocking mode.
+#[napi]
+pub fn database_exec_sync(db: &Database, sql: String) -> Result<()> {
+    let rt = runtime()?;
+    rt.block_on(async move { db.exec(sql).await })
+}
+
 fn is_remote_path(path: &str) -> bool {
     path.starts_with("libsql://") || path.starts_with("http://") || path.starts_with("https://")
 }

wrapper.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { Database: NativeDb, databasePrepareSync, databaseSyncSync, statementIterateSync, iteratorNextSync } = require("./index.js");
+const { Database: NativeDb, databasePrepareSync, databaseSyncSync, databaseExecSync, statementIterateSync, iteratorNextSync } = require("./index.js");
 const SqliteError = require("./sqlite-error.js");
 const Authorization = require("./auth");
 
@@ -178,7 +178,7 @@ class Database {
    */
   exec(sql) {
     try {
-      this.db.exec(sql);
+      databaseExecSync(this.db, sql);
     } catch (err) {
       throw convertError(err);
     }