From f6bc3eb01478d604f5924c2be77436f16cccfe62 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 3 Apr 2024 10:39:38 -0400 Subject: [PATCH] chore: passing pg --- .github/workflows/main.yml | 2 +- .vscode/launch.json | 7 ++-- package.json | 2 +- .../src/fields/baseFields/baseIDField.ts | 4 ++- test/fields/collections/Blocks/index.ts | 4 +-- test/fields/collections/Blocks/shared.ts | 33 +++---------------- .../NestedToArrayAndBlock/index.ts | 2 +- 7 files changed, 17 insertions(+), 37 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1e8ffc52..6acde65e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,7 +125,7 @@ jobs: matrix: database: - mongodb - # - postgres + - postgres # - postgres-custom-schema # - postgres-uuid # - supabase diff --git a/.vscode/launch.json b/.vscode/launch.json index 69cd64fd2..2420515fb 100644 --- a/.vscode/launch.json +++ b/.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", diff --git a/package.json b/package.json index d795f040a..d719d9b0b 100644 --- a/package.json +++ b/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" diff --git a/packages/payload/src/fields/baseFields/baseIDField.ts b/packages/payload/src/fields/baseFields/baseIDField.ts index 3c1e5d944..3d12fe5b2 100644 --- a/packages/payload/src/fields/baseFields/baseIDField.ts +++ b/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 }, ], }, diff --git a/test/fields/collections/Blocks/index.ts b/test/fields/collections/Blocks/index.ts index 9e7f16f5e..eef70eab1 100644 --- a/test/fields/collections/Blocks/index.ts +++ b/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({}), }, ], }, diff --git a/test/fields/collections/Blocks/shared.ts b/test/fields/collections/Blocks/shared.ts index 6d524f618..fb2368241 100644 --- a/test/fields/collections/Blocks/shared.ts +++ b/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: [ - { - children: [ - { - detail: 0, - format: 0, - mode: 'normal', - style: '', - text: '', - type: 'text', - version: 1, - }, - ], - direction: 'ltr', - format: '', - indent: 0, - type: 'paragraph', - version: 1, - }, - ], - direction: 'ltr', + richText: [ + { + children: [{ text: '' }], }, - }, + ], }, { blockName: 'Second block', diff --git a/test/localization/collections/NestedToArrayAndBlock/index.ts b/test/localization/collections/NestedToArrayAndBlock/index.ts index 1184b1e85..bb637f936 100644 --- a/test/localization/collections/NestedToArrayAndBlock/index.ts +++ b/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,