@payloadcms/drizzle 3.1.1-canary.c40ff01 → 3.1.2-canary.eb1a61e

package/dist/find/traverseFields.js

@@ -1,5 +1,5 @@
 import { and, eq, sql } from 'drizzle-orm';
-import { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared';
+import { fieldIsVirtual } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
 import buildQuery from '../queries/buildQuery.js';
 import { chainMethods } from './chainMethods.js';
@@ -16,333 +16,287 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                 currentArgs.with[`${path}${field.name}`] = true;
             }
         }
-        if (field.type === 'collapsible' || field.type === 'row' || field.type === 'tab' && !tabHasName(field)) {
-            traverseFields({
-                _locales,
-                adapter,
-                currentArgs,
-                currentTableName,
-                depth,
-                fields: field.fields,
-                joinQuery,
-                joins,
-                path,
-                select,
-                selectMode,
-                tablePath,
-                topLevelArgs,
-                topLevelTableName,
-                withTabledFields
-            });
-            return;
-        }
-        if (field.type === 'tabs') {
-            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;
-        }
-        if (fieldAffectsData(field)) {
-            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;
-                            }
+        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: typeof arraySelect === 'object' ? {
+                            id: true,
+                            _order: true
+                        } : {
+                            _parentID: false
+                        },
+                        orderBy: ({ _order }, { asc })=>[
+                                asc(_order)
+                            ],
+                        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 withArray = {
+                    }
+                    const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`;
+                    if (adapter.tables[arrayTableNameWithLocales]) {
+                        withArray.with._locales = {
                             columns: typeof arraySelect === 'object' ? {
-                                id: true,
-                                _order: true
+                                _locale: true
                             } : {
+                                id: false,
                                 _parentID: false
                             },
-                            orderBy: ({ _order }, { asc })=>[
-                                    asc(_order)
-                                ],
                             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;
+                    }
+                    currentArgs.with[`${path}${field.name}`] = withArray;
+                    traverseFields({
+                        _locales: withArray.with._locales,
+                        adapter,
+                        currentArgs: withArray,
+                        currentTableName: arrayTableName,
+                        depth,
+                        fields: field.flattenedFields,
+                        joinQuery,
+                        path: '',
+                        select: typeof arraySelect === 'object' ? arraySelect : undefined,
+                        selectMode,
+                        tablePath: '',
+                        topLevelArgs,
+                        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 'blocks':
+                {
+                    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;
                             }
                         }
-                        const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`;
-                        if (adapter.tables[arrayTableNameWithLocales]) {
-                            withArray.with._locales = {
-                                columns: typeof arraySelect === 'object' ? {
-                                    _locale: true
+                        if (!topLevelArgs[blockKey]) {
+                            const withBlock = {
+                                columns: typeof blockSelect === 'object' ? {
+                                    id: true,
+                                    _order: true,
+                                    _path: true
                                 } : {
-                                    id: false,
                                     _parentID: false
                                 },
+                                orderBy: ({ _order }, { asc })=>[
+                                        asc(_order)
+                                    ],
                                 with: {}
                             };
-                        }
-                        currentArgs.with[`${path}${field.name}`] = withArray;
-                        traverseFields({
-                            _locales: withArray.with._locales,
-                            adapter,
-                            currentArgs: withArray,
-                            currentTableName: arrayTableName,
-                            depth,
-                            fields: field.fields,
-                            joinQuery,
-                            path: '',
-                            select: typeof arraySelect === 'object' ? arraySelect : undefined,
-                            selectMode,
-                            tablePath: '',
-                            topLevelArgs,
-                            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 'blocks':
-                    {
-                        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;
+                            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 (!topLevelArgs[blockKey]) {
-                                const withBlock = {
-                                    columns: typeof blockSelect === 'object' ? {
-                                        id: true,
-                                        _order: true,
-                                        _path: true
-                                    } : {
-                                        _parentID: false
-                                    },
-                                    orderBy: ({ _order }, { asc })=>[
-                                            asc(_order)
-                                        ],
+                            if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {
+                                withBlock.with._locales = {
                                     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: {}
+                                    withBlock.with._locales.columns = {
+                                        _locale: true
                                     };
-                                    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.flattenedFields,
+                                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;
+                            }
+                        }
+                    });
+                    break;
+                }
+            case 'group':
+            case 'tab':
+                {
+                    const fieldSelect = select?.[field.name];
+                    if (fieldSelect === false) {
                         break;
                     }
-                case 'group':
-                case 'tab':
-                    {
-                        const fieldSelect = select?.[field.name];
-                        if (fieldSelect === false) {
-                            break;
-                        }
-                        traverseFields({
-                            _locales,
-                            adapter,
-                            currentArgs,
-                            currentTableName,
-                            depth,
-                            fields: field.fields,
-                            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,
-                            versions,
-                            withinLocalizedField: withinLocalizedField || field.localized,
-                            withTabledFields
-                        });
+                    traverseFields({
+                        _locales,
+                        adapter,
+                        currentArgs,
+                        currentTableName,
+                        depth,
+                        fields: field.flattenedFields,
+                        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,
+                        versions,
+                        withinLocalizedField: withinLocalizedField || field.localized,
+                        withTabledFields
+                    });
+                    break;
+                }
+            case 'join':
+                {
+                    // when `joinsQuery` is false, do not join
+                    if (joinQuery === false) {
                         break;
                     }
-                case 'join':
-                    {
-                        // when `joinsQuery` is false, do not join
-                        if (joinQuery === false) {
-                            break;
-                        }
-                        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;
+                    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
+                        limit += 1;
+                    }
+                    const fields = adapter.payload.collections[field.collection].config.flattenedFields;
+                    const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
+                    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 joinRelsCollectionTableName = `${joinCollectionTableName}${adapter.relationshipsSuffix}`;
+                        if (field.localized) {
+                            joinLocalesCollectionTableName = joinRelsCollectionTableName;
                         }
-                        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
-                            limit += 1;
+                        let columnReferenceToCurrentID;
+                        if (versions) {
+                            columnReferenceToCurrentID = `${topLevelTableName.replace('_', '').replace(new RegExp(`${adapter.versionsSuffix}$`), '')}_id`;
+                        } else {
+                            columnReferenceToCurrentID = `${topLevelTableName}_id`;
                         }
-                        const fields = adapter.payload.collections[field.collection].config.fields;
-                        const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
-                        const joins = [];
-                        const buildQueryResult = buildQuery({
-                            adapter,
-                            fields,
-                            joins,
-                            locale,
-                            sort,
-                            tableName: joinCollectionTableName,
-                            where
+                        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]
                         });
-                        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 joinRelsCollectionTableName = `${joinCollectionTableName}${adapter.relationshipsSuffix}`;
-                            if (field.localized) {
-                                joinLocalesCollectionTableName = joinRelsCollectionTableName;
-                            }
-                            let columnReferenceToCurrentID;
-                            if (versions) {
-                                columnReferenceToCurrentID = `${topLevelTableName.replace('_', '').replace(new RegExp(`${adapter.versionsSuffix}$`), '')}_id`;
-                            } else {
-                                columnReferenceToCurrentID = `${topLevelTableName}_id`;
-                            }
+                    } 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[joinRelsCollectionTableName].parent, adapter.tables[joinCollectionTableName].id), eq(sql.raw(`"${joinRelsCollectionTableName}"."${columnReferenceToCurrentID}"`), currentIDColumn), eq(adapter.tables[joinRelsCollectionTableName].path, field.on)),
-                                table: adapter.tables[joinRelsCollectionTableName]
+                                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 {
-                            // 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.
+                            const constraint = eq(adapter.tables[joinCollectionTableName][foreignColumn], currentIDColumn);
+                            if (subQueryWhere) {
+                                subQueryWhere = and(subQueryWhere, constraint);
                             } else {
-                                const constraint = eq(adapter.tables[joinCollectionTableName][foreignColumn], currentIDColumn);
-                                if (subQueryWhere) {
-                                    subQueryWhere = and(subQueryWhere, constraint);
-                                } else {
-                                    subQueryWhere = constraint;
-                                }
+                                subQueryWhere = constraint;
                             }
                         }
-                        const chainedMethods = [];
-                        joins.forEach(({ type, condition, table })=>{
-                            chainedMethods.push({
-                                args: [
-                                    table,
-                                    condition
-                                ],
-                                method: type ?? 'leftJoin'
-                            });
+                    }
+                    const chainedMethods = [];
+                    joins.forEach(({ type, condition, table })=>{
+                        chainedMethods.push({
+                            args: [
+                                table,
+                                condition
+                            ],
+                            method: type ?? 'leftJoin'
                         });
-                        if (limit !== 0) {
-                            chainedMethods.push({
-                                args: [
-                                    limit
-                                ],
-                                method: 'limit'
-                            });
-                        }
-                        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)))
+                    });
+                    if (limit !== 0) {
+                        chainedMethods.push({
+                            args: [
+                                limit
+                            ],
+                            method: 'limit'
                         });
-                        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`
+                    }
+                    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 (
@@ -350,8 +304,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 (
@@ -359,85 +313,84 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                 ) AS ${sql.raw(`${columnName}_sub`)}
               ), '[]'::json)
             `.as(columnName);
-                        }
+                    }
+                    break;
+                }
+            case 'point':
+                {
+                    if (adapter.name === 'sqlite') {
                         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 {
+                    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;
                         }
-                        if (shouldSelect) {
-                            args.extras[name] = sql.raw(`ST_AsGeoJSON(${toSnakeCase(name)})::jsonb`).as(name);
-                        }
-                        break;
+                    } else {
+                        shouldSelect = true;
                     }
-                case 'select':
-                    {
-                        if (field.hasMany) {
-                            if (select) {
-                                if (selectMode === 'include' && !select[field.name] || selectMode === 'exclude' && select[field.name] === false) {
-                                    break;
-                                }
+                    if (shouldSelect) {
+                        args.extras[name] = sql.raw(`ST_AsGeoJSON(${toSnakeCase(name)})::jsonb`).as(name);
+                    }
+                    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,
-                                    order: false,
-                                    parent: false
-                                },
-                                orderBy: ({ order }, { asc })=>[
-                                        asc(order)
-                                    ]
-                            };
-                            currentArgs.with[`${path}${field.name}`] = withSelect;
                         }
+                        const withSelect = {
+                            columns: {
+                                id: false,
+                                order: false,
+                                parent: false
+                            },
+                            orderBy: ({ order }, { asc })=>[
+                                    asc(order)
+                                ]
+                        };
+                        currentArgs.with[`${path}${field.name}`] = withSelect;
+                    }
+                    break;
+                }
+            default:
+                {
+                    if (!select && !selectAllOnCurrentLevel) {
                         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 (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;
-                            }
+                        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;
                     }
-            }
+                    break;
+                }
         }
     });
     return topLevelArgs;