chore: passing pg

.github/workflows/main.yml

@@ -125,7 +125,7 @@ jobs:
       matrix:
         database:
           - mongodb
-        #  - postgres
+          - postgres
         #  - postgres-custom-schema
         #  - postgres-uuid
         #  - supabase

.vscode/launch.json

@@ -41,11 +41,14 @@
       "type": "node-terminal"
     },
     {
-      "command": "pnpm run dev:postgres versions",
+      "command": "node --no-deprecation test/dev.js versions",
       "cwd": "${workspaceFolder}",
       "name": "Run Dev Postgres",
       "request": "launch",
-      "type": "node-terminal"
+      "type": "node-terminal",
+      "env": {
+        "PAYLOAD_DATABASE": "postgres"
+      }
     },
     {
       "command": "pnpm run dev versions",

package.json

@@ -66,7 +66,7 @@
     "test:e2e": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 tsx ./test/runE2E.ts",
     "test:e2e:debug": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PWDEBUG=1 DISABLE_LOGGING=true playwright test",
     "test:e2e:headed": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true playwright test --headed",
-    "test:int:postgres": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=jest.config.js --runInBand",
+    "test:int:postgres": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
     "test:int": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
     "test:unit": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles  --config=jest.config.js --runInBand",
     "translateNewKeys": "pnpm --filter payload run translateNewKeys"

packages/payload/src/fields/baseFields/baseIDField.ts

@@ -18,9 +18,11 @@ export const baseIDField: Field = {
         // If creating new doc, need to disregard any
         // ids that have been passed in because they will cause
         // primary key unique conflicts in relational DBs
-        if (value && operation === 'create') {
+        if (!value || (operation === 'create' && value)) {
           return new ObjectId().toHexString()
         }
+
+        return value
       },
     ],
   },

test/fields/collections/Blocks/index.ts

@@ -1,7 +1,7 @@
 import type { CollectionConfig } from 'payload/types'
 import type { BlockField } from 'payload/types'
 
-import { lexicalEditor } from '@payloadcms/richtext-lexical'
+import { slateEditor } from '@payloadcms/richtext-slate'
 
 import { blockFieldsSlug, textFieldsSlug } from '../../slugs.js'
 import { AddCustomBlocks } from './components/AddCustomBlocks/index.js'
@@ -22,7 +22,7 @@ export const getBlocksField = (prefix?: string): BlockField => ({
         {
           name: 'richText',
           type: 'richText',
-          editor: lexicalEditor({}),
+          editor: slateEditor({}),
         },
       ],
     },

test/fields/collections/Blocks/shared.ts

@@ -5,36 +5,11 @@ export const getBlocksFieldSeedData = (prefix?: string): any => [
     blockName: 'First block',
     blockType: prefix ? `${prefix}Content` : 'content',
     text: 'first block',
-    richText: {
-      root: {
-        type: 'root',
-        format: '',
-        indent: 0,
-        version: 1,
-
-        children: [
+    richText: [
       {
-            children: [
-              {
-                detail: 0,
-                format: 0,
-                mode: 'normal',
-                style: '',
-                text: '',
-                type: 'text',
-                version: 1,
+        children: [{ text: '' }],
       },
     ],
-            direction: 'ltr',
-            format: '',
-            indent: 0,
-            type: 'paragraph',
-            version: 1,
-          },
-        ],
-        direction: 'ltr',
-      },
-    },
   },
   {
     blockName: 'Second block',

test/localization/collections/NestedToArrayAndBlock/index.ts

@@ -1,6 +1,6 @@
 import type { CollectionConfig } from 'payload/types'
 
-export const nestedToArrayAndBlockCollectionSlug = 'nested-to-array-and-block'
+export const nestedToArrayAndBlockCollectionSlug = 'nested'
 
 export const NestedToArrayAndBlock: CollectionConfig = {
   slug: nestedToArrayAndBlockCollectionSlug,