@payloadcms/drizzle 3.0.0-canary.96477cf → 3.0.0-canary.98e0119

package/dist/find/findMany.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/findMany.ts"],"sourcesContent":["import type { Field, FindArgs, PayloadRequest, TypeWithID } from 'payload'\n\nimport { inArray } from 'drizzle-orm'\n\nimport type { DrizzleAdapter } from '../types.js'\nimport type { ChainedMethods } from './chainMethods.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { selectDistinct } from '../queries/selectDistinct.js'\nimport { transform } from '../transform/read/index.js'\nimport { buildFindManyArgs } from './buildFindManyArgs.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  tableName: string\n} & Omit<FindArgs, 'collection'>\n\nexport const findMany = async function find({\n  adapter,\n  fields,\n  joins: joinQuery,\n  limit: limitArg,\n  locale,\n  page = 1,\n  pagination,\n  req = {} as PayloadRequest,\n  skip,\n  sort,\n  tableName,\n  where: whereArg,\n}: Args) {\n  const db = adapter.sessions[await req.transactionID]?.db || adapter.drizzle\n  let limit = limitArg\n  let totalDocs: number\n  let totalPages: number\n  let hasPrevPage: boolean\n  let hasNextPage: boolean\n  let pagingCounter: number\n  const offset = skip || (page - 1) * limit\n\n  if (limit === 0) {\n    limit = undefined\n  }\n\n  const { joins, orderBy, selectFields, where } = buildQuery({\n    adapter,\n    fields,\n    locale,\n    sort,\n    tableName,\n    where: whereArg,\n  })\n\n  const orderedIDMap: Record<number | string, number> = {}\n  let orderedIDs: (number | string)[]\n\n  const selectDistinctMethods: ChainedMethods = []\n\n  if (orderBy?.order && orderBy?.column) {\n    selectDistinctMethods.push({\n      args: [orderBy.order(orderBy.column)],\n      method: 'orderBy',\n    })\n  }\n\n  const findManyArgs = buildFindManyArgs({\n    adapter,\n    depth: 0,\n    fields,\n    joinQuery,\n    joins,\n    tableName,\n  })\n\n  selectDistinctMethods.push({ args: [offset], method: 'offset' })\n  selectDistinctMethods.push({ args: [limit], method: 'limit' })\n\n  const selectDistinctResult = await selectDistinct({\n    adapter,\n    chainedMethods: selectDistinctMethods,\n    db,\n    joins,\n    selectFields,\n    tableName,\n    where,\n  })\n\n  if (selectDistinctResult) {\n    if (selectDistinctResult.length === 0) {\n      return {\n        docs: [],\n        hasNextPage: false,\n        hasPrevPage: false,\n        limit,\n        nextPage: null,\n        page: 1,\n        pagingCounter: 0,\n        prevPage: null,\n        totalDocs: 0,\n        totalPages: 0,\n      }\n    } else {\n      // set the id in an object for sorting later\n      selectDistinctResult.forEach(({ id }, i) => {\n        orderedIDMap[id] = i\n      })\n      orderedIDs = Object.keys(orderedIDMap)\n      findManyArgs.where = inArray(adapter.tables[tableName].id, orderedIDs)\n    }\n  } else {\n    findManyArgs.limit = limit\n    findManyArgs.offset = offset\n    findManyArgs.orderBy = orderBy.order(orderBy.column)\n\n    if (where) {\n      findManyArgs.where = where\n    }\n  }\n\n  const findPromise = db.query[tableName].findMany(findManyArgs)\n\n  if (pagination !== false && (orderedIDs ? orderedIDs?.length <= limit : true)) {\n    totalDocs = await adapter.countDistinct({\n      db,\n      joins,\n      tableName,\n      where,\n    })\n\n    totalPages = typeof limit === 'number' && limit !== 0 ? Math.ceil(totalDocs / limit) : 1\n    hasPrevPage = page > 1\n    hasNextPage = totalPages > page\n    pagingCounter = (page - 1) * limit + 1\n  }\n\n  const rawDocs = await findPromise\n  // sort rawDocs from selectQuery\n  if (Object.keys(orderedIDMap).length > 0) {\n    rawDocs.sort((a, b) => orderedIDMap[a.id] - orderedIDMap[b.id])\n  }\n\n  if (pagination === false || !totalDocs) {\n    totalDocs = rawDocs.length\n    totalPages = 1\n    pagingCounter = 1\n    hasPrevPage = false\n    hasNextPage = false\n  }\n\n  const docs = rawDocs.map((data: TypeWithID) => {\n    return transform({\n      adapter,\n      config: adapter.payload.config,\n      data,\n      fields,\n      joinQuery,\n    })\n  })\n\n  return {\n    docs,\n    hasNextPage,\n    hasPrevPage,\n    limit: limitArg,\n    nextPage: hasNextPage ? page + 1 : null,\n    page,\n    pagingCounter,\n    prevPage: hasPrevPage ? page - 1 : null,\n    totalDocs,\n    totalPages,\n  }\n}\n"],"names":["inArray","buildQuery","selectDistinct","transform","buildFindManyArgs","findMany","find","adapter","fields","joins","joinQuery","limit","limitArg","locale","page","pagination","req","skip","sort","tableName","where","whereArg","db","sessions","transactionID","drizzle","totalDocs","totalPages","hasPrevPage","hasNextPage","pagingCounter","offset","undefined","orderBy","selectFields","orderedIDMap","orderedIDs","selectDistinctMethods","order","column","push","args","method","findManyArgs","depth","selectDistinctResult","chainedMethods","length","docs","nextPage","prevPage","forEach","id","i","Object","keys","tables","findPromise","query","countDistinct","Math","ceil","rawDocs","a","b","map","data","config","payload"],"mappings":"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"}
+{"version":3,"sources":["../../src/find/findMany.ts"],"sourcesContent":["import type { Field, FindArgs, PayloadRequest, TypeWithID } from 'payload'\n\nimport { inArray } from 'drizzle-orm'\n\nimport type { DrizzleAdapter } from '../types.js'\nimport type { ChainedMethods } from './chainMethods.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { selectDistinct } from '../queries/selectDistinct.js'\nimport { transform } from '../transform/read/index.js'\nimport { buildFindManyArgs } from './buildFindManyArgs.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  tableName: string\n  versions?: boolean\n} & Omit<FindArgs, 'collection'>\n\nexport const findMany = async function find({\n  adapter,\n  fields,\n  joins: joinQuery,\n  limit: limitArg,\n  locale,\n  page = 1,\n  pagination,\n  req = {} as PayloadRequest,\n  select,\n  skip,\n  sort,\n  tableName,\n  versions,\n  where: whereArg,\n}: Args) {\n  const db = adapter.sessions[await req.transactionID]?.db || adapter.drizzle\n  let limit = limitArg\n  let totalDocs: number\n  let totalPages: number\n  let hasPrevPage: boolean\n  let hasNextPage: boolean\n  let pagingCounter: number\n  const offset = skip || (page - 1) * limit\n\n  if (limit === 0) {\n    limit = undefined\n  }\n\n  const { joins, orderBy, selectFields, where } = buildQuery({\n    adapter,\n    fields,\n    locale,\n    sort,\n    tableName,\n    where: whereArg,\n  })\n\n  const orderedIDMap: Record<number | string, number> = {}\n  let orderedIDs: (number | string)[]\n\n  const selectDistinctMethods: ChainedMethods = []\n\n  if (orderBy) {\n    selectDistinctMethods.push({\n      args: [() => orderBy.map(({ column, order }) => order(column))],\n      method: 'orderBy',\n    })\n  }\n\n  const findManyArgs = buildFindManyArgs({\n    adapter,\n    depth: 0,\n    fields,\n    joinQuery,\n    joins,\n    select,\n    tableName,\n    versions,\n  })\n\n  selectDistinctMethods.push({ args: [offset], method: 'offset' })\n  selectDistinctMethods.push({ args: [limit], method: 'limit' })\n\n  const selectDistinctResult = await selectDistinct({\n    adapter,\n    chainedMethods: selectDistinctMethods,\n    db,\n    joins,\n    selectFields,\n    tableName,\n    where,\n  })\n\n  if (selectDistinctResult) {\n    if (selectDistinctResult.length === 0) {\n      return {\n        docs: [],\n        hasNextPage: false,\n        hasPrevPage: false,\n        limit,\n        nextPage: null,\n        page: 1,\n        pagingCounter: 0,\n        prevPage: null,\n        totalDocs: 0,\n        totalPages: 0,\n      }\n    } else {\n      // set the id in an object for sorting later\n      selectDistinctResult.forEach(({ id }, i) => {\n        orderedIDMap[id] = i\n      })\n      orderedIDs = Object.keys(orderedIDMap)\n      findManyArgs.where = inArray(adapter.tables[tableName].id, orderedIDs)\n    }\n  } else {\n    findManyArgs.limit = limit\n    findManyArgs.offset = offset\n    findManyArgs.orderBy = () => orderBy.map(({ column, order }) => order(column))\n\n    if (where) {\n      findManyArgs.where = where\n    }\n  }\n\n  const findPromise = db.query[tableName].findMany(findManyArgs)\n\n  if (pagination !== false && (orderedIDs ? orderedIDs?.length <= limit : true)) {\n    totalDocs = await adapter.countDistinct({\n      db,\n      joins,\n      tableName,\n      where,\n    })\n\n    totalPages = typeof limit === 'number' && limit !== 0 ? Math.ceil(totalDocs / limit) : 1\n    hasPrevPage = page > 1\n    hasNextPage = totalPages > page\n    pagingCounter = (page - 1) * limit + 1\n  }\n\n  const rawDocs = await findPromise\n  // sort rawDocs from selectQuery\n  if (Object.keys(orderedIDMap).length > 0) {\n    rawDocs.sort((a, b) => orderedIDMap[a.id] - orderedIDMap[b.id])\n  }\n\n  if (pagination === false || !totalDocs) {\n    totalDocs = rawDocs.length\n    totalPages = 1\n    pagingCounter = 1\n    hasPrevPage = false\n    hasNextPage = false\n  }\n\n  const docs = rawDocs.map((data: TypeWithID) => {\n    return transform({\n      adapter,\n      config: adapter.payload.config,\n      data,\n      fields,\n      joinQuery,\n    })\n  })\n\n  return {\n    docs,\n    hasNextPage,\n    hasPrevPage,\n    limit: limitArg,\n    nextPage: hasNextPage ? page + 1 : null,\n    page,\n    pagingCounter,\n    prevPage: hasPrevPage ? page - 1 : null,\n    totalDocs,\n    totalPages,\n  }\n}\n"],"names":["inArray","buildQuery","selectDistinct","transform","buildFindManyArgs","findMany","find","adapter","fields","joins","joinQuery","limit","limitArg","locale","page","pagination","req","select","skip","sort","tableName","versions","where","whereArg","db","sessions","transactionID","drizzle","totalDocs","totalPages","hasPrevPage","hasNextPage","pagingCounter","offset","undefined","orderBy","selectFields","orderedIDMap","orderedIDs","selectDistinctMethods","push","args","map","column","order","method","findManyArgs","depth","selectDistinctResult","chainedMethods","length","docs","nextPage","prevPage","forEach","id","i","Object","keys","tables","findPromise","query","countDistinct","Math","ceil","rawDocs","a","b","data","config","payload"],"mappings":"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"}

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":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAK/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACxE,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,4BA+PnB,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

@@ -1,8 +1,9 @@
+import { and, eq, sql } from 'drizzle-orm';
 import { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
-import { buildOrderBy } from '../queries/buildOrderBy.js';
 import buildQuery from '../queries/buildQuery.js';
-export const traverseFields = ({ _locales, adapter, currentArgs, currentTableName, depth, fields, joinQuery = {}, joins, locale, path, tablePath, topLevelArgs, topLevelTableName })=>{
+import { chainMethods } from './chainMethods.js';
+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;
@@ -15,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,
@@ -26,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;
         }
@@ -57,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 })=>[
@@ -67,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
                                 },
@@ -87,67 +114,109 @@ 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
                         });
