fix(db-postgres): hasMany relationship/number/text fields inside blocks are incorrectly returned when using select (#14399)

Fixes #14157

Author: r1tsuu

packages/drizzle/src/find/traverseFields.ts

@@ -14,7 +14,7 @@ import {
   type SelectType,
   type Where,
 } from 'payload'
-import { fieldIsVirtual, fieldShouldBeLocalized } from 'payload/shared'
+import { blocks, fieldIsVirtual, fieldShouldBeLocalized } from 'payload/shared'
 import toSnakeCase from 'to-snake-case'
 
 import type { BuildQueryJoinAliases, DrizzleAdapter } from '../types.js'
@@ -91,6 +91,7 @@ type TraverseFieldArgs = {
   depth?: number
   draftsEnabled?: boolean
   fields: FlattenedField[]
+  forceWithFields?: boolean
   joinQuery: JoinQuery
   joins?: BuildQueryJoinAliases
   locale?: string
@@ -119,6 +120,7 @@ export const traverseFields = ({
   depth,
   draftsEnabled,
   fields,
+  forceWithFields,
   joinQuery = {},
   joins,
   locale,
@@ -231,6 +233,7 @@ export const traverseFields = ({
           depth,
           draftsEnabled,
           fields: field.flattenedFields,
+          forceWithFields,
           joinQuery,
           locale,
           parentIsLocalized: parentIsLocalized || field.localized,
@@ -358,6 +361,7 @@ export const traverseFields = ({
               depth,
               draftsEnabled,
               fields: block.flattenedFields,
+              forceWithFields: blockSelect === true,
               joinQuery,
               locale,
               parentIsLocalized: parentIsLocalized || field.localized,
@@ -400,6 +404,7 @@ export const traverseFields = ({
           depth,
           draftsEnabled,
           fields: field.flattenedFields,
+          forceWithFields,
           joinQuery,
           joins,
           locale,
@@ -862,6 +867,23 @@ export const traverseFields = ({
       }
 
       default: {
+        if (forceWithFields) {
+          if (
+            (field.type === 'relationship' || field.type === 'upload') &&
+            (field.hasMany || Array.isArray(field.relationTo))
+          ) {
+            withTabledFields.rels = true
+          }
+
+          if (field.type === 'number' && field.hasMany) {
+            withTabledFields.numbers = true
+          }
+
+          if (field.type === 'text' && field.hasMany) {
+            withTabledFields.texts = true
+          }
+        }
+
         if (!select && !selectAllOnCurrentLevel) {
           break
         }

test/select/getConfig.ts

@@ -37,7 +37,34 @@ export const getConfig: () => Partial<Config> = () => ({
     },
     {
       slug: 'rels',
-      fields: [],
+      fields: [{ type: 'text', name: 'text' }],
+    },
+    {
+      slug: 'relationships-blocks',
+      fields: [
+        {
+          type: 'blocks',
+          name: 'blocks',
+          blocks: [
+            {
+              slug: 'block',
+              fields: [
+                {
+                  type: 'relationship',
+                  name: 'hasMany',
+                  relationTo: 'rels',
+                  hasMany: true,
+                },
+                {
+                  type: 'relationship',
+                  name: 'hasOne',
+                  relationTo: 'rels',
+                },
+              ],
+            },
+          ],
+        },
+      ],
     },
     CustomID,
     UsersCollection,

test/select/int.spec.ts

@@ -2478,6 +2478,57 @@ describe('Select', () => {
       array,
     })
   })
+
+  it('should properly return relationships when using select on block with depth 0', async () => {
+    const rel_1 = await payload.create({ collection: 'rels', data: { text: 'rel-1' } })
+    const doc = await payload.create({
+      collection: 'relationships-blocks',
+      data: {
+        blocks: [
+          {
+            blockType: 'block',
+            hasMany: [rel_1],
+            hasOne: rel_1,
+          },
+        ],
+      },
+    })
+    const result = await payload.findByID({
+      depth: 0,
+      collection: 'relationships-blocks',
+      id: doc.id,
+      select: { blocks: true },
+    })
+
+    expect(result.blocks[0]?.hasOne).toBe(rel_1.id)
+    expect(result.blocks[0]?.hasMany).toEqual([rel_1.id])
+  })
+
+  it('should populate relationships when using select on block', async () => {
+    const rel_1 = await payload.create({ collection: 'rels', data: { text: 'rel-1' } })
+    const doc = await payload.create({
+      collection: 'relationships-blocks',
+      data: {
+        blocks: [
+          {
+            blockType: 'block',
+            hasMany: [rel_1],
+            hasOne: rel_1,
+          },
+        ],
+      },
+    })
+
+    const result = await payload.findByID({
+      depth: 1,
+      collection: 'relationships-blocks',
+      id: doc.id,
+      select: { blocks: true },
+    })
+
+    expect(result.blocks[0]?.hasOne.text).toBe('rel-1')
+    expect(result.blocks[0]?.hasMany[0].text).toBe('rel-1')
+  })
 })
 
 async function createPost() {