Merge pull request #151 from fogbender/feat/update-drizzle

move from src/db/migrations to src/db
fogbender · Aug 12, 2024 · 426d47c · 426d47c
2 parents e4bc15d + d571f8f
commit 426d47c
Show file tree

Hide file tree

Showing 8 changed files with 175 additions and 27 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -2,4 +2,4 @@
 dist
 .vscode
 .vercel
-src/db/migrations
+src/db/meta/
diff --git a/drizzle.config.ts b/drizzle.config.ts
@@ -1,11 +1,11 @@
 import { defineConfig } from 'drizzle-kit';
 
-export const migrationsFolder = './src/db/migrations';
+export const dbFolder = './src/db';
 
 export default defineConfig({
 	dialect: 'postgresql', // supports "sqlite" | "mysql"
-	schema: './src/db',
-	out: migrationsFolder,
+	schema: `${dbFolder}/schema.ts`,
+	out: dbFolder,
 	dbCredentials: {
 		// used by "push" and "pull" commands
 		url: process.env.DATABASE_URL!,

diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "jotai": "^2.2.2",
     "js-cookie": "^3.0.5",
     "jsonwebtoken": "^9.0.1",
-    "postgres": "^3.3.4",
+    "postgres": "^3.4.4",
     "posthog-js": "^1.69.0",
     "posthog-node": "^3.1.1",
     "prettier": "^3.0.3",
@@ -69,7 +69,7 @@
     "satori": "^0.10.1",
     "solid-js": "^1.7.6",
     "stripe": "^12.12.0",
-    "tsx": "^3.12.7",
+    "tsx": "^4.17.0",
     "typescript": "^5.2.2",
     "unthunk": "^0.0.1",
     "vite-plugin-checker": "^0.6.2",

diff --git a/src/db/migrations/0000_yummy_ben_parker.sql → src/db/0000_yummy_ben_parker.sql b/src/db/migrations/0000_yummy_ben_parker.sql → src/db/0000_yummy_ben_parker.sql
diff --git a/src/db/migrations/meta/0000_snapshot.json → src/db/meta/0000_snapshot.json b/src/db/migrations/meta/0000_snapshot.json → src/db/meta/0000_snapshot.json
diff --git a/src/db/migrations/meta/_journal.json → src/db/meta/_journal.json b/src/db/migrations/meta/_journal.json → src/db/meta/_journal.json
diff --git a/src/db/scripts/migrate.ts b/src/db/scripts/migrate.ts
@@ -2,7 +2,7 @@
 // `drizzle-kit generate` but moving it to src/db/scripts seems to fix the issue
 import { migrate } from 'drizzle-orm/postgres-js/migrator';
 
-import { migrationsFolder } from '../../../drizzle.config';
+import { dbFolder as migrationsFolder } from '../../../drizzle.config';
 import { db } from '../db';
 
 console.log('Migrating database using', migrationsFolder, 'folder');

diff --git a/yarn.lock b/yarn.lock