-                        break;
-                    }
-                case 'select':
-                    {
-                        if (field.hasMany) {
-                            const withSelect = {
-                                columns: {
-                                    id: false,
-                                    order: false,
-                                    parent: false
-                                },
-                                orderBy: ({ order }, { asc })=>[
-                                        asc(order)
-                                    ]
-                            };
-                            currentArgs.with[`${path}${field.name}`] = withSelect;
+                        if (typeof arraySelect === 'object' && withArray.with._locales && Object.keys(withArray.with._locales).length === 1) {
+                            delete withArray.with._locales;
                         }
                         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,
@@ -158,9 +227,15 @@ 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;
                     }
@@ -170,56 +245,196 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                         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
                             limit += 1;
                         }
                         const fields = adapter.payload.collections[field.collection].config.fields;
-                        const joinTableName = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${field.localized && adapter.payload.config.localization ? adapter.localesSuffix : ''}`;
-                        const selectFields = {};
-                        const orderBy = buildOrderBy({
+                        const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
+                        const joins = [];
+                        const buildQueryResult = buildQuery({
                             adapter,
                             fields,
-                            joins: [],
+                            joins,
                             locale,
-                            selectFields,
                             sort,
-                            tableName: joinTableName
+                            tableName: joinCollectionTableName,
+                            where
                         });
-                        const withJoin = {
-                            columns: selectFields,
-                            orderBy: ()=>[
-                                    orderBy.order(orderBy.column)
-                                ]
-                        };
-                        if (limit) {
-                            withJoin.limit = limit;
-                        }
-                        if (field.localized) {
-                            withJoin.columns._locale = true;
-                            withJoin.columns._parentID = true;
+                        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`;
+                            }
+                            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]
+                            });
                         } else {
-                            withJoin.columns.id = true;
-                        }
-                        if (where) {
-                            const { where: joinWhere } = buildQuery({
-                                adapter,
-                                fields,
-                                joins,
-                                locale,
-                                sort,
-                                tableName: joinTableName,
-                                where
+                            // 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'
+                            });
+                        });
+                        if (limit !== 0) {
+                            chainedMethods.push({
+                                args: [
+                                    limit
+                                ],
+                                method: 'limit'
                             });
-                            withJoin.where = ()=>joinWhere;
                         }
-                        currentArgs.with[`${path.replaceAll('.', '_')}${field.name}`] = withJoin;
+                        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 (
+                  ${subQuery}
+                ) AS ${sql.raw(`${columnName}_sub`)}
+              ), '[]')
+            `.as(columnName);
+                        } else {
+                            currentArgs.extras[columnName] = sql`
+              COALESCE((
+                SELECT json_agg(json_build_object(${jsonObjectSelect}))
+                FROM (
+                  ${subQuery}
+                ) AS ${sql.raw(`${columnName}_sub`)}
+              ), '[]'::json)
+            `.as(columnName);
+                        }
+                        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 '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;
+                        }
                         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;
                     }
             }