Merge pull request #40 from woconnor/master

Fix build and test with latest Kysely

Author: jayair

.changeset/tall-goats-destroy.md

@@ -0,0 +1,5 @@
+---
+"kysely-data-api": patch
+---
+
+Fix build and test with latest Kysely

package.json

@@ -18,19 +18,20 @@
     "build:cjs": "tsc -p tsconfig-cjs.json"
   },
   "devDependencies": {
-    "@aws-sdk/client-rds-data": "^3.218.0",
+    "@aws-sdk/client-rds-data": "^3.549.0",
     "@changesets/changelog-github": "^0.4.5",
     "@changesets/cli": "^2.23.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/node": "^18.14.2",
-    "kysely": "^0.26.0",
+    "kysely": "^0.27.3",
     "perf_hooks": "^0.0.1",
     "prettier": "^2.8.4",
+    "typescript": "^5.4.4",
     "vitest": "^0.18.1"
   },
   "peerDependencies": {
     "@aws-sdk/client-rds-data": "3.x",
-    "kysely": "^0.26.0"
+    "kysely": "^0.27.3"
   },
   "files": [
     "dist"

src/data-api-query-compiler.ts

@@ -58,7 +58,7 @@ function serialize(value: unknown): Pick<SqlParameter, "typeHint" | "value"> {
         && typeof ((value as RSU).value as RSU).stringValue === "string"
       )
         ((value as RSU).value as RSU).stringValue = fixStringValue(
-          (value as RSS).typeHint,
+          (value as RSS).typeHint as SqlParameter["typeHint"],
           ((value as RSU).value as RSS).stringValue,
         );
       return value;

src/postgres-introspector.ts

@@ -137,7 +137,7 @@ interface RawSchemaMetadata {
 interface RawColumnMetadata {
   column: string;
   table: string;
-  is_view: string;
+  is_view: boolean;
   schema: string;
   not_null: boolean;
   has_default: boolean;

test/harness.ts

@@ -1,8 +1,9 @@
 import { RDSData } from "@aws-sdk/client-rds-data";
-import { ColumnType, Generated, Kysely } from "kysely";
+import { ColumnType, Generated, Kysely, Migrator, FileMigrationProvider } from "kysely";
 import { DataApiDialect } from "../src";
 import { DataApiDriverConfig } from "../src/data-api-driver";
 import path from "path";
+import { promises as fs } from "fs";
 
 const TEST_DATABASE = "scratch";
 
@@ -71,7 +72,29 @@ export async function migrate() {
       resourceArn: opts.resourceArn,
     });
 
-  await db.migration.migrateToLatest(path.resolve("./test/migrations"));
+  const migrator = new Migrator({
+    db,
+    provider: new FileMigrationProvider({
+      fs,
+      path,
+      migrationFolder: path.join(__dirname, "migrations"),
+    }),
+  })
+
+  const { error, results } = await migrator.migrateToLatest();
+
+  results?.forEach((it) => {
+    if (it.status === "Success") {
+      console.log(`migration "${it.migrationName}" was executed successfully`);
+    } else if (it.status === "Error") {
+      console.error(`failed to execute migration "${it.migrationName}"`);
+    }
+  })
+
+  if (error) {
+    console.error("failed to migrate");
+    console.error(error);
+  }
 }
 
 export async function reset() {

test/migrations/test-migration1.js

@@ -1,15 +1,15 @@
 async function up(db) {
   await db.schema
     .createTable("person")
-    .addColumn("id", "integer", (col) => col.increments().primaryKey())
+    .addColumn("id", "serial", (col) => col.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("id", "serial", (col) => col.primaryKey())
     .addColumn("name", "varchar", (col) => col.notNull().unique())
     .addColumn("owner_id", "integer", (col) => col.references("person.id").onDelete("cascade"))
     .addColumn("species", "varchar")

test/temporary.test.ts

@@ -32,6 +32,11 @@ it("insert and read", async () => {
 });
 
 it("alias return", async () => {
+  await db
+    .insertInto("person")
+    .values(PERSON)
+    .execute();
+
   const result = await db
     .selectFrom("person")
     .select(["first_name as first", "last_name as last"])