update sqlite return types to be more ergonomic

Signed-off-by: karthik2804 <karthik.ganeshram@fermyon.com>
fermyon · Sep 1, 2023 · fc4d65f · fc4d65f
1 parent 5caf421
commit fc4d65f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/spin-js-engine/src/lib.rs b/crates/spin-js-engine/src/lib.rs
@@ -746,25 +746,25 @@ fn open_sqlite(context: &Context, _this: &Value, args: &[Value]) -> Result<Value
 
                 let mut serializer = Serializer::from_context(context)?;
                 let columns = result.columns;
-                columns.serialize(&mut serializer)?;
-                let js_columns = serializer.value;
-
                 let js_rows = context.array_value()?;
                 for row in result.rows {
-                    let js_row = context.array_value()?;
-                    for value in row.values {
+                    let js_row = context.object_value()?;
+                    for (index, value ) in row.values.iter().enumerate() {
                         let js_value = match value {
                             sqlite::ValueResult::Null => context.null_value()?,
-                            sqlite::ValueResult::Integer(i) => context.value_from_i64(i)?,
-                            sqlite::ValueResult::Real(r) => context.value_from_f64(r)?,
+                            sqlite::ValueResult::Integer(i) => context.value_from_i64(*i)?,
+                            sqlite::ValueResult::Real(r) => context.value_from_f64(*r)?,
                             sqlite::ValueResult::Text(s) => context.value_from_str(&s)?,
                             sqlite::ValueResult::Blob(b) => context.array_buffer_value(&b)?,
                         };
-                        js_row.append_property(js_value)?;
+                        js_row.set_property(columns[index].to_string(),js_value)?;
                     }
                     js_rows.append_property(js_row)?;
                 }
 
+                columns.serialize(&mut serializer)?;
+                let js_columns = serializer.value;
+
                 let result = context.object_value()?;
                 result.set_property("columns", js_columns)?;
                 result.set_property("rows", js_rows)?;

diff --git a/spin-sdk/src/modules/spinSdk.ts b/spin-sdk/src/modules/spinSdk.ts
@@ -18,11 +18,11 @@ interface KvStore {
 type SqliteParam = number | string | ArrayBuffer
 type SqliteValue = null | number | string | ArrayBuffer
 
+
+type SqliteRow = Record<string, SqliteValue>
 interface SqliteReturn {
     columns: string[],
-    rows: [
-        [SqliteValue]
-    ]
+    rows: SqliteRow[]
 }
 
 interface SqliteStore {