Migrations working

Author: thdxr

jest.config.js

@@ -2,4 +2,5 @@ module.exports = {
   transform: {
     "\\.ts$": "esbuild-runner/jest",
   },
+  setupFilesAfterEnv: ["./test/setup.js"],
 };

package.json

@@ -14,6 +14,7 @@
   "scripts": {
     "clean": "rm -rf dist && rm -rf test/dist",
     "build": "yarn clean && yarn build:esm && yarn build:cjs && ./module-fixup.sh",
+    "test": "AWS_SDK_LOAD_CONFIG=1 jest",
     "build:esm": "tsc -p tsconfig-esm.json",
     "build:cjs": "tsc -p tsconfig-cjs.json"
   },
@@ -25,7 +26,8 @@
     "esbuild": "^0.13.6",
     "esbuild-runner": "^2.2.1",
     "jest": "^27.2.5",
-    "kysely": "^0.6.2"
+    "kysely": "0.6.2",
+    "perf_hooks": "^0.0.1"
   },
   "peerDependencies": {
     "aws-sdk": "^2.1008.0",

src/data-api-dialect.ts

@@ -12,7 +12,7 @@ type DataApiDialectConfig = {
 };
 
 export class DataApiDialect implements Dialect {
-  #config: DataApiDialectConfig;
+  readonly #config: DataApiDialectConfig;
 
   constructor(config: DataApiDialectConfig) {
     this.#config = config;
@@ -28,7 +28,6 @@ export class DataApiDialect implements Dialect {
   }
 
   createIntrospector(db: Kysely<any>): DatabaseIntrospector {
-    console.log("Introspector");
     return new PostgresIntrospector(db);
   }
 }

src/data-api-query-compiler.ts

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

test/harness.ts

@@ -2,6 +2,7 @@ import RDSDataService from "aws-sdk/clients/rdsdataservice";
 import { Kysely } from "kysely";
 import { DataApiDialect } from "../src";
 import { DataApiDriverConfig } from "../src/data-api-driver";
+import path from "path";
 
 const TEST_DATABASE = "scratch";
 
@@ -47,7 +48,7 @@ export async function reset() {
   await opts.client
     .executeStatement({
       sql: `
-      SELECT pg_terminate_backend(pid) FROM  pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = '${TEST_DATABASE}'`,
+      SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = '${TEST_DATABASE}'`,
       database: "postgres",
       secretArn: opts.secretArn,
       resourceArn: opts.resourceArn,
@@ -72,27 +73,5 @@ export async function reset() {
     })
     .promise();
 
-  await db.schema
-    .createTable("person")
-    .addColumn("id", "integer", (col) => col.increments().primaryKey())
-    .addColumn("first_name", "varchar")
-    .addColumn("last_name", "varchar")
-    .addColumn("gender", "varchar(50)")
-    .execute();
-
-  await db.schema
-    .createTable("pet")
-    .addColumn("id", "integer", (col) => col.increments().primaryKey())
-    .addColumn("name", "varchar", (col) => col.notNull().unique())
-    .addColumn("owner_id", "integer", (col) =>
-      col.references("person.id").onDelete("cascade")
-    )
-    .addColumn("species", "varchar")
-    .execute();
-
-  await db.schema
-    .createIndex("pet_owner_id_index")
-    .on("pet")
-    .column("owner_id")
-    .execute();
+  await db.migration.migrateToLatest(path.resolve("./test/migrations"));
 }

test/migrations/test-migration1.js

@@ -0,0 +1,35 @@
+async function up(db) {
+  await db.schema
+    .createTable("person")
+    .addColumn("id", "integer", (col) => col.increments().primaryKey())
+    .addColumn("first_name", "varchar")
+    .addColumn("last_name", "varchar")
+    .addColumn("gender", "varchar(50)")
+    .execute();
+
+  await db.schema
+    .createTable("pet")
+    .addColumn("id", "integer", (col) => col.increments().primaryKey())
+    .addColumn("name", "varchar", (col) => col.notNull().unique())
+    .addColumn("owner_id", "integer", (col) =>
+      col.references("person.id").onDelete("cascade")
+    )
+    .addColumn("species", "varchar")
+    .execute();
+
+  await db.schema
+    .createIndex("pet_owner_id_index")
+    .on("pet")
+    .column("owner_id")
+    .execute();
+}
+
+async function down(db) {
+  await db.schema.dropTable("person").execute();
+  await db.schema.dropTable("pet").execute();
+}
+
+module.exports = {
+  up,
+  down,
+};

test/setup.js

@@ -0,0 +1 @@
+global.performance = require("perf_hooks").performance;

test/temporary.test.ts

@@ -2,12 +2,8 @@ import { reset, db } from "./harness";
 
 jest.setTimeout(1000 * 60);
 
-beforeAll(async () => {
-  await reset();
-});
-
 beforeEach(async () => {
-  await db.deleteFrom("person").execute();
+  await reset();
 });
 
 const person = {

yarn.lock

@@ -2003,7 +2003,7 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-kysely@^0.6.2:
+kysely@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.6.2.tgz#becb93baeb62b54e49ea5b752524428ab78fc0c6"
   integrity sha512-TAQp59GT9R4VGISI/l15BouKcTbuTJfaLygOquDfIZ7U8u7BUGFOfhpOZlpq81YmrRd+ZMuTKibmYQ76MpZRlQ==
@@ -2210,6 +2210,11 @@ path-parse@^1.0.6:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+perf_hooks@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/perf_hooks/-/perf_hooks-0.0.1.tgz#253e7e18b71fcc0390fd3afb2cd7cf1685df040c"
+  integrity sha512-qG/D9iA4KDme+KF4vCObJy6Bouu3BlQnmJ8jPydVPm32NJBD9ZK1ZNgXSYaZKHkVC1sKSqUiLgFvAZPUiIEnBw==
+
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"