FIX

Author: penberg

perf/perf-better-sqlite3.js

@@ -13,9 +13,12 @@ group('Statement', () => {
   bench('get()', () => {
     stmt.get(1);
   });
-  bench('get() / raw', () => {
+  bench('get() [raw]', () => {
     stmt.raw().get(1);
   });
+  bench('get() [pluck]', () => {
+    stmt.pluck().get(1);
+  });
 });
 
 await run({

perf/perf-libsql.js

@@ -13,9 +13,12 @@ group('Statement', () => {
   bench('get()', () => {
     stmt.get(1);
   });
-  bench('get() / raw', () => {
+  bench('get() [raw]', () => {
     stmt.raw().get(1);
   });
+  bench('get() [pluck]', () => {
+    stmt.pluck().get(1);
+  });
 });
 
 await run({

src/lib.rs

@@ -1100,37 +1100,24 @@ fn map_row_raw(
     safe_ints: bool,
     pluck: bool,
 ) -> Result<napi::JsUnknown> {
+    if pluck {
+        let value = match row.get_value(0) {
+            Ok(v) => convert_value_to_js(env, &v, safe_ints)?,
+            Err(_) => env.get_null()?.into_unknown(),
+        };
+        return Ok(value);
+    }
     let column_count = column_names.len();
-    let mut js_array = env.create_array(column_count as u32)?;
+    let mut arr = env.create_array(column_count as u32)?;
     for idx in 0..column_count {
         let value = match row.get_value(idx as i32) {
             Ok(v) => v,
             Err(e) => return Err(napi::Error::from_reason(e.to_string())),
         };
-        let js_value = match value {
-            libsql::Value::Null => env.get_null()?.into_unknown(),
-            libsql::Value::Integer(v) => {
-                if safe_ints {
-                    env.create_bigint_from_i64(v)?.into_unknown()?
-                } else {
-                    env.create_double(v as f64)?.into_unknown()
-                }
-            }
-            libsql::Value::Real(v) => env.create_double(v)?.into_unknown(),
-            libsql::Value::Text(v) => env.create_string(&v)?.into_unknown(),
-            libsql::Value::Blob(v) => env.create_buffer_with_data(v.clone())?.into_unknown(),
-        };
-        js_array.set(idx as u32, js_value)?;
-    }
-    if pluck {
-        let result = match js_array.get::<JsUnknown>(0)? {
-            Some(value) => value.into_unknown(),
-            None => env.get_null()?.into_unknown(),
-        };
-        Ok(result)
-    } else {
-        Ok(js_array.coerce_to_object()?.into_unknown())
+        let js_value = convert_value_to_js(env, &value, safe_ints)?;
+        arr.set(idx as u32, js_value)?;
     }
+    Ok(arr.coerce_to_object()?.into_unknown())
 }
 
 static LOGGER_INIT: OnceCell<()> = OnceCell::new();