Merge branch '2.0' of github.com:payloadcms/payload into 2.0

packages/db-postgres/src/migrate.ts

@@ -1,7 +1,11 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
+import type { Payload } from 'payload'
+import type { Migration } from 'payload/database'
+
 import { generateDrizzleJson } from 'drizzle-kit/utils'
 import { readMigrationFiles } from 'payload/database'
 import { DatabaseError } from 'pg'
+import prompts from 'prompts'
 
 import type { PostgresAdapter } from './types'
 
@@ -13,64 +17,88 @@ export async function migrate(this: PostgresAdapter): Promise<void> {
   const migrationFiles = await readMigrationFiles({ payload })
 
   let latestBatch = 0
-  let existingMigrations = []
+  let migrationsInDB = []
 
   const hasMigrationTable = await migrationTableExists(this.drizzle)
 
   if (hasMigrationTable) {
-    ;({ docs: existingMigrations } = await payload.find({
+    ;({ docs: migrationsInDB } = await payload.find({
       collection: 'payload-migrations',
       limit: 0,
       sort: '-name',
     }))
-    if (Number(existingMigrations[0]?.batch) > 0) {
-      latestBatch = Number(existingMigrations[0]?.batch)
+    if (Number(migrationsInDB?.[0]?.batch) > 0) {
+      latestBatch = Number(migrationsInDB[0]?.batch)
     }
   } else {
     await createMigrationTable(this.drizzle)
   }
 
+  if (migrationsInDB.find((m) => m.batch === -1)) {
+    const { confirm: runMigrations } = await prompts(
+      {
+        name: 'confirm',
+        initial: false,
+        message:
+          "It looks like you've run Payload in dev mode, meaning you've dynamically pushed changes to your database. " +
+          "If you'd like to run migrations, data loss will occur. Would you like to proceed?",
+        type: 'confirm',
+      },
+      {
+        onCancel: () => {
+          process.exit(0)
+        },
+      },
+    )
+
+    if (!runMigrations) {
+      process.exit(0)
+    }
+  }
+
   const newBatch = latestBatch + 1
 
   // Execute 'up' function for each migration sequentially
   for (const migration of migrationFiles) {
-    const existingMigration = existingMigrations.find(
-      (existing) => existing.name === migration.name,
-    )
+    const alreadyRan = migrationsInDB.find((existing) => existing.name === migration.name)
 
-    // Run migration if not found in database
-    if (existingMigration) {
+    // If already ran, skip
+    if (alreadyRan) {
       continue // eslint-disable-line no-continue
     }
 
-    const start = Date.now()
-
-    payload.logger.info({ msg: `Migrating: ${migration.name}` })
-
-    const pgAdapter = payload.db
-    const drizzleJSON = generateDrizzleJson(pgAdapter.schema)
-
-    try {
-      await migration.up({ payload })
-      payload.logger.info({ msg: `Migrated:  ${migration.name} (${Date.now() - start}ms)` })
-      await payload.create({
-        collection: 'payload-migrations',
-        data: {
-          name: migration.name,
-          batch: newBatch,
-          schema: drizzleJSON,
-        },
-      })
-    } catch (err: unknown) {
-      let msg = `Error running migration ${migration.name}`
-
-      if (err instanceof DatabaseError) {
-        msg += `: ${err.message}`
-        if (err.hint) msg += `. ${err.hint}`
-      }
-
-      payload.logger.error({ err, msg })
-      throw err
-    }
+    await runMigrationFile(payload, migration, newBatch)
+  }
+}
+
+async function runMigrationFile(payload: Payload, migration: Migration, batch: number) {
+  const start = Date.now()
+
+  payload.logger.info({ msg: `Migrating: ${migration.name}` })
+
+  const pgAdapter = payload.db
+  const drizzleJSON = generateDrizzleJson(pgAdapter.schema)
+
+  try {
+    await migration.up({ payload })
+    payload.logger.info({ msg: `Migrated:  ${migration.name} (${Date.now() - start}ms)` })
+    await payload.create({
+      collection: 'payload-migrations',
+      data: {
+        name: migration.name,
+        batch,
+        schema: drizzleJSON,
+      },
+    })
+  } catch (err: unknown) {
+    let msg = `Error running migration ${migration.name}`
+
+    if (err instanceof DatabaseError) {
+      msg += `: ${err.message}`
+      if (err.hint) msg += `. ${err.hint}`
+    }
+
+    payload.logger.error({ err, msg })
+    throw err
   }
 }

packages/payload/src/database/migrations/migrateReset.ts

@@ -48,4 +48,18 @@ export async function migrateReset(this: BaseDatabaseAdapter): Promise<void> {
       }
     }
   }
+
+  // Delete dev migration
+  try {
+    await payload.delete({
+      collection: 'payload-migrations',
+      where: {
+        batch: {
+          equals: -1,
+        },
+      },
+    })
+  } catch (err: unknown) {
+    payload.logger.error({ error: err, msg: 'Error deleting dev migration' })
+  }
 }