tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(db-postgres): ensures columns are nullable if within field with condition

Browse Source
This commit is contained in:
James
2023-10-14 15:34:27 -04:00
parent 9be34c9599
commit 52f89c0136
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/db-postgres/src/schema/traverseFields.ts
View File

@@ -252,6 +252,8 @@ export const traverseFields = ({
} }
case 'array': { case 'array': {
const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull
const arrayTableName = `${newTableName}_${toSnakeCase(field.name)}` const arrayTableName = `${newTableName}_${toSnakeCase(field.name)}`
const baseColumns: Record<string, PgColumnBuilder> = { const baseColumns: Record<string, PgColumnBuilder> = {
_order: integer('_order').notNull(), _order: integer('_order').notNull(),
@@ -277,7 +279,7 @@ export const traverseFields = ({
adapter, adapter,
baseColumns, baseColumns,
baseExtraConfig, baseExtraConfig,
disableNotNull, disableNotNull: disableNotNullFromHere,
disableUnique, disableUnique,
fields: field.fields, fields: field.fields,
rootRelationsToBuild, rootRelationsToBuild,
@@ -314,6 +316,8 @@ export const traverseFields = ({
} }
case 'blocks': { case 'blocks': {
const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull
field.blocks.forEach((block) => { field.blocks.forEach((block) => {
const blockTableName = `${rootTableName}_blocks_${toSnakeCase(block.slug)}` const blockTableName = `${rootTableName}_blocks_${toSnakeCase(block.slug)}`
if (!adapter.tables[blockTableName]) { if (!adapter.tables[blockTableName]) {
@@ -343,7 +347,7 @@ export const traverseFields = ({
adapter, adapter,
baseColumns, baseColumns,
baseExtraConfig, baseExtraConfig,
disableNotNull, disableNotNull: disableNotNullFromHere,
disableUnique, disableUnique,
fields: block.fields, fields: block.fields,
rootRelationsToBuild, rootRelationsToBuild,
@@ -428,6 +432,8 @@ export const traverseFields = ({
break break
} }
const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull
const { const {
hasLocalizedField: groupHasLocalizedField, hasLocalizedField: groupHasLocalizedField,
hasLocalizedManyNumberField: groupHasLocalizedManyNumberField, hasLocalizedManyNumberField: groupHasLocalizedManyNumberField,
@@ -438,7 +444,7 @@ export const traverseFields = ({
buildRelationships, buildRelationships,
columnPrefix: `${columnName}_`, columnPrefix: `${columnName}_`,
columns, columns,
disableNotNull, disableNotNull: disableNotNullFromHere,
disableUnique, disableUnique,
fieldPrefix: `${fieldName}_`, fieldPrefix: `${fieldName}_`,
fields: field.fields, fields: field.fields,
@@ -463,6 +469,8 @@ export const traverseFields = ({
} }
case 'tabs': { case 'tabs': {
const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull
const { const {
hasLocalizedField: tabHasLocalizedField, hasLocalizedField: tabHasLocalizedField,
hasLocalizedManyNumberField: tabHasLocalizedManyNumberField, hasLocalizedManyNumberField: tabHasLocalizedManyNumberField,
@@ -473,7 +481,7 @@ export const traverseFields = ({
buildRelationships, buildRelationships,
columnPrefix, columnPrefix,
columns, columns,
disableNotNull, disableNotNull: disableNotNullFromHere,
disableUnique, disableUnique,
fieldPrefix, fieldPrefix,
fields: field.tabs.map((tab) => ({ ...tab, type: 'tab' })), fields: field.tabs.map((tab) => ({ ...tab, type: 'tab' })),
@@ -500,6 +508,7 @@ export const traverseFields = ({
case 'row': case 'row':
case 'collapsible': { case 'collapsible': {
const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull
const { const {
hasLocalizedField: rowHasLocalizedField, hasLocalizedField: rowHasLocalizedField,
hasLocalizedManyNumberField: rowHasLocalizedManyNumberField, hasLocalizedManyNumberField: rowHasLocalizedManyNumberField,
@@ -510,7 +519,7 @@ export const traverseFields = ({
buildRelationships, buildRelationships,
columnPrefix, columnPrefix,
columns, columns,
disableNotNull, disableNotNull: disableNotNullFromHere,
disableUnique, disableUnique,
fieldPrefix, fieldPrefix,
fields: field.fields, fields: field.fields,