fix(driver): return Object for JSON columns and imply UTC for timesta…

…mpz (#43)
sst · Sep 25, 2024 · f1de155 · f1de155
1 parent 063cc6f
commit f1de155
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2,993 deletions.
diff --git a/.changeset/quiet-ways-glow.md b/.changeset/quiet-ways-glow.md
@@ -0,0 +1,5 @@
+---
+"kysely-data-api": major
+---
+
+fix(driver): return Object for JSON columns and imply UTC for timestampz
diff --git a/package.json b/package.json
@@ -11,8 +11,8 @@
   "license": "MIT",
   "scripts": {
     "clean": "rm -rf dist && rm -rf test/dist",
-    "release": "yarn build && yarn changeset publish",
-    "build": "yarn clean && yarn build:esm && yarn build:cjs && ./module-fixup.sh",
+    "release": "pnpm build && pnpm changeset publish",
+    "build": "pnpm clean && pnpm build:esm && pnpm build:cjs && ./module-fixup.sh",
     "test": "AWS_SDK_LOAD_CONFIG=1 vitest",
     "build:esm": "tsc -p tsconfig-esm.json",
     "build:cjs": "tsc -p tsconfig-cjs.json"

diff --git a/src/data-api-driver.ts b/src/data-api-driver.ts
@@ -112,7 +112,7 @@ class DataApiConnection implements DatabaseConnection {
       .map((rec) =>
         Object.fromEntries(
           rec.map((val, i) => {
-            const { label, name, typeName } = r.columnMetadata![i]
+            const { label, name, typeName } = r.columnMetadata![i];
             const key = label || name;
             let value = val.isNull
               ? null
@@ -124,20 +124,23 @@ class DataApiConnection implements DatabaseConnection {
                 val.blobValue ??
                 null; // FIXME: should throw an error here?
 
-            if (typeof(value) === 'string' && typeName && ["timestamp", "timestamptz", "date"].includes(
-              typeName.toLocaleLowerCase()
-            )) {
-              value = new Date(value);
+            if (typeof value === "string" && typeName) {
+              const typeNameSafe = typeName.toLocaleLowerCase();
+              if (["timestamp", "date"].includes(typeNameSafe)) {
+                value = new Date(value);
+              } else if (typeNameSafe === "timestamptz") {
+                value = new Date(`${value}Z`);
+              } else if (["json", "jsonb"].includes(typeNameSafe)) {
+                value = JSON.parse(value);
+              }
             }
 
             return [key, value];
           })
         )
       );
-    const result: QueryResult<O> = {
-      rows: rows || [],
-    };
-    return result;
+
+    return { rows: rows ?? [] };
   }
 
   async *streamQuery<O>(