feat(db-postgres)!: relationship column

examples/form-builder/next-app/components/Blocks/Form/Country/index.tsx

@@ -1,5 +1,5 @@
 import type { CountryField } from 'payload-plugin-form-builder/dist/types'
-import type { Control, FieldErrorsImpl, FieldValues } from 'react-hook-form';
+import type { Control, FieldErrorsImpl, FieldValues } from 'react-hook-form'
 
 import React from 'react'
 import { Controller } from 'react-hook-form'

examples/form-builder/next-app/components/Blocks/Form/Select/index.tsx

@@ -1,5 +1,5 @@
 import type { SelectField } from 'payload-plugin-form-builder/dist/types'
-import type { Control, FieldErrorsImpl, FieldValues } from 'react-hook-form';
+import type { Control, FieldErrorsImpl, FieldValues } from 'react-hook-form'
 
 import React from 'react'
 import { Controller } from 'react-hook-form'

examples/form-builder/next-app/components/Blocks/Form/State/index.tsx

@@ -1,5 +1,5 @@
 import type { StateField } from 'payload-plugin-form-builder/dist/types'
-import type { Control, FieldErrorsImpl, FieldValues } from 'react-hook-form';
+import type { Control, FieldErrorsImpl, FieldValues } from 'react-hook-form'
 
 import React from 'react'
 import { Controller } from 'react-hook-form'

examples/form-builder/next-app/components/CloseModalOnRouteChange/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import type React from 'react';
+import type React from 'react'
 
 import { useModal } from '@faceless-ui/modal'
 import { usePathname } from 'next/navigation'

examples/form-builder/next-app/components/Gutter/index.tsx

@@ -1,4 +1,4 @@
-import type { Ref } from 'react';
+import type { Ref } from 'react'
 
 import React, { forwardRef } from 'react'
 

examples/live-preview/next-app/package.json

@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev -p 3001",
     "build": "next build",
