A bunch of small improvements and fixes (#2)

Author: koskimas

package.json

@@ -26,12 +26,12 @@
     "esbuild": "^0.13.6",
     "esbuild-runner": "^2.2.1",
     "jest": "^27.2.5",
-    "kysely": "^0.16.5",
+    "kysely": "^0.16.6",
     "perf_hooks": "^0.0.1"
   },
   "peerDependencies": {
     "aws-sdk": "^2.1008.0",
-    "kysely": "^0.7.7"
+    "kysely": "^0.16.6"
   },
   "files": [
     "dist"

src/data-api-dialect.ts

@@ -1,9 +1,14 @@
-import { Driver, PostgresAdapter } from "kysely";
-import { Kysely } from "kysely";
-import { QueryCompiler } from "kysely";
-import { Dialect } from "kysely";
-import { DatabaseIntrospector } from "kysely";
-import { PostgresIntrospector } from "kysely";
+import {
+  Driver,
+  MysqlAdapter,
+  MysqlIntrospector,
+  PostgresAdapter,
+  Kysely,
+  QueryCompiler,
+  Dialect,
+  DatabaseIntrospector,
+  PostgresIntrospector,
+} from "kysely";
 import { DataApiDriver, DataApiDriverConfig } from "./data-api-driver";
 import {
   PostgresDataApiQueryCompiler,
@@ -23,7 +28,10 @@ export class DataApiDialect implements Dialect {
   }
 
   createAdapter() {
-    return new PostgresAdapter();
+    if (this.#config.mode === "postgres") return new PostgresAdapter();
+    if (this.#config.mode === "mysql") return new MysqlAdapter();
+
+    throw new Error("Unknown mode " + this.#config.mode);
   }
 
   createDriver(): Driver {
@@ -39,6 +47,9 @@ export class DataApiDialect implements Dialect {
   }
 
   createIntrospector(db: Kysely<any>): DatabaseIntrospector {
-    return new PostgresIntrospector(db);
+    if (this.#config.mode === "postgres") return new PostgresIntrospector(db);
+    if (this.#config.mode === "mysql") return new MysqlIntrospector(db);
+
+    throw new Error("Unknown mode " + this.#config.mode);
   }
 }

src/data-api-driver.ts

@@ -120,14 +120,14 @@ class DataApiConnection implements DatabaseConnection {
           Object.fromEntries(
             rec.map((val, i) => [
               r.columnMetadata![i].name,
-              val.stringValue ||
-                val.blobValue ||
-                val.longValue ||
-                val.arrayValue ||
-                val.doubleValue ||
+              val.stringValue ??
+                val.blobValue ??
+                val.longValue ??
+                val.arrayValue ??
+                val.doubleValue ??
                 (val.isNull ? null : val.booleanValue),
             ])
-          ) as O
+          ) as unknown as O
       );
     const result: QueryResult<O> = {
       rows: rows || [],

src/data-api-query-compiler.ts

@@ -27,17 +27,22 @@ export class MysqlDataApiQueryCompiler extends MysqlQueryCompiler {
   }
 
   protected override getCurrentParameterPlaceholder() {
-    return ":" + this.addParameter;
+    return ":" + this.numParameters;
   }
 }
 
 function serialize(value: any): Field {
   if (value == null) return { isNull: true };
   switch (typeof value) {
     case "number":
-      return {
-        longValue: value,
-      };
+      if (Number.isInteger(value))
+        return {
+          longValue: value,
+        };
+      else
+        return {
+          doubleValue: value,
+        };
     case "bigint":
       return {
         doubleValue: Number(value),
@@ -50,6 +55,12 @@ function serialize(value: any): Field {
       return {
         booleanValue: value,
       };
+    case "object":
+      if (Buffer.isBuffer(value))
+        return {
+          blobValue: value,
+        };
+      else break;
   }
 
   throw "wtf";