HACK

Author: penberg

src/lib.rs

@@ -600,7 +600,10 @@ impl Statement {
         env.execute_tokio_future(future, move |&mut _env, result| {
             let mut column_names = vec![];
             for i in 0..result.column_count() {
-                column_names.push(result.column_name(i).unwrap().to_string());
+                let column_name = result.column_name(i).unwrap();
+                let column_name = env.create_string(column_name)?;
+                let column_name = env.create_reference(column_name)?;
+                column_names.push(column_name);
             }
             let iter = RowsIterator::new(
                 Arc::new(tokio::sync::Mutex::new(result)),
@@ -634,7 +637,10 @@ impl Statement {
             let rows = stmt.query(params).await.map_err(Error::from)?;
             let mut column_names = vec![];  
             for i in 0..rows.column_count() {
-                column_names.push(rows.column_name(i).unwrap().to_string());
+                let column_name = rows.column_name(i).unwrap();
+                let column_name = env.create_string(column_name)?;
+                let column_name = env.create_reference(column_name)?;
+                column_names.push(column_name);
             }
             Ok::<_, napi::Error>((rows, column_names))
         };
@@ -725,8 +731,12 @@ impl Statement {
             let mut rows = stmt.query(params).await.map_err(Error::from)?;
             let mut column_names = vec![];
             for i in 0..rows.column_count() {
-                column_names.push(rows.column_name(i).unwrap().to_string());
+                let column_name = rows.column_name(i).unwrap();
+                let column_name = env.create_string(column_name)?;
+                let column_name = env.create_reference(column_name)?;
+                column_names.push(column_name);
             }
+            let column_names = Arc::new(column_names);
             let row = rows.next().await.map_err(Error::from)?;
             let duration = start.elapsed().as_secs_f64();
             let result = match row {
@@ -776,7 +786,7 @@ impl Statement {
 #[napi]
 pub struct RowsIterator {
     rows: Arc<tokio::sync::Mutex<libsql::Rows>>,
-    column_names: Vec<String>,
+    column_names: Arc<Vec<napi::Ref<()>>>,
     safe_ints: bool,
     raw: bool,
     pluck: bool,
@@ -786,14 +796,14 @@ pub struct RowsIterator {
 impl RowsIterator {
     pub fn new(
         rows: Arc<tokio::sync::Mutex<libsql::Rows>>,
-        column_names: Vec<String>,
+        column_names: Vec<napi::Ref<()>>,
         safe_ints: bool,
         raw: bool,
         pluck: bool,
     ) -> Result<Self> {
         let iter = RowsIterator {
             rows,
-            column_names,
+            column_names: Arc::new(column_names),
             safe_ints,
             raw,
             pluck,
@@ -805,19 +815,20 @@ impl RowsIterator {
     pub fn next(&self, env: Env) -> Result<Record> {
         let rt = runtime()?;
         let rows = self.rows.clone();
+        let column_names = self.column_names.clone();
         rt.block_on(async move {
             let mut rows = rows.lock().await;
             let next_row = rows.next().await.map_err(Error::from)?;
             let record = match next_row {
                 Some(row) => Record {
-                    column_names: self.column_names.clone(),
+                    column_names: column_names,
                     row: Some(row),
                     safe_ints: self.safe_ints,
                     raw: self.raw,
                     pluck: self.pluck,
                 },
                 None => Record {
-                    column_names: self.column_names.clone(),
+                    column_names: column_names,
                     row: None,
                     safe_ints: self.safe_ints,
                     raw: self.raw,
@@ -831,7 +842,7 @@ impl RowsIterator {
 
 #[napi]
 pub struct Record {
-    column_names: Vec<String>,
+    column_names: Arc<Vec<napi::Ref<()>>>,
     row: Option<libsql::Row>,
     safe_ints: bool,
     raw: bool,
@@ -864,7 +875,7 @@ fn runtime() -> Result<&'static Runtime> {
 
 fn map_row(
     env: &Env,
-    column_names: &[String],
+    column_names: &Arc<Vec<napi::Ref<()>>>,
     row: &libsql::Row,
     safe_ints: bool,
     raw: bool,
@@ -873,7 +884,7 @@ fn map_row(
     let result = if raw {
         map_row_raw(env, column_names, row, safe_ints, pluck)?
     } else {
-        map_row_object(env, column_names, row, safe_ints, pluck)?.into_unknown()
+        map_row_object(env, column_names, row, safe_ints, pluck)?
     };
     Ok(result)
 }
@@ -900,7 +911,7 @@ fn convert_value_to_js(
 
 fn map_row_object(
     env: &Env,
-    column_names: &[String],
+    column_names: &Arc<Vec<napi::Ref<()>>>,
     row: &libsql::Row,
     safe_ints: bool,
     pluck: bool,
@@ -925,10 +936,9 @@ fn map_row_object(
                 Ok(v) => v,
                 Err(e) => return Err(napi::Error::from_reason(e.to_string())),
             };
-
-            let column_name = column_names[idx].as_str();
+            let column_name: JsString = env.get_reference_value(&column_names[idx])?;
             let js_value = convert_value_to_js(env, &value, safe_ints)?;
-            result.set_named_property(column_name, js_value)?;
+            result.set_property(column_name, js_value)?;
         }
         result.into_unknown()
     };
@@ -937,7 +947,7 @@ fn map_row_object(
 
 fn map_row_raw(
     env: &Env,
-    column_names: &[String],
+    column_names: &Arc<Vec<napi::Ref<()>>>,
     row: &libsql::Row,
     safe_ints: bool,
     pluck: bool,