-    "start": "next start -p 3001",
-    "lint": "next lint"
+    "dev": "next dev -p 3001",
+    "lint": "next lint",
+    "start": "next start -p 3001"
   },
   "dependencies": {
     "@payloadcms/live-preview-react": "3.0.0-beta.28",

examples/live-preview/next-pages/package.json

@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev -p 3001",
     "build": "next build",
-    "start": "next start -p 3001",
-    "lint": "next lint"
+    "dev": "next dev -p 3001",
+    "lint": "next lint",
+    "start": "next start -p 3001"
   },
   "dependencies": {
     "@payloadcms/live-preview-react": "3.0.0-beta.28",

examples/live-preview/payload/src/app/(app)/_components/Button/index.tsx

@@ -1,4 +1,4 @@
-import type { ElementType } from 'react';
+import type { ElementType } from 'react'
 
 import Link from 'next/link'
 import React from 'react'

examples/live-preview/payload/src/app/(app)/_components/Gutter/index.tsx

@@ -1,4 +1,4 @@
-import type { Ref } from 'react';
+import type { Ref } from 'react'
 
 import React, { forwardRef } from 'react'
 

examples/live-preview/payload/src/fields/link.ts

@@ -125,7 +125,7 @@ const link: LinkType = ({ appearances, disableLabel = false, overrides = {} } =
     ]
 
     if (appearances) {
-      appearanceOptionsToUse = appearances.map(appearance => appearanceOptions[appearance])
+      appearanceOptionsToUse = appearances.map((appearance) => appearanceOptions[appearance])
     }
 
     linkResult.fields.push({

packages/db-mongodb/src/createMigration.ts

@@ -1,22 +1,24 @@
 /* eslint-disable no-restricted-syntax, no-await-in-loop */
-import type { CreateMigration } from 'payload/database'
+import type { CreateMigration, MigrationTemplateArgs } from 'payload/database'
 
 import fs from 'fs'
 import path from 'path'
+import { getPredefinedMigration } from 'payload/database'
 import { fileURLToPath } from 'url'
 
-const migrationTemplate = (upSQL?: string, downSQL?: string) => `import {
+const migrationTemplate = ({ downSQL, imports, upSQL }: MigrationTemplateArgs): string => `import {
   MigrateUpArgs,
   MigrateDownArgs,
-} from "@payloadcms/db-mongodb";
+} from '@payloadcms/db-mongodb'
+${imports}
 
 export async function up({ payload }: MigrateUpArgs): Promise<void> {
 ${upSQL ?? `  // Migration code`}
-};
+}
 
 export async function down({ payload }: MigrateDownArgs): Promise<void> {
 ${downSQL ?? `  // Migration code`}
-};
+}
 `
 
 export const createMigration: CreateMigration = async function createMigration({
@@ -31,36 +33,14 @@ export const createMigration: CreateMigration = async function createMigration({
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir)
   }
-
-  let migrationFileContent: string | undefined
-
-  // Check for predefined migration.
-  // Either passed in via --file or prefixed with @payloadcms/db-mongodb/
-  if (file || migrationName?.startsWith('@payloadcms/db-mongodb/')) {
-    if (!file) file = migrationName
-
-    const predefinedMigrationName = file.replace('@payloadcms/db-mongodb/', '')
-    migrationName = predefinedMigrationName
-    const cleanPath = path.join(dirname, `../predefinedMigrations/${predefinedMigrationName}.js`)
-
-    // Check if predefined migration exists
-    if (fs.existsSync(cleanPath)) {
-      let migration = await eval(
-        `${typeof require === 'function' ? 'require' : 'import'}(${cleanPath})`,
-      )
-      if ('default' in migration) migration = migration.default
-      const { down, up } = migration
-
-      migrationFileContent = migrationTemplate(up, down)
-    } else {
-      payload.logger.error({
-        msg: `Canned migration ${predefinedMigrationName} not found.`,
-      })
-      process.exit(1)
-    }
-  } else {
-    migrationFileContent = migrationTemplate()
-  }
+  const predefinedMigration = await getPredefinedMigration({
+    dirname,
+    file,
+    migrationName,
+    payload,
+  })
+
+  const migrationFileContent = migrationTemplate(predefinedMigration)
 
   const [yyymmdd, hhmmss] = new Date().toISOString().split('T')
   const formattedDate = yyymmdd.replace(/\D/g, '')

packages/db-postgres/package.json

@@ -21,6 +21,11 @@
       "import": "./src/types.ts",
       "require": "./src/types.ts",
       "types": "./src/types.ts"
+    },
+    "./migration-utils": {
+      "import": "./src/exports/migration-utils.ts",
+      "require": "./src/exports/migration-utils.ts",
+      "types": "./src/exports/migration-utils.ts"
     }
   },
   "main": "./src/index.ts",
@@ -30,11 +35,12 @@
     "mock.js"
   ],
   "scripts": {
-    "build": "pnpm build:swc && pnpm build:types",
+    "build": "pnpm build:swc && pnpm build:types && pnpm renamePredefinedMigrations",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
-    "prepublishOnly": "pnpm clean && pnpm turbo build"
+    "prepublishOnly": "pnpm clean && pnpm turbo build",
+    "renamePredefinedMigrations": "tsx ./scripts/renamePredefinedMigrations.ts"
   },
   "dependencies": {
     "@libsql/client": "^0.5.2",
@@ -66,6 +72,11 @@
         "import": "./dist/types.js",
         "require": "./dist/types.js",
         "types": "./dist/types.d.ts"
+      },
+      "./migration-utils": {
+        "import": "./dist/exports/migration-utils.js",
+        "require": "./dist/exports/migration-utils.js",
+        "types": "./dist/exports/migration-utils.d.ts"
       }
     },
     "main": "./dist/index.js",

packages/db-postgres/relationships-v2-v3.mjs

@@ -0,0 +1,13 @@
+const imports = `import { migratePostgresV2toV3 } from '@payloadcms/migratePostgresV2toV3'`;
+const up = `   await migratePostgresV2toV3({
+        // enables logging of changes that will be made to the database
+        debug: false,
+        // skips calls that modify schema or data
+        dryRun: false,
+        payload,
+        req,
+        })
+`;
+export { imports, up };
+
+//# sourceMappingURL=relationships-v2-v3.js.map

packages/db-postgres/scripts/renamePredefinedMigrations.ts

@@ -0,0 +1,18 @@
+import fs from 'fs'
+import path from 'path'
+
+/**
+ * Changes built .js files to .mjs to for ESM imports
+ */
+const rename = () => {
+  fs.readdirSync(path.resolve('./dist/predefinedMigrations'))
+    .filter((f) => {
+      return f.endsWith('.js')
+    })
+    .forEach((file) => {
+      const newPath = path.join('./dist/predefinedMigrations', file)
+      fs.renameSync(newPath, newPath.replace('.js', '.mjs'))
+    })
+}
+
+rename()

packages/db-postgres/src/count.ts

@@ -21,7 +21,7 @@ export const count: Count = async function count(
   const db = this.sessions[req.transactionID]?.db || this.drizzle
   const table = this.tables[tableName]
 
-  const { joinAliases, joins, where } = await buildQuery({
+  const { joins, where } = await buildQuery({
     adapter: this,
     fields: collectionConfig.fields,
     locale,
@@ -31,13 +31,6 @@ export const count: Count = async function count(
 
   const selectCountMethods: ChainedMethods = []
 
-  joinAliases.forEach(({ condition, table }) => {
-    selectCountMethods.push({
-      args: [table, condition],
-      method: 'leftJoin',
-    })
-  })
-
   Object.entries(joins).forEach(([joinTable, condition]) => {
     if (joinTable) {
       selectCountMethods.push({