@payloadcms/drizzle 3.0.0-canary.5a7fb7d → 3.0.0-canary.67aae47

package/dist/find/traverseFields.d.ts

@@ -1,4 +1,4 @@
-import type { Field, JoinQuery } from 'payload';
+import type { Field, JoinQuery, SelectMode, SelectType, TabAsField } from 'payload';
 import type { BuildQueryJoinAliases, DrizzleAdapter } from '../types.js';
 import type { Result } from './buildFindManyArgs.js';
 type TraverseFieldArgs = {
@@ -7,15 +7,25 @@ type TraverseFieldArgs = {
     currentArgs: Result;
     currentTableName: string;
     depth?: number;
-    fields: Field[];
+    fields: (Field | TabAsField)[];
     joinQuery: JoinQuery;
     joins?: BuildQueryJoinAliases;
     locale?: string;
     path: string;
+    select?: SelectType;
+    selectAllOnCurrentLevel?: boolean;
+    selectMode?: SelectMode;
     tablePath: string;
     topLevelArgs: Record<string, unknown>;
     topLevelTableName: string;
+    versions?: boolean;
+    withinLocalizedField?: boolean;
+    withTabledFields: {
+        numbers?: boolean;
+        rels?: boolean;
+        texts?: boolean;
+    };
 };
-export declare const traverseFields: ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery, joins, locale, path, tablePath, topLevelArgs, topLevelTableName, }: TraverseFieldArgs) => Record<string, unknown>;
+export declare const traverseFields: ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery, joins, locale, path, select, selectAllOnCurrentLevel, selectMode, tablePath, topLevelArgs, topLevelTableName, versions, withinLocalizedField, withTabledFields, }: TraverseFieldArgs) => Record<string, unknown>;
 export {};
 //# sourceMappingURL=traverseFields.d.ts.map

