Fix D1 insert() to respect response schema

Author: G4brym

src/Builder.ts

@@ -58,10 +58,12 @@ export class QueryBuilder<GenericResult, GenericResultOne> {
       args = args.concat(this._parse_arguments(params.data))
     }
 
+    const fetchType = Array.isArray(params.data) ? FetchTypes.ALL : FetchTypes.ONE
+
     return this.execute({
       query: this._insert(params),
       arguments: args,
-      fetchType: Array.isArray(params.data) ? FetchTypes.ALL : FetchTypes.ONE,
+      fetchType: fetchType,
     })
   }
 

src/databases/d1.ts

@@ -22,10 +22,17 @@ export class D1QB extends QueryBuilder<D1Result, D1ResultOne> {
       stmt = stmt.bind(...params.arguments)
     }
 
-    if (params.fetchType === FetchTypes.ONE) {
-      return stmt.first()
-    } else if (params.fetchType === FetchTypes.ALL) {
-      return stmt.all()
+    if (params.fetchType === FetchTypes.ONE || params.fetchType === FetchTypes.ALL) {
+      const resp = await stmt.all()
+
+      return {
+        changes: resp.meta?.changes,
+        duration: resp.meta?.duration,
+        last_row_id: resp.meta?.last_row_id,
+        served_by: resp.meta?.served_by,
+        success: resp.success,
+        results: params.fetchType === FetchTypes.ONE && resp.results.length > 0 ? resp.results[0] : resp.results,
+      }
     }
 
     return stmt.run()

src/databases/pg.ts

@@ -45,7 +45,7 @@ export class PGQB extends QueryBuilder<PGResult, PGResultOne> {
         command: result.command,
         lastRowId: result.oid,
         rowCount: result.rowCount,
-        results: result.rows,
+        results: params.fetchType === FetchTypes.ONE && result.rows.length > 0 ? result.rows[0] : result.rows,
       }
     }