chore: cleans up a few merges

packages/db-postgres/src/migrate.ts

@@ -1,12 +1,14 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { Payload } from 'payload'
 import type { Migration } from 'payload/database'
-import type { PayloadRequest } from 'payload/dist/express/types'
+import type { PayloadRequest } from 'payload/types'
 
-import { readMigrationFiles } from 'payload/database'
-import { commitTransaction } from 'payload/dist/utilities/commitTransaction'
-import { initTransaction } from 'payload/dist/utilities/initTransaction'
-import { killTransaction } from 'payload/dist/utilities/killTransaction'
+import {
+  commitTransaction,
+  initTransaction,
+  killTransaction,
+  readMigrationFiles,
+} from 'payload/database'
 import prompts from 'prompts'
 
 import type { PostgresAdapter } from './types'

packages/db-postgres/src/migrateDown.ts

@@ -1,10 +1,13 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { PayloadRequest } from 'payload/types'
 
-import { getMigrations, readMigrationFiles } from 'payload/database'
-import { commitTransaction } from 'payload/dist/utilities/commitTransaction'
-import { initTransaction } from 'payload/dist/utilities/initTransaction'
-import { killTransaction } from 'payload/dist/utilities/killTransaction'
+import {
+  commitTransaction,
+  getMigrations,
+  initTransaction,
+  killTransaction,
+  readMigrationFiles,
+} from 'payload/database'
 
 import type { PostgresAdapter } from './types'
 

packages/db-postgres/src/migrateFresh.ts

@@ -1,10 +1,12 @@
 import type { PayloadRequest } from 'payload/types'
 
 import { sql } from 'drizzle-orm'
-import { readMigrationFiles } from 'payload/database'
-import { commitTransaction } from 'payload/dist/utilities/commitTransaction'
-import { initTransaction } from 'payload/dist/utilities/initTransaction'
-import { killTransaction } from 'payload/dist/utilities/killTransaction'
+import {
+  commitTransaction,
+  initTransaction,
+  killTransaction,
+  readMigrationFiles,
+} from 'payload/database'
 import prompts from 'prompts'
 
 import type { PostgresAdapter } from './types'

packages/db-postgres/src/migrateRefresh.ts

@@ -1,10 +1,13 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { PayloadRequest } from 'payload/types'
 
-import { getMigrations, readMigrationFiles } from 'payload/database'
-import { commitTransaction } from 'payload/dist/utilities/commitTransaction'
-import { initTransaction } from 'payload/dist/utilities/initTransaction'
-import { killTransaction } from 'payload/dist/utilities/killTransaction'
+import {
+  commitTransaction,
+  getMigrations,
+  initTransaction,
+  killTransaction,
+  readMigrationFiles,
+} from 'payload/database'
 
 import type { PostgresAdapter } from './types'
 

packages/db-postgres/src/migrateReset.ts

@@ -1,10 +1,13 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { PayloadRequest } from 'payload/types'
 
-import { getMigrations, readMigrationFiles } from 'payload/database'
-import { commitTransaction } from 'payload/dist/utilities/commitTransaction'
-import { initTransaction } from 'payload/dist/utilities/initTransaction'
-import { killTransaction } from 'payload/dist/utilities/killTransaction'
+import {
+  commitTransaction,
+  getMigrations,
+  initTransaction,
+  killTransaction,
+  readMigrationFiles,
+} from 'payload/database'
 
 import type { PostgresAdapter } from './types'