fix(db-postgres): validateExistingBlockIsIdentical with arrays

payloadcms · Jan 14, 2024 · 3b88adc · 3b88adc
1 parent f9dda62
commit 3b88adc
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 22 deletions.
diff --git a/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts b/packages/db-postgres/src/schema/validateExistingBlockIsIdentical.ts
@@ -16,7 +16,11 @@ const getFlattenedFieldNames = (fields: Field[], prefix: string = ''): string[]
   return fields.reduce((fieldsToUse, field) => {
     let fieldPrefix = prefix
 
-    if (field.type === 'blocks') {
+    if (
+      field.type === 'blocks' ||
+      field.type === 'array' ||
+      ('hasMany' in field && field.hasMany === true)
+    ) {
       return fieldsToUse
     }
 
@@ -54,29 +58,27 @@ export const validateExistingBlockIsIdentical = ({
   rootTableName,
   table,
 }: Args): void => {
-  if (table) {
-    const fieldNames = getFlattenedFieldNames(block.fields)
+  const fieldNames = getFlattenedFieldNames(block.fields)
 
-    const missingField =
-      // ensure every field from the config is in the matching table
-      fieldNames.find((name) => Object.keys(table).indexOf(name) === -1) ||
-      // ensure every table column is matched for every field from the config
-      Object.keys(table).find((fieldName) => {
-        if (!['_locale', '_order', '_parentID', '_path', '_uuid'].includes(fieldName)) {
-          return fieldNames.indexOf(fieldName) === -1
-        }
-      })
+  const missingField =
+    // ensure every field from the config is in the matching table
+    fieldNames.find((name) => Object.keys(table).indexOf(name) === -1) ||
+    // ensure every table column is matched for every field from the config
+    Object.keys(table).find((fieldName) => {
+      if (!['_locale', '_order', '_parentID', '_path', '_uuid'].includes(fieldName)) {
+        return fieldNames.indexOf(fieldName) === -1
+      }
+    })
 
-    if (missingField) {
-      throw new InvalidConfiguration(
-        `The table ${rootTableName} has multiple blocks with slug ${block.slug}, but the schemas do not match. One block includes the field ${missingField}, while the other block does not.`,
-      )
-    }
+  if (missingField) {
+    throw new InvalidConfiguration(
+      `The table ${rootTableName} has multiple blocks with slug ${block.slug}, but the schemas do not match. One block includes the field ${missingField}, while the other block does not.`,
+    )
+  }
 
-    if (Boolean(localized) !== Boolean(table._locale)) {
-      throw new InvalidConfiguration(
-        `The table ${rootTableName} has multiple blocks with slug ${block.slug}, but the schemas do not match. One is localized, but another is not. Block schemas of the same name must match exactly.`,
-      )
-    }
+  if (Boolean(localized) !== Boolean(table._locale)) {
+    throw new InvalidConfiguration(
+      `The table ${rootTableName} has multiple blocks with slug ${block.slug}, but the schemas do not match. One is localized, but another is not. Block schemas of the same name must match exactly.`,
+    )
   }
 }
diff --git a/test/fields/collections/Blocks/index.ts b/test/fields/collections/Blocks/index.ts
@@ -246,6 +246,22 @@ const BlockFields: CollectionConfig = {
             },
           ],
         },
+        {
+          slug: 'block-b',
+          fields: [
+            {
+              name: 'items',
+              type: 'array',
+              fields: [
+                {
+                  name: 'title2',
+                  type: 'text',
+                  required: true,
+                },
+              ],
+            },
+          ],
+        },
       ],
     },
     {