package/dist/find/traverseFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAM/C,OAAO,KAAK,EAAE,qBAAqB,EAAkB,cAAc,EAAE,MAAM,aAAa,CAAA;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAKpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,cAAc,qJAcxB,iBAAiB,4BA8UnB,CAAA"}
+{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAOnF,OAAO,KAAK,EAAE,qBAAqB,EAAkB,cAAc,EAAE,MAAM,aAAa,CAAA;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAKpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,gBAAgB,EAAE;QAChB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;CACF,CAAA;AAED,eAAO,MAAM,cAAc,oPAoBxB,iBAAiB,4BA6lBnB,CAAA"}

package/dist/find/traverseFields.js

@@ -3,7 +3,7 @@ import { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
 import buildQuery from '../queries/buildQuery.js';
 import { chainMethods } from './chainMethods.js';
-export const traverseFields = ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery = {}, joins, locale, path, tablePath, topLevelArgs, topLevelTableName })=>{
+export const traverseFields = ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery = {}, joins, locale, path, select, selectAllOnCurrentLevel = false, selectMode, tablePath, topLevelArgs, topLevelTableName, versions, withinLocalizedField = false, withTabledFields })=>{
     fields.forEach((field)=>{
         if (fieldIsVirtual(field)) {
             return;
@@ -16,7 +16,7 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                 currentArgs.with[`${path}${field.name}`] = true;
             }
         }
-        if (field.type === 'collapsible' || field.type === 'row') {
+        if (field.type === 'collapsible' || field.type === 'row' || field.type === 'tab' && !tabHasName(field)) {
             traverseFields({
                 _locales,
                 adapter,
@@ -27,30 +27,37 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                 joinQuery,
                 joins,
                 path,
+                select,
+                selectMode,
                 tablePath,
                 topLevelArgs,
-                topLevelTableName
+                topLevelTableName,
+                withTabledFields
             });
             return;
         }
         if (field.type === 'tabs') {
-            field.tabs.forEach((tab)=>{
-                const tabPath = tabHasName(tab) ? `${path}${tab.name}_` : path;
-                const tabTablePath = tabHasName(tab) ? `${tablePath}${toSnakeCase(tab.name)}_` : tablePath;
-                traverseFields({
-                    _locales,
-                    adapter,
-                    currentArgs,
-                    currentTableName,
-                    depth,
-                    fields: tab.fields,
-                    joinQuery,
-                    joins,
-                    path: tabPath,
-                    tablePath: tabTablePath,
-                    topLevelArgs,
-                    topLevelTableName
-                });
+            traverseFields({
+                _locales,
+                adapter,
+                currentArgs,
+                currentTableName,
+                depth,
+                fields: field.tabs.map((tab)=>({
+                        ...tab,
+                        type: 'tab'
+                    })),
+                joinQuery,
+                joins,
+                path,
+                select,
+                selectAllOnCurrentLevel,
+                selectMode,
+                tablePath,
+                topLevelArgs,
+                topLevelTableName,
+                versions,
+                withTabledFields
             });
             return;
         }
@@ -58,8 +65,17 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
             switch(field.type){
                 case 'array':
                     {
+                        const arraySelect = selectAllOnCurrentLevel ? true : select?.[field.name];
+                        if (select) {
+                            if (selectMode === 'include' && typeof arraySelect === 'undefined' || selectMode === 'exclude' && arraySelect === false) {
+                                break;
+                            }
+                        }
                         const withArray = {
-                            columns: {
+                            columns: typeof arraySelect === 'object' ? {
+                                id: true,
+                                _order: true
+                            } : {
                                 _parentID: false
                             },
                             orderBy: ({ _order }, { asc })=>[
@@ -68,10 +84,20 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                             with: {}
                         };
                         const arrayTableName = adapter.tableNameMap.get(`${currentTableName}_${tablePath}${toSnakeCase(field.name)}`);
+                        if (typeof arraySelect === 'object') {
+                            if (adapter.tables[arrayTableName]._locale) {
+                                withArray.columns._locale = true;
+                            }
+                            if (adapter.tables[arrayTableName]._uuid) {
+                                withArray.columns._uuid = true;
+                            }
+                        }
                         const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`;
                         if (adapter.tables[arrayTableNameWithLocales]) {
                             withArray.with._locales = {
-                                columns: {
+                                columns: typeof arraySelect === 'object' ? {
+                                    _locale: true
+                                } : {
                                     id: false,
                                     _parentID: false
                                 },
@@ -88,15 +114,27 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                             fields: field.fields,
                             joinQuery,
                             path: '',
+                            select: typeof arraySelect === 'object' ? arraySelect : undefined,
+                            selectMode,
                             tablePath: '',
                             topLevelArgs,
-                            topLevelTableName
+                            topLevelTableName,
+                            withinLocalizedField: withinLocalizedField || field.localized,
+                            withTabledFields
                         });
+                        if (typeof arraySelect === 'object' && withArray.with._locales && Object.keys(withArray.with._locales).length === 1) {
+                            delete withArray.with._locales;
+                        }
                         break;
                     }
                 case 'select':
                     {
                         if (field.hasMany) {
+                            if (select) {
+                                if (selectMode === 'include' && !select[field.name] || selectMode === 'exclude' && select[field.name] === false) {
+                                    break;
+                                }
+                            }
                             const withSelect = {
                                 columns: {
                                     id: false,
@@ -112,43 +150,95 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                         break;
                     }
                 case 'blocks':
-                    field.blocks.forEach((block)=>{
-                        const blockKey = `_blocks_${block.slug}`;
-                        if (!topLevelArgs[blockKey]) {
-                            const withBlock = {
-                                columns: {
-                                    _parentID: false
-                                },
-                                orderBy: ({ _order }, { asc })=>[
-                                        asc(_order)
-                                    ],
-                                with: {}
-                            };
-                            const tableName = adapter.tableNameMap.get(`${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`);
-                            if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {
-                                withBlock.with._locales = {
+                    {
+                        const blocksSelect = selectAllOnCurrentLevel ? true : select?.[field.name];
+                        if (select) {
+                            if (selectMode === 'include' && !blocksSelect || selectMode === 'exclude' && blocksSelect === false) {
+                                break;
+                            }
+                        }
+                        field.blocks.forEach((block)=>{
+                            const blockKey = `_blocks_${block.slug}`;
+                            let blockSelect;
+                            let blockSelectMode = selectMode;
+                            if (selectMode === 'include' && blocksSelect === true) {
+                                blockSelect = true;
+                            }
+                            if (typeof blocksSelect === 'object') {
+                                if (typeof blocksSelect[block.slug] === 'object') {
+                                    blockSelect = blocksSelect[block.slug];
+                                } else if (selectMode === 'include' && typeof blocksSelect[block.slug] === 'undefined' || selectMode === 'exclude' && blocksSelect[block.slug] === false) {
+                                    blockSelect = {};
+                                    blockSelectMode = 'include';
+                                } else if (selectMode === 'include' && blocksSelect[block.slug] === true) {
+                                    blockSelect = true;
+                                }
+                            }
+                            if (!topLevelArgs[blockKey]) {
+                                const withBlock = {
+                                    columns: typeof blockSelect === 'object' ? {
+                                        id: true,
+                                        _order: true,
+                                        _path: true
+                                    } : {
+                                        _parentID: false
+                                    },
+                                    orderBy: ({ _order }, { asc })=>[
+                                            asc(_order)
+                                        ],
                                     with: {}
                                 };
+                                const tableName = adapter.tableNameMap.get(`${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`);
+                                if (typeof blockSelect === 'object') {
+                                    if (adapter.tables[tableName]._locale) {
+                                        withBlock.columns._locale = true;
+                                    }
+                                    if (adapter.tables[tableName]._uuid) {
+                                        withBlock.columns._uuid = true;
+                                    }
+                                }
+                                if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {
+                                    withBlock.with._locales = {
+                                        with: {}
+                                    };
+                                    if (typeof blockSelect === 'object') {
+                                        withBlock.with._locales.columns = {
+                                            _locale: true
+                                        };
+                                    }
+                                }
+                                topLevelArgs.with[blockKey] = withBlock;
+                                traverseFields({
+                                    _locales: withBlock.with._locales,
+                                    adapter,
+                                    currentArgs: withBlock,
+                                    currentTableName: tableName,
+                                    depth,
+                                    fields: block.fields,
+                                    joinQuery,
+                                    path: '',
+                                    select: typeof blockSelect === 'object' ? blockSelect : undefined,
+                                    selectMode: blockSelectMode,
+                                    tablePath: '',
+                                    topLevelArgs,
+                                    topLevelTableName,
+                                    withinLocalizedField: withinLocalizedField || field.localized,
+                                    withTabledFields
+                                });
+                                if (typeof blockSelect === 'object' && withBlock.with._locales && Object.keys(withBlock.with._locales.columns).length === 1) {
+                                    delete withBlock.with._locales;
+                                }
                             }
-                            topLevelArgs.with[blockKey] = withBlock;
-                            traverseFields({
-                                _locales: withBlock.with._locales,
-                                adapter,
-                                currentArgs: withBlock,
-                                currentTableName: tableName,
-                                depth,
-                                fields: block.fields,
-                                joinQuery,
-                                path: '',
-                                tablePath: '',
-                                topLevelArgs,
-                                topLevelTableName
-                            });
-                        }
-                    });
-                    break;
+                        });
+                        break;
+                    }
                 case 'group':
+                case 'tab':
                     {
+                        const fieldSelect = select?.[field.name];
+                        if (fieldSelect === false) {
+                            break;
+                        }
                         traverseFields({
                             _locales,
                             adapter,
@@ -159,19 +249,61 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                             joinQuery,
                             joins,
                             path: `${path}${field.name}_`,
+                            select: typeof fieldSelect === 'object' ? fieldSelect : undefined,
+                            selectAllOnCurrentLevel: selectAllOnCurrentLevel || fieldSelect === true || selectMode === 'exclude' && typeof fieldSelect === 'undefined',
+                            selectMode,
                             tablePath: `${tablePath}${toSnakeCase(field.name)}_`,
                             topLevelArgs,
-                            topLevelTableName
+                            topLevelTableName,
+                            versions,
+                            withinLocalizedField: withinLocalizedField || field.localized,
+                            withTabledFields
                         });
                         break;
                     }
+                case 'point':
+                    {
+                        if (adapter.name === 'sqlite') {
+                            break;
+                        }
+                        const args = field.localized ? _locales : currentArgs;
+                        if (!args.columns) {
+                            args.columns = {};
+                        }
+                        if (!args.extras) {
+                            args.extras = {};
+                        }
+                        const name = `${path}${field.name}`;
+                        // Drizzle handles that poorly. See https://github.com/drizzle-team/drizzle-orm/issues/2526
+                        // Additionally, this way we format the column value straight in the database using ST_AsGeoJSON
+                        args.columns[name] = false;
+                        let shouldSelect = false;
+                        if (select || selectAllOnCurrentLevel) {
+                            if (selectAllOnCurrentLevel || selectMode === 'include' && select[field.name] === true || selectMode === 'exclude' && typeof select[field.name] === 'undefined') {
+                                shouldSelect = true;
+                            }
+                        } else {
+                            shouldSelect = true;
+                        }
+                        if (shouldSelect) {
+                            args.extras[name] = sql.raw(`ST_AsGeoJSON(${toSnakeCase(name)})::jsonb`).as(name);
+                        }
+                        break;
+                    }
                 case 'join':
                     {
                         // when `joinsQuery` is false, do not join
                         if (joinQuery === false) {
                             break;
                         }
-                        const { limit: limitArg = 10, sort, where } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {};
+                        if (select && selectMode === 'include' && !select[field.name] || selectMode === 'exclude' && select[field.name] === false) {
+                            break;
+                        }
+                        const joinSchemaPath = `${path.replaceAll('_', '.')}${field.name}`;
+                        if (joinQuery[joinSchemaPath] === false) {
+                            break;
+                        }
+                        const { limit: limitArg = field.defaultLimit ?? 10, sort = field.defaultSort, where } = joinQuery[joinSchemaPath] || {};
                         let limit = limitArg;
                         if (limit !== 0) {
                             // get an additional document and slice it later to determine if there is a next page
@@ -179,52 +311,89 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                         }
                         const fields = adapter.payload.collections[field.collection].config.fields;
                         const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
-                        let joinTableName = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${field.localized && adapter.payload.config.localization ? adapter.localesSuffix : ''}`;
+                        const joins = [];
+                        const buildQueryResult = buildQuery({
+                            adapter,
+                            fields,
+                            joins,
+                            locale,
+                            sort,
+                            tableName: joinCollectionTableName,
+                            where
+                        });
+                        let subQueryWhere = buildQueryResult.where;
+                        const orderBy = buildQueryResult.orderBy;
+                        let joinLocalesCollectionTableName;
+                        const currentIDColumn = versions ? adapter.tables[currentTableName].parent : adapter.tables[currentTableName].id;
+                        // Handle hasMany _rels table
                         if (field.hasMany) {
-                            const db = adapter.drizzle;
+                            const joinRelsCollectionTableName = `${joinCollectionTableName}${adapter.relationshipsSuffix}`;
                             if (field.localized) {
-                                joinTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
+                                joinLocalesCollectionTableName = joinRelsCollectionTableName;
                             }
-                            const joinTable = `${joinTableName}${adapter.relationshipsSuffix}`;
-                            const joins = [
-                                {
-                                    type: 'innerJoin',
-                                    condition: and(eq(adapter.tables[joinTable].parent, adapter.tables[joinTableName].id), eq(sql.raw(`"${joinTable}"."${topLevelTableName}_id"`), adapter.tables[currentTableName].id), eq(adapter.tables[joinTable].path, field.on)),
-                                    table: adapter.tables[joinTable]
-                                }
-                            ];
-                            const { orderBy, where: subQueryWhere } = buildQuery({
-                                adapter,
-                                fields,
-                                joins,
-                                locale,
-                                sort,
-                                tableName: joinCollectionTableName,
-                                where: {}
+                            let columnReferenceToCurrentID;
+                            if (versions) {
+                                columnReferenceToCurrentID = `${topLevelTableName.replace('_', '').replace(new RegExp(`${adapter.versionsSuffix}$`), '')}_id`;
+                            } else {
+                                columnReferenceToCurrentID = `${topLevelTableName}_id`;
+                            }
+                            joins.push({
+                                type: 'innerJoin',
+                                condition: and(eq(adapter.tables[joinRelsCollectionTableName].parent, adapter.tables[joinCollectionTableName].id), eq(sql.raw(`"${joinRelsCollectionTableName}"."${columnReferenceToCurrentID}"`), currentIDColumn), eq(adapter.tables[joinRelsCollectionTableName].path, field.on)),
+                                table: adapter.tables[joinRelsCollectionTableName]
                             });
-                            const chainedMethods = [];
-                            joins.forEach(({ type, condition, table })=>{
-                                chainedMethods.push({
-                                    args: [
-                                        table,
-                                        condition
-                                    ],
-                                    method: type ?? 'leftJoin'
+                        } else {
+                            // Handle localized without hasMany
+                            const foreignColumn = field.on.replaceAll('.', '_');
+                            if (field.localized) {
+                                joinLocalesCollectionTableName = `${joinCollectionTableName}${adapter.localesSuffix}`;
+                                joins.push({
+                                    type: 'innerJoin',
+                                    condition: and(eq(adapter.tables[joinLocalesCollectionTableName]._parentID, adapter.tables[joinCollectionTableName].id), eq(adapter.tables[joinLocalesCollectionTableName][foreignColumn], currentIDColumn)),
+                                    table: adapter.tables[joinLocalesCollectionTableName]
                                 });
+                            // Handle without localized and without hasMany, just a condition append to where. With localized the inner join handles eq.
+                            } else {
+                                const constraint = eq(adapter.tables[joinCollectionTableName][foreignColumn], currentIDColumn);
+                                if (subQueryWhere) {
+                                    subQueryWhere = and(subQueryWhere, constraint);
+                                } else {
+                                    subQueryWhere = constraint;
+                                }
+                            }
+                        }
+                        const chainedMethods = [];
+                        joins.forEach(({ type, condition, table })=>{
+                            chainedMethods.push({
+                                args: [
+                                    table,
+                                    condition
+                                ],
+                                method: type ?? 'leftJoin'
                             });
-                            const subQuery = chainMethods({
-                                methods: chainedMethods,
-                                query: db.select({
-                                    id: adapter.tables[joinTableName].id,
-                                    ...field.localized && {
-                                        locale: adapter.tables[joinTable].locale
-                                    }
-                                }).from(adapter.tables[joinTableName]).where(subQueryWhere).orderBy(orderBy.order(orderBy.column)).limit(limit)
+                        });
+                        if (limit !== 0) {
+                            chainedMethods.push({
+                                args: [
+                                    limit
+                                ],
+                                method: 'limit'
                             });
-                            const columnName = `${path.replaceAll('.', '_')}${field.name}`;
-                            const jsonObjectSelect = field.localized ? sql.raw(`'_parentID', "id", '_locale', "locale"`) : sql.raw(`'id', "id"`);
-                            if (adapter.name === 'sqlite') {
-                                currentArgs.extras[columnName] = sql`
+                        }
+                        const db = adapter.drizzle;
+                        const subQuery = chainMethods({
+                            methods: chainedMethods,
+                            query: db.select({
+                                id: adapter.tables[joinCollectionTableName].id,
+                                ...joinLocalesCollectionTableName && {
+                                    locale: adapter.tables[joinLocalesCollectionTableName].locale || adapter.tables[joinLocalesCollectionTableName]._locale
+                                }
+                            }).from(adapter.tables[joinCollectionTableName]).where(subQueryWhere).orderBy(()=>orderBy.map(({ column, order })=>order(column)))
+                        });
+                        const columnName = `${path.replaceAll('.', '_')}${field.name}`;
+                        const jsonObjectSelect = field.localized ? sql.raw(`'_parentID', "id", '_locale', "${adapter.tables[joinLocalesCollectionTableName].locale ? 'locale' : '_locale'}"`) : sql.raw(`'id', "id"`);
+                        if (adapter.name === 'sqlite') {
+                            currentArgs.extras[columnName] = sql`
               COALESCE((
                 SELECT json_group_array(json_object(${jsonObjectSelect}))
                 FROM (
@@ -232,8 +401,8 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                 ) AS ${sql.raw(`${columnName}_sub`)}
               ), '[]')
             `.as(columnName);
-                            } else {
-                                currentArgs.extras[columnName] = sql`
+                        } else {
+                            currentArgs.extras[columnName] = sql`
               COALESCE((
                 SELECT json_agg(json_build_object(${jsonObjectSelect}))
                 FROM (
@@ -241,41 +410,31 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                 ) AS ${sql.raw(`${columnName}_sub`)}
               ), '[]'::json)
             `.as(columnName);
-                            }
-                            break;
-                        }
-                        const selectFields = {};
-                        const withJoin = {
-                            columns: selectFields
-                        };
-                        if (limit) {
-                            withJoin.limit = limit;
                         }
-                        if (field.localized) {
-                            withJoin.columns._locale = true;
-                            withJoin.columns._parentID = true;
-                        } else {
-                            withJoin.columns.id = true;
-                            withJoin.columns.parent = true;
-                        }
-                        const { orderBy, where: joinWhere } = buildQuery({
-                            adapter,
-                            fields,
-                            joins,
-                            locale,
-                            sort,
-                            tableName: joinTableName,
-                            where
-                        });
-                        if (joinWhere) {
-                            withJoin.where = ()=>joinWhere;
-                        }
-                        withJoin.orderBy = orderBy.order(orderBy.column);
-                        currentArgs.with[`${path.replaceAll('.', '_')}${field.name}`] = withJoin;
                         break;
                     }
                 default:
                     {
+                        if (!select && !selectAllOnCurrentLevel) {
+                            break;
+                        }
+                        if (selectAllOnCurrentLevel || selectMode === 'include' && select[field.name] === true || selectMode === 'exclude' && typeof select[field.name] === 'undefined') {
+                            const fieldPath = `${path}${field.name}`;
+                            if ((field.localized || withinLocalizedField) && _locales) {
+                                _locales.columns[fieldPath] = true;
+                            } else if (adapter.tables[currentTableName]?.[fieldPath]) {
+                                currentArgs.columns[fieldPath] = true;
+                            }
+                            if (!withTabledFields.rels && field.type === 'relationship' && (field.hasMany || Array.isArray(field.relationTo))) {
+                                withTabledFields.rels = true;
+                            }
+                            if (!withTabledFields.numbers && field.type === 'number' && field.hasMany) {
+                                withTabledFields.numbers = true;
+                            }
+                            if (!withTabledFields.texts && field.type === 'text' && field.hasMany) {
+                                withTabledFields.texts = true;
+                            }
+                        }
                         break;
                     }
             }