HACKS

Author: penberg

index.d.ts

@@ -3,7 +3,7 @@
 
 /* auto-generated by NAPI-RS */
 
-/** Database connection options. */
+/** SQLite connection options. */
 export interface Options {
   timeout?: number
   authToken?: string
@@ -12,26 +12,27 @@ export interface Options {
   encryptionCipher?: string
   encryptionKey?: string
 }
+export interface SyncResult {
+  framesSynced: number
+  replicationIndex: number
+}
 export declare function databaseSyncSync(db: Database): SyncResult
 export declare function databasePrepareSync(db: Database, sql: string): Statement
+/** SQLite `run()` result object */
 export interface RunResult {
   changes: number
   duration: number
   lastInsertRowid: number
 }
 /** Retrieve next row from an iterator synchronously. Needed for better-sqlite3 API compatibility. */
 export declare function iteratorNextSync(iter: RowsIterator): Record
-export interface SyncResult {
-  framesSynced: number
-  replicationIndex: number
-}
 /** SQLite error object. */
 export declare class SqliteError {
   message: string
   code: string
   rawCode: number
 }
-/** Database connection. */
+/** SQLite database connection. */
 export declare class Database {
   constructor(path: string, opts?: Options | undefined | null)
   get memory(): boolean
@@ -44,9 +45,9 @@ export declare class Database {
   interrupt(): void
   close(): void
   defaultSafeIntegers(toggle?: boolean | undefined | null): void
-  unsafeMode(): void
   sync(): Promise<SyncResult>
 }
+/** SQLite statement object. */
 export declare class Statement {
   columns(): unknown[]
   iterate(params?: unknown | undefined | null): object

src/lib.rs

@@ -642,7 +642,6 @@ impl Statement {
         rt.block_on(async move {
             let conn = self.conn.lock().await;
             let total_changes_before = conn.total_changes();
-            // Get start time
             let start = std::time::Instant::now();
 
             let mut stmt = self.stmt.lock().await;
@@ -697,38 +696,57 @@ impl Statement {
         let start = std::time::Instant::now();
         rt.block_on(async move {
             let mut stmt = self.stmt.lock().await;
-            stmt.reset();
             let params = map_params(&stmt, params)?;
             let mut rows = stmt.query(params).await.map_err(Error::from)?;
             let column_names = Self::get_column_names(&rows)?;
             let row = rows.next().await.map_err(Error::from)?;
             let duration = start.elapsed().as_secs_f64();
-            let result = match row {
-                Some(row) => {
-                    if raw {
-                        let js_array = map_row_raw(&env, &column_names, &row, safe_ints, pluck)?;
-                        Ok(js_array.into_unknown())
-                    } else {
-                        let mut js_object =
-                            map_row_object(&env, &column_names, &row, safe_ints, pluck)?
-                                .coerce_to_object()?;
-                        let mut metadata = env.create_object()?;
-                        let js_duration = env.create_double(duration)?;
-                        metadata.set_named_property("duration", js_duration)?;
-                        js_object.set_named_property("_metadata", metadata)?;
-                        Ok(js_object.into_unknown())
-                    }
-                }
-                None => {
-                    let undefined = env.get_undefined()?;
-                    Ok(undefined.into_unknown())
-                }
-            };
+            let result = Self::get_internal(
+                &env,
+                &row,
+                &column_names,
+                safe_ints,
+                raw,
+                pluck,
+                duration,
+            );
             stmt.reset();
             result
         })
     }
 
+    fn get_internal(
+        env: &Env,
+        row: &Option<libsql::Row>,
+        column_names: &[std::ffi::CString],
+        safe_ints: bool,
+        raw: bool,
+        pluck: bool,
+        duration: f64,
+    ) -> Result<napi::JsUnknown> {
+        match row {
+            Some(row) => {
+                if raw {
+                    let js_array = map_row_raw(&env, &column_names, &row, safe_ints, pluck)?;
+                    Ok(js_array.into_unknown())
+                } else {
+                    let mut js_object =
+                        map_row_object(&env, &column_names, &row, safe_ints, pluck)?
+                            .coerce_to_object()?;
+                    let mut metadata = env.create_object()?;
+                    let js_duration = env.create_double(duration)?;
+                    metadata.set_named_property("duration", js_duration)?;
+                    js_object.set_named_property("_metadata", metadata)?;
+                    Ok(js_object.into_unknown())
+                }
+            }
+            None => {
+                let undefined = env.get_undefined()?;
+                Ok(undefined.into_unknown())
+            }
+        }
+    }
+
     #[napi]
     pub fn safeIntegers(&self, toggle: Option<bool>) -> Result<&Self> {
         self.safe_ints