Share a single database instance

Author: snacks02

Diff for: .github/workflows/ci.yaml

@@ -13,4 +13,4 @@ jobs:
       - run: docker compose run api pnpm kysely-test migrate:latest
 
       - run: docker compose run api pnpm prettier --check .
-      - run: docker compose run api pnpm vitest run
+      - run: docker compose run api pnpm test run

Diff for: README.md

@@ -20,5 +20,5 @@
 docker compose run api pnpm kysely-codegen
 docker compose run api pnpm prettier --check .
 docker compose run api pnpm prettier --write .
-docker compose run api pnpm vitest
+docker compose run api pnpm test
 ```

Diff for: kysely.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig } from "kysely-ctl";
-import { newDialect } from "./src/database.js";
+import { database } from "./src/database.js";
 
 export default defineConfig({
-  dialect: newDialect(),
+  kysely: database,
 });

Diff for: package.json

@@ -4,7 +4,8 @@
   "scripts": {
     "dev": "tsx watch src/index.ts",
     "kysely-codegen": "kysely-codegen --env-file kysely-codegen.config.env --out-file kysely-codegen.ts",
-    "kysely-test": "SQUIGLINK_POSTGRES_DATABASE=\"$SQUIGLINK_POSTGRES_TEST_DATABASE\" kysely"
+    "kysely-test": "SQUIGLINK_POSTGRES_DATABASE=\"$SQUIGLINK_POSTGRES_TEST_DATABASE\" kysely",
+    "test": "SQUIGLINK_POSTGRES_DATABASE=\"$SQUIGLINK_POSTGRES_TEST_DATABASE\" vitest"
   },
   "dependencies": {
     "@hono/node-server": "^1.13.7",

Diff for: src/database.ts

@@ -3,26 +3,18 @@ import { Kysely, PostgresDialect } from "kysely";
 import pg from "pg";
 import type { Database } from "./types.js";
 
-const int8TypeId = 20;
-pg.types.setTypeParser(int8TypeId, (value) => parseInt(value, 10));
-
 const { Pool } = pg;
 
-export function newDatabase(): Kysely<Database> {
-  return new Kysely<Database>({ dialect: newDialect() });
-}
-
-export function newDialect(): PostgresDialect {
-  return new PostgresDialect({
-    pool: newPool(),
-  });
-}
+const int8TypeId = 20;
+pg.types.setTypeParser(int8TypeId, (value) => parseInt(value, 10));
 
-export function newPool(): pg.Pool {
-  return new Pool({
-    database: env.SQUIGLINK_POSTGRES_DATABASE,
-    host: env.SQUIGLINK_POSTGRES_HOST,
-    password: env.SQUIGLINK_POSTGRES_PASSWORD,
-    user: env.SQUIGLINK_POSTGRES_USER,
-  });
-}
+export const database = new Kysely<Database>({
+  dialect: new PostgresDialect({
+    pool: new Pool({
+      database: env.SQUIGLINK_POSTGRES_DATABASE,
+      host: env.SQUIGLINK_POSTGRES_HOST,
+      password: env.SQUIGLINK_POSTGRES_PASSWORD,
+      user: env.SQUIGLINK_POSTGRES_USER,
+    }),
+  }),
+});

Diff for: src/middlewares/database_middleware.ts

@@ -1,14 +1,13 @@
 import { createMiddleware } from "hono/factory";
+import { database } from "../database.js";
 import { Kysely } from "kysely";
-import { newDatabase } from "../database.js";
 import type { Database } from "../types.js";
 
 export const databaseMiddleware = createMiddleware<{
   Variables: {
     database: Kysely<Database>;
   };
 }>(async (context, next) => {
-  const database = newDatabase();
   context.set("database", database);
   await next();
 });

Diff for: src/routes/brands.test.ts

@@ -1,11 +1,9 @@
 import { application } from "../application.js";
+import { database } from "../database.js";
 import { describe, expect, test } from "vitest";
-import { newDatabase } from "../database.js";
 
 describe("GET /brands", () => {
   test("it works", async () => {
-    const database = newDatabase();
-
     let brandIds = [];
 
     for (let brandIndex = 1; brandIndex <= 11; brandIndex++) {

Diff for: src/routes/databases.test.ts

@@ -1,11 +1,9 @@
 import { application } from "../application.js";
+import { database } from "../database.js";
 import { describe, expect, test } from "vitest";
-import { newDatabase } from "../database.js";
 
 describe("GET /databases", () => {
   test("it works", async () => {
-    const database = newDatabase();
-
     let userIds = [];
     let databaseIds = [];
 

Diff for: src/routes/models.test.ts

@@ -1,11 +1,9 @@
 import { application } from "../application.js";
+import { database } from "../database.js";
 import { describe, expect, test } from "vitest";
-import { newDatabase } from "../database.js";
 
 describe("GET /models", () => {
   test("it works", async () => {
-    const database = newDatabase();
-
     let brandIds = [];
     let modelIds = [];
 

Diff for: src/test_helper.ts

@@ -1,18 +1,8 @@
-import { beforeAll, beforeEach, vi } from "vitest";
-import { env } from "process";
-import { newDatabase } from "./database.js";
+import { beforeEach } from "vitest";
+import { database } from "./database.js";
 import { sql } from "kysely";
 
-beforeAll(() => {
-  vi.stubEnv(
-    "SQUIGLINK_POSTGRES_DATABASE",
-    env.SQUIGLINK_POSTGRES_TEST_DATABASE,
-  );
-});
-
 beforeEach(async () => {
-  const database = newDatabase();
-
   await sql`truncate table ${sql.table("brands")} cascade`.execute(database);
   await sql`truncate table ${sql.table("databases")} cascade`.execute(database);
   await sql`truncate table ${sql.table("models")} cascade`.execute(database);