improve get

Author: penberg

src/lib.rs

@@ -512,6 +512,7 @@ pub fn database_prepare_sync(db: &Database, sql: String) -> Result<Statement> {
 pub struct Statement {
     stmt: Arc<tokio::sync::Mutex<libsql::Statement>>,
     conn: Arc<tokio::sync::Mutex<libsql::Connection>>,
+    column_names: Vec<std::ffi::CString>,
     safe_ints: AtomicBool,
     raw: AtomicBool,
     pluck: AtomicBool,
@@ -526,9 +527,13 @@ impl Statement {
         raw: bool,
         pluck: bool,
     ) -> Self {
+        let column_names: Vec<std::ffi::CString> = stmt.columns().iter().map(|c| {
+            std::ffi::CString::new(c.name().to_string()).unwrap()
+        }).collect();
         Self {
             stmt: Arc::new(tokio::sync::Mutex::new(stmt)),
             conn,
+            column_names,
             safe_ints: AtomicBool::new(safe_ints),
             raw: AtomicBool::new(raw),
             pluck: AtomicBool::new(pluck),
@@ -575,13 +580,12 @@ impl Statement {
             let mut stmt = self.stmt.lock().await;
             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 = Self::get_internal(
                 &env,
                 &row,
-                &column_names,
+                &self.column_names,
                 safe_ints,
                 raw,
                 pluck,
@@ -644,8 +648,8 @@ impl Statement {
             let rows = stmt.lock().await.query(params).await.map_err(Error::from)?;
             Ok::<_, napi::Error>(rows)
         };
+        let column_names = self.column_names.clone();
         env.execute_tokio_future(future, move |&mut _env, result| {
-            let column_names = Self::get_column_names(&result)?;
             Ok(RowsIterator::new(
                 Arc::new(tokio::sync::Mutex::new(result)),
                 column_names,
@@ -764,18 +768,6 @@ impl Statement {
         .map_err(Error::from)?;
         Ok(())
     }
-
-    fn get_column_names(rows: &libsql::Rows) -> Result<Vec<std::ffi::CString>> {
-        let mut column_names = Vec::new();
-        for i in 0..rows.column_count() {
-            let column_name = match rows.column_name(i) {
-                Some(name) => name.to_string(),
-                None => return Err(napi::Error::from_reason("Failed to get column name")),
-            };
-            column_names.push(std::ffi::CString::new(column_name).unwrap());
-        }
-        Ok(column_names)
-    }
 }
 
 /// SQLite `run()` result object