Merge pull request #6 from kimitrii/kimitri

Implement updates and configurations to D1 database to run migrations before end to end tests

.github/workflows/deploy-cloudflare.yml

@@ -35,8 +35,9 @@ jobs:
         with:
           version: 9
 
-      - name: Deploy
+      - name: Run Migrations and Deploy
         uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          preCommands: pnpm migration:prod
 

package.json

@@ -18,6 +18,6 @@
     "@cloudflare/workers-types": "^4.20241022.0",
     "drizzle-kit": "^0.28.1",
     "vitest": "^2.1.5",
-    "wrangler": "^3.83.0"
+    "wrangler": "^3.89.0"
   }
 }

src/db/schema.ts

@@ -2,7 +2,7 @@ import { sql } from 'drizzle-orm';
 import { sqliteTable, text } from 'drizzle-orm/sqlite-core';
 import { ulid } from 'ulid';
 
-export const customer = sqliteTable('customer', {
+export const users = sqliteTable('users', {
   id: text().$defaultFn(() => ulid()),
   name: text({ length: 255 }).notNull(),
   createdAt: text()

src/index.ts

@@ -1,9 +1,20 @@
 import { Hono } from 'hono'
+import { drizzle } from 'drizzle-orm/d1';
+import { Env } from './types/drizzleTypes';
+import { users } from './db/schema';
 
-const app = new Hono()
+const app = new Hono<{ Bindings: Env}>()
 
-app.get('/', (c) => {
-  return c.text('Hello Hono!')
+app.get('/', async (c) => {
+  const db = drizzle(c.env.DB)
+
+  await db.insert(users).values({
+    name: 'Eric',
+  })
+
+  const dbUsers = await db.select().from(users)
+
+  return c.json(dbUsers[0])
 })
 
 export default app

src/migrations/0000_migration.sql

@@ -1,4 +1,4 @@
-CREATE TABLE `customer` (
+CREATE TABLE `users` (
 	`id` text,
 	`name` text(255) NOT NULL,
 	`createdAt` text DEFAULT CURRENT_TIMESTAMP NOT NULL

src/migrations/meta/0000_snapshot.json

@@ -1,11 +1,11 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "2d97d2b1-db71-4f41-bca4-137c0d5f701f",
+  "id": "904c021b-cbb6-47a0-8e75-310e6c9a836e",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
-    "customer": {
-      "name": "customer",
+    "users": {
+      "name": "users",
       "columns": {
         "id": {
           "name": "id",

src/migrations/meta/_journal.json

@@ -5,7 +5,7 @@
     {
       "idx": 0,
       "version": "6",
-      "when": 1732221030610,
+      "when": 1732266483328,
       "tag": "0000_migration",
       "breakpoints": true
     }

src/types/env.d.ts

@@ -0,0 +1,6 @@
+declare module "cloudflare:test" {
+    interface ProvidedEnv extends Env {
+        DB: D1Database
+        TEST_MIGRATIONS: D1Migration[]
+    }
+  }

tests/sample.test.ts

@@ -1,11 +1,15 @@
-import { expect, test } from 'vitest'
+import { expect, test, describe, beforeAll } from 'vitest'
 import app from '../src'
+import { applyD1Migrations, env } from 'cloudflare:test'
 
-test('Sample E2E test', async () => {
-    const res = await app.request('/', {
-        method: 'GET'
+describe('Example', () => {
+    beforeAll(async () => {
+        await applyD1Migrations(env.DB, env.TEST_MIGRATIONS);
+    })
+
+    test('Sample E2E test', async () => {
+        const res = await app.request('/', {}, env)
+
+        expect(res.status).toBe(200)
     })
-
-    expect(res.status).toBe(200)
-    expect(await res.text()).toBe('Hello Hono!')
 })

vitest.config.ts

@@ -1,13 +1,23 @@
-import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
+import { defineWorkersConfig, readD1Migrations } from "@cloudflare/vitest-pool-workers/config";
 
-export default defineWorkersConfig({
-
-  test: {
-    globals: true,
-    poolOptions: {
-      workers: {
-        wrangler: { configPath: "./wrangler.toml" },
-      },
-    },
-  },
-});
+export default defineWorkersConfig(async () => {
+  const migrations = await readD1Migrations("./src/migrations")
+  return {
+    test: {
+      globals: true,
+      poolOptions: {
+        workers: {
+          isolatedStorage: true,
+          miniflare: {
+            bindings: {
+              TEST_MIGRATIONS: migrations
+            }
+          },
+          wrangler: {
+            configPath: "./wrangler.toml"
+          }
+        }
+      }
+    }
+  }
+})

wrangler.toml

@@ -6,5 +6,5 @@ compatibility_flags = [ "nodejs_compat" ]
 [[d1_databases]]
 binding = "DB"
 database_name = "legion-db"
-database_id = "c6bc1ae3-4c33-499d-a7d2-d10e6d667822"
+database_id = "2e03019b-39d6-4a9a-90de-90f8bd6282e2"
 migrations_dir = "./src/migrations"