Updates for latest version

Author: thdxr

package.json

@@ -26,7 +26,7 @@
     "esbuild": "^0.13.6",
     "esbuild-runner": "^2.2.1",
     "jest": "^27.2.5",
-    "kysely": "^0.7.7",
+    "kysely": "^0.16.5",
     "perf_hooks": "^0.0.1"
   },
   "peerDependencies": {

src/data-api-driver.ts

@@ -24,14 +24,26 @@ export class DataApiDriver implements Driver {
   }
 
   async beginTransaction(conn: DataApiConnection) {
+    if ("connection" in conn) {
+      await (conn as any).connection.beginTransaction();
+      return;
+    }
     await conn.beginTransaction();
   }
 
   async commitTransaction(conn: DataApiConnection) {
+    if ("connection" in conn) {
+      await (conn as any).connection.commitTransaction();
+      return;
+    }
     await conn.commitTransaction();
   }
 
   async rollbackTransaction(conn: DataApiConnection) {
+    if ("connection" in conn) {
+      await (conn as any).connection.rollbackTransaction();
+      return;
+    }
     await conn.rollbackTransaction();
   }
 
@@ -48,7 +60,7 @@ class DataApiConnection implements DatabaseConnection {
     this.#config = config;
   }
 
-  async beginTransaction() {
+  public async beginTransaction() {
     const r = await this.#config.client
       .beginTransaction({
         secretArn: this.#config.secretArn,
@@ -59,7 +71,7 @@ class DataApiConnection implements DatabaseConnection {
     this.#transactionId = r.transactionId;
   }
 
-  async commitTransaction() {
+  public async commitTransaction() {
     if (!this.#transactionId)
       throw new Error("Cannot commit a transaction before creating it");
     await this.#config.client
@@ -71,7 +83,7 @@ class DataApiConnection implements DatabaseConnection {
       .promise();
   }
 
-  async rollbackTransaction() {
+  public async rollbackTransaction() {
     if (!this.#transactionId)
       throw new Error("Cannot rollback a transaction before creating it");
     await this.#config.client
@@ -90,14 +102,14 @@ class DataApiConnection implements DatabaseConnection {
         secretArn: this.#config.secretArn,
         resourceArn: this.#config.resourceArn,
         sql: compiledQuery.sql,
-        parameters: compiledQuery.bindings as any,
+        parameters: compiledQuery.parameters as any,
         database: this.#config.database,
         includeResultMetadata: true,
       })
       .promise();
     if (!r.columnMetadata) {
       return {
-        numUpdatedOrDeletedRows: r.numberOfRecordsUpdated,
+        numUpdatedOrDeletedRows: BigInt(r.numberOfRecordsUpdated || 0),
         rows: [],
       };
     }

src/data-api-query-compiler.ts

@@ -3,31 +3,31 @@ import { MysqlQueryCompiler, PostgresQueryCompiler } from "kysely";
 
 export class PostgresDataApiQueryCompiler extends PostgresQueryCompiler {
   protected override appendValue(value: any) {
-    const name = this.numBindings;
+    const name = this.numParameters;
     this.append(this.getCurrentParameterPlaceholder());
-    this.addBinding({
+    this.addParameter({
       name: name.toString(),
       value: serialize(value),
     });
   }
 
   protected override getCurrentParameterPlaceholder() {
-    return ":" + this.numBindings;
+    return ":" + this.numParameters;
   }
 }
 
 export class MysqlDataApiQueryCompiler extends MysqlQueryCompiler {
   protected override appendValue(value: any) {
-    const name = this.numBindings;
+    const name = this.numParameters;
     this.append(this.getCurrentParameterPlaceholder());
-    this.addBinding({
+    this.addParameter({
       name: name.toString(),
       value: serialize(value),
     });
   }
 
   protected override getCurrentParameterPlaceholder() {
-    return ":" + this.numBindings;
+    return ":" + this.addParameter;
   }
 }
 

yarn.lock

@@ -578,11 +578,16 @@
     jest-diff "^27.0.0"
     pretty-format "^27.0.0"
 
-"@types/node@*", "@types/node@^16.10.9", "@types/node@^16.11.0":
+"@types/node@*", "@types/node@^16.11.0":
   version "16.11.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.0.tgz#4b95f2327bacd1ef8f08d8ceda193039c5d7f52e"
   integrity sha512-8MLkBIYQMuhRBQzGN9875bYsOhPnf/0rgXGo66S2FemHkhbn9qtsz9ywV1iCG+vbjigE4WUNVvw37Dx+L0qsPg==
 
+"@types/node@^16.11.9":
+  version "16.11.19"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.19.tgz#1afa165146997b8286b6eabcb1c2d50729055169"
+  integrity sha512-BPAcfDPoHlRQNKktbsbnpACGdypPFBuX4xQlsWDE7B8XXcfII+SpOLay3/qZmCLb39kV5S1RTYwXdkx2lwLYng==
+
 "@types/prettier@^2.1.5":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb"
@@ -2003,12 +2008,12 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-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==
+kysely@^0.16.5:
+  version "0.16.5"
+  resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.16.5.tgz#e163040352b8c6f5e6f93f3f82b633faa247ccc2"
+  integrity sha512-rzjbUZ6X17x+gTcY0KdsijkmyF4yGvNeEjJ6c1ARG/8cUMMAU69KjUBKRdj3YhxzLXvr+yct/kAIPOw+F/kF0A==
   dependencies:
-    "@types/node" "^16.10.9"
+    "@types/node" "^16.11.9"
 
 leven@^3.1.0:
   version "3.1.0"