cleanup

Author: penberg

src/lib.rs

@@ -806,12 +806,7 @@ impl Statement {
             stmt.reset();
             let params = map_params(&stmt, params)?;
             let mut rows = stmt.query(params).await.map_err(Error::from)?;
-            let mut column_names = Vec::new();
-            for i in 0..rows.column_count() {
-                column_names.push(
-                    std::ffi::CString::new(rows.column_name(i).unwrap().to_string()).unwrap(),
-                );
-            }
+            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 {
@@ -857,6 +852,18 @@ impl Statement {
         .map_err(Error::from)?;
         Ok(())
     }
+
+    fn get_column_names(&self, 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)
+    }
 }
 
 /// A raw iterator over rows. The JavaScript layer wraps this in a iterable.