From 0aa8deb7b80980597487af1dedc751f227954519 Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Wed, 13 Nov 2024 20:26:32 +0200
Subject: [PATCH] fix(db-postgres, db-vercel-postgres): relationship migration
 v2-v3 dirname

---
 packages/db-postgres/src/index.ts             |  9 ++++-
 packages/db-vercel-postgres/src/index.ts      |  9 ++++-
 .../drizzle/src/postgres/createMigration.ts   |  6 +---
 .../migrations/getPredefinedMigration.ts      | 33 ++++++++++---------
 packages/payload/src/database/types.ts        |  2 ++
 5 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/packages/db-postgres/src/index.ts b/packages/db-postgres/src/index.ts
index 22a0c582989..4048c0be416 100644
--- a/packages/db-postgres/src/index.ts
+++ b/packages/db-postgres/src/index.ts
@@ -50,12 +50,17 @@ import {
   requireDrizzleKit,
 } from '@payloadcms/drizzle/postgres'
 import { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core'
+import path from 'path'
 import { createDatabaseAdapter, defaultBeginTransaction } from 'payload'
+import { fileURLToPath } from 'url'
 
 import type { Args, PostgresAdapter } from './types.js'
 
 import { connect } from './connect.js'
 
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+
 export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter> {
   const postgresIDType = args.idType || 'serial'
   const payloadIDType = postgresIDType === 'serial' ? 'number' : 'text'
@@ -88,6 +93,9 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
       beforeSchemaInit: args.beforeSchemaInit ?? [],
       createDatabase,
       createExtensions,
+      createMigration(args) {
+        return createMigration.bind(this)({ ...args, dirname })
+      },
       defaultDrizzleSnapshot,
       disableCreateDatabase: args.disableCreateDatabase ?? false,
       drizzle: undefined,
@@ -132,7 +140,6 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
       createGlobal,
       createGlobalVersion,
       createJSONQuery,
-      createMigration,
       createVersion,
       defaultIDType: payloadIDType,
       deleteMany,
diff --git a/packages/db-vercel-postgres/src/index.ts b/packages/db-vercel-postgres/src/index.ts
index f1d2752d26b..0aad626561b 100644
--- a/packages/db-vercel-postgres/src/index.ts
+++ b/packages/db-vercel-postgres/src/index.ts
@@ -50,12 +50,17 @@ import {
   requireDrizzleKit,
 } from '@payloadcms/drizzle/postgres'
 import { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core'
+import path from 'path'
 import { createDatabaseAdapter, defaultBeginTransaction } from 'payload'
+import { fileURLToPath } from 'url'
 
 import type { Args, VercelPostgresAdapter } from './types.js'
 
 import { connect } from './connect.js'
 
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+
 export function vercelPostgresAdapter(args: Args = {}): DatabaseAdapterObj<VercelPostgresAdapter> {
   const postgresIDType = args.idType || 'serial'
   const payloadIDType = postgresIDType === 'serial' ? 'number' : 'text'
@@ -133,7 +138,9 @@ export function vercelPostgresAdapter(args: Args = {}): DatabaseAdapterObj<Verce
       createGlobal,
       createGlobalVersion,
       createJSONQuery,
-      createMigration,
+      createMigration(args) {
+        return createMigration.bind(this)({ ...args, dirname })
+      },
       createVersion,
       defaultIDType: payloadIDType,
       deleteMany,
diff --git a/packages/drizzle/src/postgres/createMigration.ts b/packages/drizzle/src/postgres/createMigration.ts
index 14332265204..30790cd71b2 100644
--- a/packages/drizzle/src/postgres/createMigration.ts
+++ b/packages/drizzle/src/postgres/createMigration.ts
@@ -2,10 +2,8 @@ import type { CreateMigration } from 'payload'
 
 import fs from 'fs'
 import { createRequire } from 'module'
-import path from 'path'
 import { getPredefinedMigration, writeMigrationIndex } from 'payload'
 import prompts from 'prompts'
-import { fileURLToPath } from 'url'
 
 import type { BasePostgresAdapter } from './types.js'
 
@@ -16,10 +14,8 @@ const require = createRequire(import.meta.url)
 
 export const createMigration: CreateMigration = async function createMigration(
   this: BasePostgresAdapter,
-  { file, forceAcceptWarning, migrationName, payload },
+  { dirname, file, forceAcceptWarning, migrationName, payload },
 ) {
-  const filename = fileURLToPath(import.meta.url)
-  const dirname = path.dirname(filename)
   const dir = payload.db.migrationDir
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir)
diff --git a/packages/payload/src/database/migrations/getPredefinedMigration.ts b/packages/payload/src/database/migrations/getPredefinedMigration.ts
index a1ab1bf5f19..be0486bee61 100644
--- a/packages/payload/src/database/migrations/getPredefinedMigration.ts
+++ b/packages/payload/src/database/migrations/getPredefinedMigration.ts
@@ -24,28 +24,31 @@ export const getPredefinedMigration = async ({
   if (file || migrationNameArg?.startsWith('@payloadcms/')) {
     // removes the package name from the migrationName.
     const migrationName = (file || migrationNameArg).split('/').slice(2).join('/')
-    let cleanPath = path.join(dirname, `./predefinedMigrations/${migrationName}.mjs`)
+    let cleanPath = path.join(dirname, `./predefinedMigrations/${migrationName}`)
 
-    // Check if predefined migration exists
-    if (fs.existsSync(cleanPath)) {
-      cleanPath = cleanPath.replaceAll('\\', '/')
-      const moduleURL = pathToFileURL(cleanPath)
-      try {
-        const { downSQL, imports, upSQL } = await eval(`import('${moduleURL.href}')`)
-        return { downSQL, imports, upSQL }
-      } catch (error) {
-        payload.logger.error({
-          error,
-          msg: `Error loading predefined migration ${migrationName}`,
-        })
-        process.exit(1)
-      }
+    if (fs.existsSync(`${cleanPath}.mjs`)) {
+      cleanPath = `${cleanPath}.mjs`
+    } else if (fs.existsSync(`${cleanPath}.js`)) {
+      cleanPath = `${cleanPath}.js`
     } else {
       payload.logger.error({
         msg: `Canned migration ${migrationName} not found.`,
       })
       process.exit(1)
     }
+
+    cleanPath = cleanPath.replaceAll('\\', '/')
+    const moduleURL = pathToFileURL(cleanPath)
+    try {
+      const { downSQL, imports, upSQL } = await eval(`import('${moduleURL.href}')`)
+      return { downSQL, imports, upSQL }
+    } catch (err) {
+      payload.logger.error({
+        err,
+        msg: `Error loading predefined migration ${migrationName}`,
+      })
+      process.exit(1)
+    }
   }
   return {}
 }
diff --git a/packages/payload/src/database/types.ts b/packages/payload/src/database/types.ts
index ab175f86f7d..7d060a1ebf4 100644
--- a/packages/payload/src/database/types.ts
+++ b/packages/payload/src/database/types.ts
@@ -160,6 +160,8 @@ export type Connect = (args?: ConnectArgs) => Promise<void>
 export type Destroy = () => Promise<void>
 
 export type CreateMigration = (args: {
+  /** dirname of the package, required in drizzle */
+  dirname?: string
   file?: string
   /**
    * Skips the prompt asking to create empty migrations