fix: make database migrations work

un · Aug 27, 2024 · e26471c · e26471c
1 parent c6ed2d7
commit e26471c
Show file tree

Hide file tree

Showing 17 changed files with 3,448 additions and 11,595 deletions.
diff --git a/.env.local.example b/.env.local.example
@@ -82,7 +82,6 @@ DB_PLANETSCALE_DATABASE=planetscale
 DB_PLANETSCALE_HOST=localhost:3900
 DB_PLANETSCALE_USERNAME=root
 DB_PLANETSCALE_PASSWORD=planetscale
-DB_PLANETSCALE_DATABASE=planetscale
 DB_REDIS_CONNECTION_STRING="redis://localhost:3901"
 
 

diff --git a/package.json b/package.json
@@ -38,17 +38,17 @@
     "db:push": "dotenv -e .env.local -- pnpm --dir packages/database db:push",
     "db:studio": "dotenv -e .env.local -- turbo run db:studio",
     "db:generate": "dotenv -e .env.local -- turbo run db:generate",
+    "db:migrate": "dotenv -e .env.local -- turbo run db:migrate",
     "db:up": "dotenv -e .env.local -- turbo run db:up",
     "db:check": "dotenv -e .env.local -- turbo run db:generate",
     "db:drop": "dotenv -e .env.local -- turbo run db:drop",
     "start:all:r": "infisical run --env=remote -- turbo run start",
     "dev:r": "infisical run --env=remote -- turbo run dev",
     "dev:spaces": "infisical run --env=spacesremote -- turbo run dev",
-    "db:push:r": "infisical run --env=remote -- pnpm --dir packages/database db:push:r",
+    "db:push:r": "infisical run --env=remote -- pnpm --dir packages/database db:push",
     "db:studio:r": "infisical run --env=remote -- turbo run db:studio",
     "db:generate:r": "infisical run --env=remote -- turbo run db:generate",
     "db:up:r": "infisical run --env=remote -- turbo run db:up",
-    "db:check:r": "infisical run --env=remote -- turbo run db:generate",
     "db:drop:r": "infisical run --env=remote -- turbo run db:drop",
     "ee:dev:r": "infisical run --env=remote -- turbo run ee:dev",
     "ee:check": "infisical run --env=remote -- turbo run ee:check",

diff --git a/packages/database/drizzle.config.ts b/packages/database/drizzle.config.ts
@@ -1,11 +1,11 @@
-import type { Config } from 'drizzle-kit';
+import { defineConfig } from 'drizzle-kit';
 import { env } from './env';
 
-export default {
+export default defineConfig({
   schema: './schema.ts',
   out: './migrations',
   dialect: 'mysql',
   dbCredentials: {
     url: env.DB_MYSQL_MIGRATION_URL
   }
-} satisfies Config;
+});
diff --git a/packages/database/env.ts b/packages/database/env.ts
@@ -8,7 +8,5 @@ export const env = createEnv({
     DB_PLANETSCALE_PASSWORD: z.string().min(1),
     DB_MYSQL_MIGRATION_URL: z.string().min(1)
   },
-  client: {},
-  clientPrefix: '_', // Not used, just for making TS happy
   runtimeEnv: process.env
 });
diff --git a/packages/database/index.ts b/packages/database/index.ts
@@ -51,10 +51,5 @@ const client = new Client({
   }
 });
 
-const connectionOptions = {
-  logger: false,
-  schema
-};
-
-export const db = drizzle(client, connectionOptions);
+export const db = drizzle(client, { schema });
 export type DBType = typeof db;
diff --git a/packages/database/migrate.ts b/packages/database/migrate.ts
@@ -3,10 +3,7 @@ import { createConnection } from 'mysql2/promise';
 import { drizzle } from 'drizzle-orm/mysql2';
 import { env } from './env';
 
-const connection = await createConnection({
-  uri: env.DB_MYSQL_MIGRATION_URL
-});
-const db = drizzle(connection);
-
+const connection = await createConnection({ uri: env.DB_MYSQL_MIGRATION_URL });
+const db = drizzle(connection, { mode: 'planetscale', logger: true });
 await migrate(db, { migrationsFolder: 'migrations' });
 await connection.end();