Fix Statement.columns() for SELECT 1-like queries

Author: penberg

integration-tests/tests/async.test.js

@@ -156,7 +156,20 @@ test.serial("Statement.all() [statement safe integers]", async (t) => {
 test.serial("Statement.columns()", async (t) => {
   const db = t.context.db;
 
-  const stmt = await db.prepare("SELECT * FROM users WHERE id = ?");
+  var stmt = undefined;
+
+  stmt = await db.prepare("SELECT 1");
+  t.deepEqual(stmt.columns(), [
+    {
+      column: null,
+      database: null,
+      name: '1',
+      table: null,
+      type: null,
+    },
+  ]);
+
+  stmt = await db.prepare("SELECT * FROM users WHERE id = ?");
   t.deepEqual(stmt.columns(), [
     {
       column: "id",

integration-tests/tests/sync.test.js

@@ -154,7 +154,20 @@ test.serial("Statement.all() [statement safe integers]", async (t) => {
 test.serial("Statement.columns()", async (t) => {
   const db = t.context.db;
 
-  const stmt = db.prepare("SELECT * FROM users WHERE id = ?");
+  var stmt = undefined;
+
+  stmt = db.prepare("SELECT 1");
+  t.deepEqual(stmt.columns(), [
+    {
+      column: null,
+      database: null,
+      name: '1',
+      table: null,
+      type: null,
+    },
+  ]);
+
+  stmt = db.prepare("SELECT * FROM users WHERE id = ?");
   t.deepEqual(stmt.columns(), [
     {
       column: "id",

src/lib.rs

@@ -351,14 +351,30 @@ impl Statement {
         for (i, col) in stmt.stmt.columns().iter().enumerate() {
             let column = cx.empty_object();
             let column_name = cx.string(col.name());
-            column.set(&mut cx, "column", column_name)?;
-            let column_origin_name = cx.string(col.origin_name().unwrap());
-            column.set(&mut cx, "name", column_origin_name)?;
-            let column_table_name = cx.string(col.table_name().unwrap());
+            column.set(&mut cx, "name", column_name)?;
+            let column_origin_name: Handle<'_, JsValue> = if let Some(origin_name) = col.origin_name() {
+                cx.string(origin_name).upcast()
+            } else {
+                cx.null().upcast()
+            };
+            column.set(&mut cx, "column", column_origin_name)?;
+            let column_table_name: Handle<'_, JsValue> = if let Some(table_name) = col.table_name() {
+                cx.string(table_name).upcast()
+            } else {
+                cx.null().upcast()
+            };
             column.set(&mut cx, "table", column_table_name)?;
-            let column_database_name = cx.string(col.database_name().unwrap());
+            let column_database_name: Handle<'_, JsValue> = if let Some(database_name) = col.database_name() {
+                cx.string(database_name).upcast()
+            } else {
+                cx.null().upcast()
+            };
             column.set(&mut cx, "database", column_database_name)?;
-            let column_decl_type = cx.string(col.decl_type().unwrap());
+            let column_decl_type: Handle<'_, JsValue> = if let Some(decl_type) = col.decl_type() {
+                cx.string(decl_type).upcast()
+            } else {
+                cx.null().upcast()
+            };
             column.set(&mut cx, "type", column_decl_type)?;
             result.set(&mut cx, i as u32, column)?;
         }