Added MySQL support

Author: thdxr

README.md

@@ -0,0 +1,19 @@
+## Kysely Data Api
+
+This library adds AWS RDS Data Api support for [kysely](github.com/koskimas/kysely). It has support for both MySQL and Postgres
+
+### Usage
+
+```typescript
+const dataApi = new DataApiDialect({
+  mode: "mysql",
+  driver: {
+    client: new RDSDataService(),
+    database: "bench",
+    secretArn: "<arn of secret containing credentials",
+    resourceArn: "<arn of database>",
+  },
+});
+
+export const db = new Kysely<Database>({ dialect: dataApi });
+```

package.json

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

src/data-api-dialect.ts

@@ -5,9 +5,13 @@ import { Dialect } from "kysely";
 import { DatabaseIntrospector } from "kysely";
 import { PostgresIntrospector } from "kysely";
 import { DataApiDriver, DataApiDriverConfig } from "./data-api-driver";
-import { DataApiQueryCompiler } from "./data-api-query-compiler";
+import {
+  PostgresDataApiQueryCompiler,
+  MysqlDataApiQueryCompiler,
+} from "./data-api-query-compiler";
 
 type DataApiDialectConfig = {
+  mode: "postgres" | "mysql";
   driver: DataApiDriverConfig;
 };
 
@@ -27,8 +31,11 @@ export class DataApiDialect implements Dialect {
   }
 
   createQueryCompiler(): QueryCompiler {
-    // The default query compiler is for postgres dialect.
-    return new DataApiQueryCompiler();
+    if (this.#config.mode === "postgres")
+      return new PostgresDataApiQueryCompiler();
+    if (this.#config.mode === "mysql") return new MysqlDataApiQueryCompiler();
+
+    throw new Error("Unknown mode " + this.#config.mode);
   }
 
   createIntrospector(db: Kysely<any>): DatabaseIntrospector {

src/data-api-driver.ts

@@ -98,6 +98,7 @@ class DataApiConnection implements DatabaseConnection {
     if (!r.columnMetadata) {
       return {
         numUpdatedOrDeletedRows: r.numberOfRecordsUpdated,
+        rows: [],
       };
     }
     const rows = r.records
@@ -117,7 +118,7 @@ class DataApiConnection implements DatabaseConnection {
           ) as O
       );
     const result: QueryResult<O> = {
-      rows,
+      rows: rows || [],
     };
     return result;
   }

src/data-api-query-compiler.ts

@@ -1,7 +1,22 @@
 import { Field } from "aws-sdk/clients/rdsdataservice";
-import { PostgresQueryCompiler } from "kysely";
+import { MysqlQueryCompiler, PostgresQueryCompiler } from "kysely";
 
-export class DataApiQueryCompiler extends PostgresQueryCompiler {
+export class PostgresDataApiQueryCompiler extends PostgresQueryCompiler {
+  protected override appendValue(value: any) {
+    const name = this.numBindings;
+    this.append(this.getCurrentParameterPlaceholder());
+    this.addBinding({
+      name: name.toString(),
+      value: serialize(value),
+    });
+  }
+
+  protected override getCurrentParameterPlaceholder() {
+    return ":" + this.numBindings;
+  }
+}
+
+export class MysqlDataApiQueryCompiler extends MysqlQueryCompiler {
   protected override appendValue(value: any) {
     const name = this.numBindings;
     this.append(this.getCurrentParameterPlaceholder());

yarn.lock

@@ -2003,10 +2003,10 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-kysely@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.7.1.tgz#64aace1262f86114c89950f01996c5d46a40b8d4"
-  integrity sha512-PPUIaggFHNxkAdUCfdlr/94QsT4IRQvRXgP6oa/lrcKScUTMnaaYxg3cTlrPj8ZN5uoHu5YzTF+8gBGhtHHcuw==
+kysely@^0.7.7:
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.7.7.tgz#7812f834be5c63c273dcdf1907afec7804813ee5"
+  integrity sha512-CVOmPJRkkU9Gsn5YXuuV/RS/0UsEhcP+/C3MV2durH21iGHIkJzxpUIf0ykVdrih6oUhw6wj2FbBSOkVglMR+A==
   dependencies:
     "@types/node" "^16.10.9"