@payloadcms/drizzle 3.0.0-beta.117 → 3.0.0-beta.118

package/dist/find/buildFindManyArgs.d.ts

@@ -12,12 +12,13 @@ type BuildFindQueryArgs = {
     joins?: BuildQueryJoinAliases;
     locale?: string;
     tableName: string;
+    versions?: boolean;
 };
 export type Result = {
     with?: {
         _locales?: DBQueryConfig<'many', true, any, any>;
     } & DBQueryConfig<'many', true, any, any>;
 } & DBQueryConfig<'many', true, any, any>;
-export declare const buildFindManyArgs: ({ adapter, depth, fields, joinQuery, joins, locale, tableName, }: BuildFindQueryArgs) => Record<string, unknown>;
+export declare const buildFindManyArgs: ({ adapter, depth, fields, joinQuery, joins, locale, tableName, versions, }: BuildFindQueryArgs) => Record<string, unknown>;
 export {};
 //# sourceMappingURL=buildFindManyArgs.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildFindManyArgs.d.ts","sourceRoot":"","sources":["../../src/find/buildFindManyArgs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAE/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAIxE,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,cAAc,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;KACjD,GAAG,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;CAC1C,GAAG,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAIzC,eAAO,MAAM,iBAAiB,qEAQ3B,kBAAkB,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAkE7C,CAAA"}
+{"version":3,"file":"buildFindManyArgs.d.ts","sourceRoot":"","sources":["../../src/find/buildFindManyArgs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAE/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAIxE,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,cAAc,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;KACjD,GAAG,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;CAC1C,GAAG,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAIzC,eAAO,MAAM,iBAAiB,+EAS3B,kBAAkB,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAmE7C,CAAA"}

package/dist/find/buildFindManyArgs.js

@@ -1,7 +1,7 @@
 import { traverseFields } from './traverseFields.js';
 // Generate the Drizzle query for findMany based on
 // a collection field structure
-export const buildFindManyArgs = ({ adapter, depth, fields, joinQuery, joins = [], locale, tableName })=>{
+export const buildFindManyArgs = ({ adapter, depth, fields, joinQuery, joins = [], locale, tableName, versions })=>{
     const result = {
         extras: {},
         with: {}
@@ -63,7 +63,8 @@ export const buildFindManyArgs = ({ adapter, depth, fields, joinQuery, joins = [
         path: '',
         tablePath: '',
         topLevelArgs: result,
-        topLevelTableName: tableName
+        topLevelTableName: tableName,
+        versions
     });
     return result;
 };

package/dist/find/buildFindManyArgs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/buildFindManyArgs.ts"],"sourcesContent":["import type { DBQueryConfig } from 'drizzle-orm'\nimport type { Field, JoinQuery } from 'payload'\n\nimport type { BuildQueryJoinAliases, DrizzleAdapter } from '../types.js'\n\nimport { traverseFields } from './traverseFields.js'\n\ntype BuildFindQueryArgs = {\n  adapter: DrizzleAdapter\n  depth: number\n  fields: Field[]\n  joinQuery?: JoinQuery\n  /**\n   * The joins array will be mutated by pushing any joins needed for the where queries of join field joins\n   */\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  tableName: string\n}\n\nexport type Result = {\n  with?: {\n    _locales?: DBQueryConfig<'many', true, any, any>\n  } & DBQueryConfig<'many', true, any, any>\n} & DBQueryConfig<'many', true, any, any>\n\n// Generate the Drizzle query for findMany based on\n// a collection field structure\nexport const buildFindManyArgs = ({\n  adapter,\n  depth,\n  fields,\n  joinQuery,\n  joins = [],\n  locale,\n  tableName,\n}: BuildFindQueryArgs): Record<string, unknown> => {\n  const result: Result = {\n    extras: {},\n    with: {},\n  }\n\n  const _locales: Result = {\n    columns: {\n      id: false,\n      _parentID: false,\n    },\n    extras: {},\n    with: {},\n  }\n\n  if (adapter.tables[`${tableName}_texts`]) {\n    result.with._texts = {\n      columns: {\n        id: false,\n        parent: false,\n      },\n      orderBy: ({ order }, { asc: ASC }) => [ASC(order)],\n    }\n  }\n\n  if (adapter.tables[`${tableName}_numbers`]) {\n    result.with._numbers = {\n      columns: {\n        id: false,\n        parent: false,\n      },\n      orderBy: ({ order }, { asc: ASC }) => [ASC(order)],\n    }\n  }\n\n  if (adapter.tables[`${tableName}${adapter.relationshipsSuffix}`]) {\n    result.with._rels = {\n      columns: {\n        id: false,\n        parent: false,\n      },\n      orderBy: ({ order }, { asc: ASC }) => [ASC(order)],\n    }\n  }\n\n  if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {\n    result.with._locales = _locales\n  }\n\n  traverseFields({\n    _locales,\n    adapter,\n    currentArgs: result,\n    currentTableName: tableName,\n    depth,\n    fields,\n    joinQuery,\n    joins,\n    locale,\n    path: '',\n    tablePath: '',\n    topLevelArgs: result,\n    topLevelTableName: tableName,\n  })\n\n  return result\n}\n"],"names":["traverseFields","buildFindManyArgs","adapter","depth","fields","joinQuery","joins","locale","tableName","result","extras","with","_locales","columns","id","_parentID","tables","_texts","parent","orderBy","order","asc","ASC","_numbers","relationshipsSuffix","_rels","localesSuffix","currentArgs","currentTableName","path","tablePath","topLevelArgs","topLevelTableName"],"mappings":"AAKA,SAASA,cAAc,QAAQ,sBAAqB;AAqBpD,mDAAmD;AACnD,+BAA+B;AAC/B,OAAO,MAAMC,oBAAoB,CAAC,EAChCC,OAAO,EACPC,KAAK,EACLC,MAAM,EACNC,SAAS,EACTC,QAAQ,EAAE,EACVC,MAAM,EACNC,SAAS,EACU;IACnB,MAAMC,SAAiB;QACrBC,QAAQ,CAAC;QACTC,MAAM,CAAC;IACT;IAEA,MAAMC,WAAmB;QACvBC,SAAS;YACPC,IAAI;YACJC,WAAW;QACb;QACAL,QAAQ,CAAC;QACTC,MAAM,CAAC;IACT;IAEA,IAAIT,QAAQc,MAAM,CAAC,CAAC,EAAER,UAAU,MAAM,CAAC,CAAC,EAAE;QACxCC,OAAOE,IAAI,CAACM,MAAM,GAAG;YACnBJ,SAAS;gBACPC,IAAI;gBACJI,QAAQ;YACV;YACAC,SAAS,CAAC,EAAEC,KAAK,EAAE,EAAE,EAAEC,KAAKC,GAAG,EAAE,GAAK;oBAACA,IAAIF;iBAAO;QACpD;IACF;IAEA,IAAIlB,QAAQc,MAAM,CAAC,CAAC,EAAER,UAAU,QAAQ,CAAC,CAAC,EAAE;QAC1CC,OAAOE,IAAI,CAACY,QAAQ,GAAG;YACrBV,SAAS;gBACPC,IAAI;gBACJI,QAAQ;YACV;YACAC,SAAS,CAAC,EAAEC,KAAK,EAAE,EAAE,EAAEC,KAAKC,GAAG,EAAE,GAAK;oBAACA,IAAIF;iBAAO;QACpD;IACF;IAEA,IAAIlB,QAAQc,MAAM,CAAC,CAAC,EAAER,UAAU,EAAEN,QAAQsB,mBAAmB,CAAC,CAAC,CAAC,EAAE;QAChEf,OAAOE,IAAI,CAACc,KAAK,GAAG;YAClBZ,SAAS;gBACPC,IAAI;gBACJI,QAAQ;YACV;YACAC,SAAS,CAAC,EAAEC,KAAK,EAAE,EAAE,EAAEC,KAAKC,GAAG,EAAE,GAAK;oBAACA,IAAIF;iBAAO;QACpD;IACF;IAEA,IAAIlB,QAAQc,MAAM,CAAC,CAAC,EAAER,UAAU,EAAEN,QAAQwB,aAAa,CAAC,CAAC,CAAC,EAAE;QAC1DjB,OAAOE,IAAI,CAACC,QAAQ,GAAGA;IACzB;IAEAZ,eAAe;QACbY;QACAV;QACAyB,aAAalB;QACbmB,kBAAkBpB;QAClBL;QACAC;QACAC;QACAC;QACAC;QACAsB,MAAM;QACNC,WAAW;QACXC,cAActB;QACduB,mBAAmBxB;IACrB;IAEA,OAAOC;AACT,EAAC"}
+{"version":3,"sources":["../../src/find/buildFindManyArgs.ts"],"sourcesContent":["import type { DBQueryConfig } from 'drizzle-orm'\nimport type { Field, JoinQuery } from 'payload'\n\nimport type { BuildQueryJoinAliases, DrizzleAdapter } from '../types.js'\n\nimport { traverseFields } from './traverseFields.js'\n\ntype BuildFindQueryArgs = {\n  adapter: DrizzleAdapter\n  depth: number\n  fields: Field[]\n  joinQuery?: JoinQuery\n  /**\n   * The joins array will be mutated by pushing any joins needed for the where queries of join field joins\n   */\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  tableName: string\n  versions?: boolean\n}\n\nexport type Result = {\n  with?: {\n    _locales?: DBQueryConfig<'many', true, any, any>\n  } & DBQueryConfig<'many', true, any, any>\n} & DBQueryConfig<'many', true, any, any>\n\n// Generate the Drizzle query for findMany based on\n// a collection field structure\nexport const buildFindManyArgs = ({\n  adapter,\n  depth,\n  fields,\n  joinQuery,\n  joins = [],\n  locale,\n  tableName,\n  versions,\n}: BuildFindQueryArgs): Record<string, unknown> => {\n  const result: Result = {\n    extras: {},\n    with: {},\n  }\n\n  const _locales: Result = {\n    columns: {\n      id: false,\n      _parentID: false,\n    },\n    extras: {},\n    with: {},\n  }\n\n  if (adapter.tables[`${tableName}_texts`]) {\n    result.with._texts = {\n      columns: {\n        id: false,\n        parent: false,\n      },\n      orderBy: ({ order }, { asc: ASC }) => [ASC(order)],\n    }\n  }\n\n  if (adapter.tables[`${tableName}_numbers`]) {\n    result.with._numbers = {\n      columns: {\n        id: false,\n        parent: false,\n      },\n      orderBy: ({ order }, { asc: ASC }) => [ASC(order)],\n    }\n  }\n\n  if (adapter.tables[`${tableName}${adapter.relationshipsSuffix}`]) {\n    result.with._rels = {\n      columns: {\n        id: false,\n        parent: false,\n      },\n      orderBy: ({ order }, { asc: ASC }) => [ASC(order)],\n    }\n  }\n\n  if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {\n    result.with._locales = _locales\n  }\n\n  traverseFields({\n    _locales,\n    adapter,\n    currentArgs: result,\n    currentTableName: tableName,\n    depth,\n    fields,\n    joinQuery,\n    joins,\n    locale,\n    path: '',\n    tablePath: '',\n    topLevelArgs: result,\n    topLevelTableName: tableName,\n    versions,\n  })\n\n  return result\n}\n"],"names":["traverseFields","buildFindManyArgs","adapter","depth","fields","joinQuery","joins","locale","tableName","versions","result","extras","with","_locales","columns","id","_parentID","tables","_texts","parent","orderBy","order","asc","ASC","_numbers","relationshipsSuffix","_rels","localesSuffix","currentArgs","currentTableName","path","tablePath","topLevelArgs","topLevelTableName"],"mappings":"AAKA,SAASA,cAAc,QAAQ,sBAAqB;AAsBpD,mDAAmD;AACnD,+BAA+B;AAC/B,OAAO,MAAMC,oBAAoB,CAAC,EAChCC,OAAO,EACPC,KAAK,EACLC,MAAM,EACNC,SAAS,EACTC,QAAQ,EAAE,EACVC,MAAM,EACNC,SAAS,EACTC,QAAQ,EACW;IACnB,MAAMC,SAAiB;QACrBC,QAAQ,CAAC;QACTC,MAAM,CAAC;IACT;IAEA,MAAMC,WAAmB;QACvBC,SAAS;YACPC,IAAI;YACJC,WAAW;QACb;QACAL,QAAQ,CAAC;QACTC,MAAM,CAAC;IACT;IAEA,IAAIV,QAAQe,MAAM,CAAC,CAAC,EAAET,UAAU,MAAM,CAAC,CAAC,EAAE;QACxCE,OAAOE,IAAI,CAACM,MAAM,GAAG;YACnBJ,SAAS;gBACPC,IAAI;gBACJI,QAAQ;YACV;YACAC,SAAS,CAAC,EAAEC,KAAK,EAAE,EAAE,EAAEC,KAAKC,GAAG,EAAE,GAAK;oBAACA,IAAIF;iBAAO;QACpD;IACF;IAEA,IAAInB,QAAQe,MAAM,CAAC,CAAC,EAAET,UAAU,QAAQ,CAAC,CAAC,EAAE;QAC1CE,OAAOE,IAAI,CAACY,QAAQ,GAAG;YACrBV,SAAS;gBACPC,IAAI;gBACJI,QAAQ;YACV;YACAC,SAAS,CAAC,EAAEC,KAAK,EAAE,EAAE,EAAEC,KAAKC,GAAG,EAAE,GAAK;oBAACA,IAAIF;iBAAO;QACpD;IACF;IAEA,IAAInB,QAAQe,MAAM,CAAC,CAAC,EAAET,UAAU,EAAEN,QAAQuB,mBAAmB,CAAC,CAAC,CAAC,EAAE;QAChEf,OAAOE,IAAI,CAACc,KAAK,GAAG;YAClBZ,SAAS;gBACPC,IAAI;gBACJI,QAAQ;YACV;YACAC,SAAS,CAAC,EAAEC,KAAK,EAAE,EAAE,EAAEC,KAAKC,GAAG,EAAE,GAAK;oBAACA,IAAIF;iBAAO;QACpD;IACF;IAEA,IAAInB,QAAQe,MAAM,CAAC,CAAC,EAAET,UAAU,EAAEN,QAAQyB,aAAa,CAAC,CAAC,CAAC,EAAE;QAC1DjB,OAAOE,IAAI,CAACC,QAAQ,GAAGA;IACzB;IAEAb,eAAe;QACba;QACAX;QACA0B,aAAalB;QACbmB,kBAAkBrB;QAClBL;QACAC;QACAC;QACAC;QACAC;QACAuB,MAAM;QACNC,WAAW;QACXC,cAActB;QACduB,mBAAmBzB;QACnBC;IACF;IAEA,OAAOC;AACT,EAAC"}

package/dist/find/findMany.d.ts

@@ -4,8 +4,9 @@ type Args = {
     adapter: DrizzleAdapter;
     fields: Field[];
     tableName: string;
+    versions?: boolean;
 } & Omit<FindArgs, 'collection'>;
-export declare const findMany: ({ adapter, fields, joins: joinQuery, limit: limitArg, locale, page, pagination, req, skip, sort, tableName, where: whereArg, }: Args) => Promise<{
+export declare const findMany: ({ adapter, fields, joins: joinQuery, limit: limitArg, locale, page, pagination, req, skip, sort, tableName, versions, where: whereArg, }: Args) => Promise<{
     docs: any;
     hasNextPage: boolean;
     hasPrevPage: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/find/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAA8B,MAAM,SAAS,CAAA;AAI1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAQjD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB,GAAG,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;AAEhC,eAAO,MAAM,QAAQ,mIAalB,IAAI;;;;;;;;;;;EA6IN,CAAA"}
+{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/find/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAA8B,MAAM,SAAS,CAAA;AAI1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAQjD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;AAEhC,eAAO,MAAM,QAAQ,6IAclB,IAAI;;;;;;;;;;;EA8IN,CAAA"}

package/dist/find/findMany.js

@@ -3,7 +3,7 @@ import buildQuery from '../queries/buildQuery.js';
 import { selectDistinct } from '../queries/selectDistinct.js';
 import { transform } from '../transform/read/index.js';
 import { buildFindManyArgs } from './buildFindManyArgs.js';
-export const findMany = async function find({ adapter, fields, joins: joinQuery, limit: limitArg, locale, page = 1, pagination, req = {}, skip, sort, tableName, where: whereArg }) {
+export const findMany = async function find({ adapter, fields, joins: joinQuery, limit: limitArg, locale, page = 1, pagination, req = {}, skip, sort, tableName, versions, where: whereArg }) {
     const db = adapter.sessions[await req.transactionID]?.db || adapter.drizzle;
     let limit = limitArg;
     let totalDocs;
@@ -40,7 +40,8 @@ export const findMany = async function find({ adapter, fields, joins: joinQuery,
         fields,
         joinQuery,
         joins,
-        tableName
+        tableName,
+        versions
     });
     selectDistinctMethods.push({
         args: [

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":"AAEA,SAASA,OAAO,QAAQ,cAAa;AAKrC,OAAOC,gBAAgB,2BAA0B;AACjD,SAASC,cAAc,QAAQ,+BAA8B;AAC7D,SAASC,SAAS,QAAQ,6BAA4B;AACtD,SAASC,iBAAiB,QAAQ,yBAAwB;AAQ1D,OAAO,MAAMC,WAAW,eAAeC,KAAK,EAC1CC,OAAO,EACPC,MAAM,EACNC,OAAOC,SAAS,EAChBC,OAAOC,QAAQ,EACfC,MAAM,EACNC,OAAO,CAAC,EACRC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,IAAI,EACJC,IAAI,EACJC,SAAS,EACTC,OAAOC,QAAQ,EACV;IACL,MAAMC,KAAKf,QAAQgB,QAAQ,CAAC,MAAMP,IAAIQ,aAAa,CAAC,EAAEF,MAAMf,QAAQkB,OAAO;IAC3E,IAAId,QAAQC;IACZ,IAAIc;IACJ,IAAIC;IACJ,IAAIC;IACJ,IAAIC;IACJ,IAAIC;IACJ,MAAMC,SAASd,QAAQ,AAACH,CAAAA,OAAO,CAAA,IAAKH;IAEpC,IAAIA,UAAU,GAAG;QACfA,QAAQqB;IACV;IAEA,MAAM,EAAEvB,KAAK,EAAEwB,OAAO,EAAEC,YAAY,EAAEd,KAAK,EAAE,GAAGnB,WAAW;QACzDM;QACAC;QACAK;QACAK;QACAC;QACAC,OAAOC;IACT;IAEA,MAAMc,eAAgD,CAAC;IACvD,IAAIC;IAEJ,MAAMC,wBAAwC,EAAE;IAEhD,IAAIJ,SAASK,SAASL,SAASM,QAAQ;QACrCF,sBAAsBG,IAAI,CAAC;YACzBC,MAAM;gBAACR,QAAQK,KAAK,CAACL,QAAQM,MAAM;aAAE;YACrCG,QAAQ;QACV;IACF;IAEA,MAAMC,eAAevC,kBAAkB;QACrCG;QACAqC,OAAO;QACPpC;QACAE;QACAD;QACAU;IACF;IAEAkB,sBAAsBG,IAAI,CAAC;QAAEC,MAAM;YAACV;SAAO;QAAEW,QAAQ;IAAS;IAC9DL,sBAAsBG,IAAI,CAAC;QAAEC,MAAM;YAAC9B;SAAM;QAAE+B,QAAQ;IAAQ;IAE5D,MAAMG,uBAAuB,MAAM3C,eAAe;QAChDK;QACAuC,gBAAgBT;QAChBf;QACAb;QACAyB;QACAf;QACAC;IACF;IAEA,IAAIyB,sBAAsB;QACxB,IAAIA,qBAAqBE,MAAM,KAAK,GAAG;YACrC,OAAO;gBACLC,MAAM,EAAE;gBACRnB,aAAa;gBACbD,aAAa;gBACbjB;gBACAsC,UAAU;gBACVnC,MAAM;gBACNgB,eAAe;gBACfoB,UAAU;gBACVxB,WAAW;gBACXC,YAAY;YACd;QACF,OAAO;YACL,4CAA4C;YAC5CkB,qBAAqBM,OAAO,CAAC,CAAC,EAAEC,EAAE,EAAE,EAAEC;gBACpClB,YAAY,CAACiB,GAAG,GAAGC;YACrB;YACAjB,aAAakB,OAAOC,IAAI,CAACpB;YACzBQ,aAAavB,KAAK,GAAGpB,QAAQO,QAAQiD,MAAM,CAACrC,UAAU,CAACiC,EAAE,EAAEhB;QAC7D;IACF,OAAO;QACLO,aAAahC,KAAK,GAAGA;QACrBgC,aAAaZ,MAAM,GAAGA;QACtBY,aAAaV,OAAO,GAAGA,QAAQK,KAAK,CAACL,QAAQM,MAAM;QAEnD,IAAInB,OAAO;YACTuB,aAAavB,KAAK,GAAGA;QACvB;IACF;IAEA,MAAMqC,cAAcnC,GAAGoC,KAAK,CAACvC,UAAU,CAACd,QAAQ,CAACsC;IAEjD,IAAI5B,eAAe,SAAUqB,CAAAA,aAAaA,YAAYW,UAAUpC,QAAQ,IAAG,GAAI;QAC7Ee,YAAY,MAAMnB,QAAQoD,aAAa,CAAC;YACtCrC;YACAb;YACAU;YACAC;QACF;QAEAO,aAAa,OAAOhB,UAAU,YAAYA,UAAU,IAAIiD,KAAKC,IAAI,CAACnC,YAAYf,SAAS;QACvFiB,cAAcd,OAAO;QACrBe,cAAcF,aAAab;QAC3BgB,gBAAgB,AAAChB,CAAAA,OAAO,CAAA,IAAKH,QAAQ;IACvC;IAEA,MAAMmD,UAAU,MAAML;IACtB,gCAAgC;IAChC,IAAIH,OAAOC,IAAI,CAACpB,cAAcY,MAAM,GAAG,GAAG;QACxCe,QAAQ5C,IAAI,CAAC,CAAC6C,GAAGC,IAAM7B,YAAY,CAAC4B,EAAEX,EAAE,CAAC,GAAGjB,YAAY,CAAC6B,EAAEZ,EAAE,CAAC;IAChE;IAEA,IAAIrC,eAAe,SAAS,CAACW,WAAW;QACtCA,YAAYoC,QAAQf,MAAM;QAC1BpB,aAAa;QACbG,gBAAgB;QAChBF,cAAc;QACdC,cAAc;IAChB;IAEA,MAAMmB,OAAOc,QAAQG,GAAG,CAAC,CAACC;QACxB,OAAO/D,UAAU;YACfI;YACA4D,QAAQ5D,QAAQ6D,OAAO,CAACD,MAAM;YAC9BD;YACA1D;YACAE;QACF;IACF;IAEA,OAAO;QACLsC;QACAnB;QACAD;QACAjB,OAAOC;QACPqC,UAAUpB,cAAcf,OAAO,IAAI;QACnCA;QACAgB;QACAoB,UAAUtB,cAAcd,OAAO,IAAI;QACnCY;QACAC;IACF;AACF,EAAC"}
+{"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  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?.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    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.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","versions","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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"}

package/dist/find/traverseFields.d.ts

@@ -15,7 +15,8 @@ type TraverseFieldArgs = {
     tablePath: string;
     topLevelArgs: Record<string, unknown>;
     topLevelTableName: string;
+    versions?: 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, tablePath, topLevelArgs, topLevelTableName, versions, }: 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,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;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,cAAc,+JAexB,iBAAiB,4BAoXnB,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, tablePath, topLevelArgs, topLevelTableName, versions })=>{
     fields.forEach((field)=>{
         if (fieldIsVirtual(field)) {
             return;
@@ -49,7 +49,8 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                     path: tabPath,
                     tablePath: tabTablePath,
                     topLevelArgs,
-                    topLevelTableName
+                    topLevelTableName,
+                    versions
                 });
             });
             return;
@@ -161,7 +162,8 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
                             path: `${path}${field.name}_`,
                             tablePath: `${tablePath}${toSnakeCase(field.name)}_`,
                             topLevelArgs,
-                            topLevelTableName
+                            topLevelTableName,
+                            versions
                         });
                         break;
                     }
@@ -179,52 +181,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.order(orderBy.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 +271,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,37 +280,7 @@ 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:

package/dist/find/traverseFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/find/traverseFields.ts"],"sourcesContent":["import type { DBQueryConfig } from 'drizzle-orm'\nimport type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { Field, JoinQuery } from 'payload'\n\nimport { and, eq, sql } from 'drizzle-orm'\nimport { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BuildQueryJoinAliases, ChainedMethods, DrizzleAdapter } from '../types.js'\nimport type { Result } from './buildFindManyArgs.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { chainMethods } from './chainMethods.js'\n\ntype TraverseFieldArgs = {\n  _locales: Result\n  adapter: DrizzleAdapter\n  currentArgs: Result\n  currentTableName: string\n  depth?: number\n  fields: Field[]\n  joinQuery: JoinQuery\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  path: string\n  tablePath: string\n  topLevelArgs: Record<string, unknown>\n  topLevelTableName: string\n}\n\nexport const traverseFields = ({\n  _locales,\n  adapter,\n  currentArgs,\n  currentTableName,\n  depth,\n  fields,\n  joinQuery = {},\n  joins,\n  locale,\n  path,\n  tablePath,\n  topLevelArgs,\n  topLevelTableName,\n}: TraverseFieldArgs) => {\n  fields.forEach((field) => {\n    if (fieldIsVirtual(field)) {\n      return\n    }\n\n    // handle simple relationship\n    if (\n      depth > 0 &&\n      (field.type === 'upload' || field.type === 'relationship') &&\n      !field.hasMany &&\n      typeof field.relationTo === 'string'\n    ) {\n      if (field.localized) {\n        _locales.with[`${path}${field.name}`] = true\n      } else {\n        currentArgs.with[`${path}${field.name}`] = true\n      }\n    }\n\n    if (field.type === 'collapsible' || field.type === 'row') {\n      traverseFields({\n        _locales,\n        adapter,\n        currentArgs,\n        currentTableName,\n        depth,\n        fields: field.fields,\n        joinQuery,\n        joins,\n        path,\n        tablePath,\n        topLevelArgs,\n        topLevelTableName,\n      })\n\n      return\n    }\n\n    if (field.type === 'tabs') {\n      field.tabs.forEach((tab) => {\n        const tabPath = tabHasName(tab) ? `${path}${tab.name}_` : path\n        const tabTablePath = tabHasName(tab) ? `${tablePath}${toSnakeCase(tab.name)}_` : tablePath\n\n        traverseFields({\n          _locales,\n          adapter,\n          currentArgs,\n          currentTableName,\n          depth,\n          fields: tab.fields,\n          joinQuery,\n          joins,\n          path: tabPath,\n          tablePath: tabTablePath,\n          topLevelArgs,\n          topLevelTableName,\n        })\n      })\n\n      return\n    }\n\n    if (fieldAffectsData(field)) {\n      switch (field.type) {\n        case 'array': {\n          const withArray: Result = {\n            columns: {\n              _parentID: false,\n            },\n            orderBy: ({ _order }, { asc }) => [asc(_order)],\n            with: {},\n          }\n\n          const arrayTableName = adapter.tableNameMap.get(\n            `${currentTableName}_${tablePath}${toSnakeCase(field.name)}`,\n          )\n\n          const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`\n\n          if (adapter.tables[arrayTableNameWithLocales]) {\n            withArray.with._locales = {\n              columns: {\n                id: false,\n                _parentID: false,\n              },\n              with: {},\n            }\n          }\n          currentArgs.with[`${path}${field.name}`] = withArray\n\n          traverseFields({\n            _locales: withArray.with._locales,\n            adapter,\n            currentArgs: withArray,\n            currentTableName: arrayTableName,\n            depth,\n            fields: field.fields,\n            joinQuery,\n            path: '',\n            tablePath: '',\n            topLevelArgs,\n            topLevelTableName,\n          })\n\n          break\n        }\n\n        case 'select': {\n          if (field.hasMany) {\n            const withSelect: Result = {\n              columns: {\n                id: false,\n                order: false,\n                parent: false,\n              },\n              orderBy: ({ order }, { asc }) => [asc(order)],\n            }\n\n            currentArgs.with[`${path}${field.name}`] = withSelect\n          }\n\n          break\n        }\n\n        case 'blocks':\n          field.blocks.forEach((block) => {\n            const blockKey = `_blocks_${block.slug}`\n\n            if (!topLevelArgs[blockKey]) {\n              const withBlock: Result = {\n                columns: {\n                  _parentID: false,\n                },\n                orderBy: ({ _order }, { asc }) => [asc(_order)],\n                with: {},\n              }\n\n              const tableName = adapter.tableNameMap.get(\n                `${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`,\n              )\n\n              if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {\n                withBlock.with._locales = {\n                  with: {},\n                }\n              }\n              topLevelArgs.with[blockKey] = withBlock\n\n              traverseFields({\n                _locales: withBlock.with._locales,\n                adapter,\n                currentArgs: withBlock,\n                currentTableName: tableName,\n                depth,\n                fields: block.fields,\n                joinQuery,\n                path: '',\n                tablePath: '',\n                topLevelArgs,\n                topLevelTableName,\n              })\n            }\n          })\n\n          break\n\n        case 'group': {\n          traverseFields({\n            _locales,\n            adapter,\n            currentArgs,\n            currentTableName,\n            depth,\n            fields: field.fields,\n            joinQuery,\n            joins,\n            path: `${path}${field.name}_`,\n            tablePath: `${tablePath}${toSnakeCase(field.name)}_`,\n            topLevelArgs,\n            topLevelTableName,\n          })\n\n          break\n        }\n\n        case 'join': {\n          // when `joinsQuery` is false, do not join\n          if (joinQuery === false) {\n            break\n          }\n          const {\n            limit: limitArg = 10,\n            sort,\n            where,\n          } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {}\n          let limit = limitArg\n          if (limit !== 0) {\n            // get an additional document and slice it later to determine if there is a next page\n            limit += 1\n          }\n\n          const fields = adapter.payload.collections[field.collection].config.fields\n          const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection))\n          let joinTableName = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${\n            field.localized && adapter.payload.config.localization ? adapter.localesSuffix : ''\n          }`\n\n          if (field.hasMany) {\n            const db = adapter.drizzle as LibSQLDatabase\n            if (field.localized) {\n              joinTableName = adapter.tableNameMap.get(toSnakeCase(field.collection))\n            }\n            const joinTable = `${joinTableName}${adapter.relationshipsSuffix}`\n\n            const joins: BuildQueryJoinAliases = [\n              {\n                type: 'innerJoin',\n                condition: and(\n                  eq(adapter.tables[joinTable].parent, adapter.tables[joinTableName].id),\n                  eq(\n                    sql.raw(`\"${joinTable}\".\"${topLevelTableName}_id\"`),\n                    adapter.tables[currentTableName].id,\n                  ),\n                  eq(adapter.tables[joinTable].path, field.on),\n                ),\n                table: adapter.tables[joinTable],\n              },\n            ]\n\n            const { orderBy, where: subQueryWhere } = buildQuery({\n              adapter,\n              fields,\n              joins,\n              locale,\n              sort,\n              tableName: joinCollectionTableName,\n              where: {},\n            })\n\n            const chainedMethods: ChainedMethods = []\n\n            joins.forEach(({ type, condition, table }) => {\n              chainedMethods.push({\n                args: [table, condition],\n                method: type ?? 'leftJoin',\n              })\n            })\n\n            const subQuery = chainMethods({\n              methods: chainedMethods,\n              query: db\n                .select({\n                  id: adapter.tables[joinTableName].id,\n                  ...(field.localized && {\n                    locale: adapter.tables[joinTable].locale,\n                  }),\n                })\n                .from(adapter.tables[joinTableName])\n                .where(subQueryWhere)\n                .orderBy(orderBy.order(orderBy.column))\n                .limit(limit),\n            })\n\n            const columnName = `${path.replaceAll('.', '_')}${field.name}`\n\n            const jsonObjectSelect = field.localized\n              ? sql.raw(`'_parentID', \"id\", '_locale', \"locale\"`)\n              : sql.raw(`'id', \"id\"`)\n\n            if (adapter.name === 'sqlite') {\n              currentArgs.extras[columnName] = sql`\n              COALESCE((\n                SELECT json_group_array(json_object(${jsonObjectSelect}))\n                FROM (\n                  ${subQuery}\n                ) AS ${sql.raw(`${columnName}_sub`)}\n              ), '[]')\n            `.as(columnName)\n            } else {\n              currentArgs.extras[columnName] = sql`\n              COALESCE((\n                SELECT json_agg(json_build_object(${jsonObjectSelect}))\n                FROM (\n                  ${subQuery}\n                ) AS ${sql.raw(`${columnName}_sub`)}\n              ), '[]'::json)\n            `.as(columnName)\n            }\n\n            break\n          }\n\n          const selectFields = {}\n\n          const withJoin: DBQueryConfig<'many', true, any, any> = {\n            columns: selectFields,\n          }\n          if (limit) {\n            withJoin.limit = limit\n          }\n\n          if (field.localized) {\n            withJoin.columns._locale = true\n            withJoin.columns._parentID = true\n          } else {\n            withJoin.columns.id = true\n            withJoin.columns.parent = true\n          }\n          const { orderBy, where: joinWhere } = buildQuery({\n            adapter,\n            fields,\n            joins,\n            locale,\n            sort,\n            tableName: joinTableName,\n            where,\n          })\n          if (joinWhere) {\n            withJoin.where = () => joinWhere\n          }\n          withJoin.orderBy = orderBy.order(orderBy.column)\n          currentArgs.with[`${path.replaceAll('.', '_')}${field.name}`] = withJoin\n          break\n        }\n\n        default: {\n          break\n        }\n      }\n    }\n  })\n\n  return topLevelArgs\n}\n"],"names":["and","eq","sql","fieldAffectsData","fieldIsVirtual","tabHasName","toSnakeCase","buildQuery","chainMethods","traverseFields","_locales","adapter","currentArgs","currentTableName","depth","fields","joinQuery","joins","locale","path","tablePath","topLevelArgs","topLevelTableName","forEach","field","type","hasMany","relationTo","localized","with","name","tabs","tab","tabPath","tabTablePath","withArray","columns","_parentID","orderBy","_order","asc","arrayTableName","tableNameMap","get","arrayTableNameWithLocales","localesSuffix","tables","id","withSelect","order","parent","blocks","block","blockKey","slug","withBlock","tableName","limit","limitArg","sort","where","replaceAll","payload","collections","collection","config","joinCollectionTableName","joinTableName","localization","db","drizzle","joinTable","relationshipsSuffix","condition","raw","on","table","subQueryWhere","chainedMethods","push","args","method","subQuery","methods","query","select","from","column","columnName","jsonObjectSelect","extras","as","selectFields","withJoin","_locale","joinWhere"],"mappings":"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"}
+{"version":3,"sources":["../../src/find/traverseFields.ts"],"sourcesContent":["import type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { Field, JoinQuery } from 'payload'\n\nimport { and, eq, sql } from 'drizzle-orm'\nimport { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BuildQueryJoinAliases, ChainedMethods, DrizzleAdapter } from '../types.js'\nimport type { Result } from './buildFindManyArgs.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { chainMethods } from './chainMethods.js'\n\ntype TraverseFieldArgs = {\n  _locales: Result\n  adapter: DrizzleAdapter\n  currentArgs: Result\n  currentTableName: string\n  depth?: number\n  fields: Field[]\n  joinQuery: JoinQuery\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  path: string\n  tablePath: string\n  topLevelArgs: Record<string, unknown>\n  topLevelTableName: string\n  versions?: boolean\n}\n\nexport const traverseFields = ({\n  _locales,\n  adapter,\n  currentArgs,\n  currentTableName,\n  depth,\n  fields,\n  joinQuery = {},\n  joins,\n  locale,\n  path,\n  tablePath,\n  topLevelArgs,\n  topLevelTableName,\n  versions,\n}: TraverseFieldArgs) => {\n  fields.forEach((field) => {\n    if (fieldIsVirtual(field)) {\n      return\n    }\n\n    // handle simple relationship\n    if (\n      depth > 0 &&\n      (field.type === 'upload' || field.type === 'relationship') &&\n      !field.hasMany &&\n      typeof field.relationTo === 'string'\n    ) {\n      if (field.localized) {\n        _locales.with[`${path}${field.name}`] = true\n      } else {\n        currentArgs.with[`${path}${field.name}`] = true\n      }\n    }\n\n    if (field.type === 'collapsible' || field.type === 'row') {\n      traverseFields({\n        _locales,\n        adapter,\n        currentArgs,\n        currentTableName,\n        depth,\n        fields: field.fields,\n        joinQuery,\n        joins,\n        path,\n        tablePath,\n        topLevelArgs,\n        topLevelTableName,\n      })\n\n      return\n    }\n\n    if (field.type === 'tabs') {\n      field.tabs.forEach((tab) => {\n        const tabPath = tabHasName(tab) ? `${path}${tab.name}_` : path\n        const tabTablePath = tabHasName(tab) ? `${tablePath}${toSnakeCase(tab.name)}_` : tablePath\n\n        traverseFields({\n          _locales,\n          adapter,\n          currentArgs,\n          currentTableName,\n          depth,\n          fields: tab.fields,\n          joinQuery,\n          joins,\n          path: tabPath,\n          tablePath: tabTablePath,\n          topLevelArgs,\n          topLevelTableName,\n          versions,\n        })\n      })\n\n      return\n    }\n\n    if (fieldAffectsData(field)) {\n      switch (field.type) {\n        case 'array': {\n          const withArray: Result = {\n            columns: {\n              _parentID: false,\n            },\n            orderBy: ({ _order }, { asc }) => [asc(_order)],\n            with: {},\n          }\n\n          const arrayTableName = adapter.tableNameMap.get(\n            `${currentTableName}_${tablePath}${toSnakeCase(field.name)}`,\n          )\n\n          const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`\n\n          if (adapter.tables[arrayTableNameWithLocales]) {\n            withArray.with._locales = {\n              columns: {\n                id: false,\n                _parentID: false,\n              },\n              with: {},\n            }\n          }\n          currentArgs.with[`${path}${field.name}`] = withArray\n\n          traverseFields({\n            _locales: withArray.with._locales,\n            adapter,\n            currentArgs: withArray,\n            currentTableName: arrayTableName,\n            depth,\n            fields: field.fields,\n            joinQuery,\n            path: '',\n            tablePath: '',\n            topLevelArgs,\n            topLevelTableName,\n          })\n\n          break\n        }\n\n        case 'select': {\n          if (field.hasMany) {\n            const withSelect: Result = {\n              columns: {\n                id: false,\n                order: false,\n                parent: false,\n              },\n              orderBy: ({ order }, { asc }) => [asc(order)],\n            }\n\n            currentArgs.with[`${path}${field.name}`] = withSelect\n          }\n\n          break\n        }\n\n        case 'blocks':\n          field.blocks.forEach((block) => {\n            const blockKey = `_blocks_${block.slug}`\n\n            if (!topLevelArgs[blockKey]) {\n              const withBlock: Result = {\n                columns: {\n                  _parentID: false,\n                },\n                orderBy: ({ _order }, { asc }) => [asc(_order)],\n                with: {},\n              }\n\n              const tableName = adapter.tableNameMap.get(\n                `${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`,\n              )\n\n              if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {\n                withBlock.with._locales = {\n                  with: {},\n                }\n              }\n              topLevelArgs.with[blockKey] = withBlock\n\n              traverseFields({\n                _locales: withBlock.with._locales,\n                adapter,\n                currentArgs: withBlock,\n                currentTableName: tableName,\n                depth,\n                fields: block.fields,\n                joinQuery,\n                path: '',\n                tablePath: '',\n                topLevelArgs,\n                topLevelTableName,\n              })\n            }\n          })\n\n          break\n\n        case 'group': {\n          traverseFields({\n            _locales,\n            adapter,\n            currentArgs,\n            currentTableName,\n            depth,\n            fields: field.fields,\n            joinQuery,\n            joins,\n            path: `${path}${field.name}_`,\n            tablePath: `${tablePath}${toSnakeCase(field.name)}_`,\n            topLevelArgs,\n            topLevelTableName,\n            versions,\n          })\n\n          break\n        }\n\n        case 'join': {\n          // when `joinsQuery` is false, do not join\n          if (joinQuery === false) {\n            break\n          }\n\n          const {\n            limit: limitArg = 10,\n            sort,\n            where,\n          } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {}\n          let limit = limitArg\n\n          if (limit !== 0) {\n            // get an additional document and slice it later to determine if there is a next page\n            limit += 1\n          }\n\n          const fields = adapter.payload.collections[field.collection].config.fields\n\n          const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection))\n\n          const joins: BuildQueryJoinAliases = []\n\n          const buildQueryResult = buildQuery({\n            adapter,\n            fields,\n            joins,\n            locale,\n            sort,\n            tableName: joinCollectionTableName,\n            where,\n          })\n\n          let subQueryWhere = buildQueryResult.where\n          const orderBy = buildQueryResult.orderBy\n\n          let joinLocalesCollectionTableName: string | undefined\n\n          const currentIDColumn = versions\n            ? adapter.tables[currentTableName].parent\n            : adapter.tables[currentTableName].id\n\n          // Handle hasMany _rels table\n          if (field.hasMany) {\n            const joinRelsCollectionTableName = `${joinCollectionTableName}${adapter.relationshipsSuffix}`\n\n            if (field.localized) {\n              joinLocalesCollectionTableName = joinRelsCollectionTableName\n            }\n\n            let columnReferenceToCurrentID: string\n\n            if (versions) {\n              columnReferenceToCurrentID = `${topLevelTableName.replace('_', '').replace(new RegExp(`${adapter.versionsSuffix}$`), '')}_id`\n            } else {\n              columnReferenceToCurrentID = `${topLevelTableName}_id`\n            }\n\n            joins.push({\n              type: 'innerJoin',\n              condition: and(\n                eq(\n                  adapter.tables[joinRelsCollectionTableName].parent,\n                  adapter.tables[joinCollectionTableName].id,\n                ),\n                eq(\n                  sql.raw(`\"${joinRelsCollectionTableName}\".\"${columnReferenceToCurrentID}\"`),\n                  currentIDColumn,\n                ),\n                eq(adapter.tables[joinRelsCollectionTableName].path, field.on),\n              ),\n              table: adapter.tables[joinRelsCollectionTableName],\n            })\n          } else {\n            // Handle localized without hasMany\n\n            const foreignColumn = field.on.replaceAll('.', '_')\n\n            if (field.localized) {\n              joinLocalesCollectionTableName = `${joinCollectionTableName}${adapter.localesSuffix}`\n\n              joins.push({\n                type: 'innerJoin',\n                condition: and(\n                  eq(\n                    adapter.tables[joinLocalesCollectionTableName]._parentID,\n                    adapter.tables[joinCollectionTableName].id,\n                  ),\n                  eq(\n                    adapter.tables[joinLocalesCollectionTableName][foreignColumn],\n                    currentIDColumn,\n                  ),\n                ),\n                table: adapter.tables[joinLocalesCollectionTableName],\n              })\n              // Handle without localized and without hasMany, just a condition append to where. With localized the inner join handles eq.\n            } else {\n              const constraint = eq(\n                adapter.tables[joinCollectionTableName][foreignColumn],\n                currentIDColumn,\n              )\n\n              if (subQueryWhere) {\n                subQueryWhere = and(subQueryWhere, constraint)\n              } else {\n                subQueryWhere = constraint\n              }\n            }\n          }\n\n          const chainedMethods: ChainedMethods = []\n\n          joins.forEach(({ type, condition, table }) => {\n            chainedMethods.push({\n              args: [table, condition],\n              method: type ?? 'leftJoin',\n            })\n          })\n\n          if (limit !== 0) {\n            chainedMethods.push({\n              args: [limit],\n              method: 'limit',\n            })\n          }\n\n          const db = adapter.drizzle as LibSQLDatabase\n\n          const subQuery = chainMethods({\n            methods: chainedMethods,\n            query: db\n              .select({\n                id: adapter.tables[joinCollectionTableName].id,\n                ...(joinLocalesCollectionTableName && {\n                  locale:\n                    adapter.tables[joinLocalesCollectionTableName].locale ||\n                    adapter.tables[joinLocalesCollectionTableName]._locale,\n                }),\n              })\n              .from(adapter.tables[joinCollectionTableName])\n              .where(subQueryWhere)\n              .orderBy(orderBy.order(orderBy.column)),\n          })\n\n          const columnName = `${path.replaceAll('.', '_')}${field.name}`\n\n          const jsonObjectSelect = field.localized\n            ? sql.raw(\n                `'_parentID', \"id\", '_locale', \"${adapter.tables[joinLocalesCollectionTableName].locale ? 'locale' : '_locale'}\"`,\n              )\n            : sql.raw(`'id', \"id\"`)\n\n          if (adapter.name === 'sqlite') {\n            currentArgs.extras[columnName] = sql`\n              COALESCE((\n                SELECT json_group_array(json_object(${jsonObjectSelect}))\n                FROM (\n                  ${subQuery}\n                ) AS ${sql.raw(`${columnName}_sub`)}\n              ), '[]')\n            `.as(columnName)\n          } else {\n            currentArgs.extras[columnName] = sql`\n              COALESCE((\n                SELECT json_agg(json_build_object(${jsonObjectSelect}))\n                FROM (\n                  ${subQuery}\n                ) AS ${sql.raw(`${columnName}_sub`)}\n              ), '[]'::json)\n            `.as(columnName)\n          }\n\n          break\n        }\n\n        default: {\n          break\n        }\n      }\n    }\n  })\n\n  return topLevelArgs\n}\n"],"names":["and","eq","sql","fieldAffectsData","fieldIsVirtual","tabHasName","toSnakeCase","buildQuery","chainMethods","traverseFields","_locales","adapter","currentArgs","currentTableName","depth","fields","joinQuery","joins","locale","path","tablePath","topLevelArgs","topLevelTableName","versions","forEach","field","type","hasMany","relationTo","localized","with","name","tabs","tab","tabPath","tabTablePath","withArray","columns","_parentID","orderBy","_order","asc","arrayTableName","tableNameMap","get","arrayTableNameWithLocales","localesSuffix","tables","id","withSelect","order","parent","blocks","block","blockKey","slug","withBlock","tableName","limit","limitArg","sort","where","replaceAll","payload","collections","collection","config","joinCollectionTableName","buildQueryResult","subQueryWhere","joinLocalesCollectionTableName","currentIDColumn","joinRelsCollectionTableName","relationshipsSuffix","columnReferenceToCurrentID","replace","RegExp","versionsSuffix","push","condition","raw","on","table","foreignColumn","constraint","chainedMethods","args","method","db","drizzle","subQuery","methods","query","select","_locale","from","column","columnName","jsonObjectSelect","extras","as"],"mappings":"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"}

package/dist/postgres/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/postgres/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA6B,MAAM,SAAS,CAAA;AAY9D,eAAO,MAAM,IAAI,EAAE,IA0GlB,CAAA"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/postgres/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA6B,MAAM,SAAS,CAAA;AAY9D,eAAO,MAAM,IAAI,EAAE,IAyGlB,CAAA"}

package/dist/postgres/init.js

@@ -44,7 +44,6 @@ export const init = async function init() {
             disableNotNull: !!collection?.versions?.drafts,
             disableUnique: false,
             fields: collection.fields,
-            joins: collection.joins,
             tableName,
             timestamps: collection.timestamps,
             versions: false

package/dist/postgres/init.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/postgres/init.ts"],"sourcesContent":["import type { Init, SanitizedCollectionConfig } from 'payload'\n\nimport { uniqueIndex } from 'drizzle-orm/pg-core'\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BaseExtraConfig, BasePostgresAdapter } from './types.js'\n\nimport { createTableName } from '../createTableName.js'\nimport { executeSchemaHooks } from '../utilities/executeSchemaHooks.js'\nimport { buildTable } from './schema/build.js'\n\nexport const init: Init = async function init(this: BasePostgresAdapter) {\n  await executeSchemaHooks({ type: 'beforeSchemaInit', adapter: this })\n\n  if (this.payload.config.localization) {\n    this.enums.enum__locales = this.pgSchema.enum(\n      '_locales',\n      this.payload.config.localization.locales.map(({ code }) => code) as [string, ...string[]],\n    )\n  }\n\n  this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {\n    createTableName({\n      adapter: this,\n      config: collection,\n    })\n\n    if (collection.versions) {\n      createTableName({\n        adapter: this,\n        config: collection,\n        versions: true,\n        versionsCustomName: true,\n      })\n    }\n  })\n  this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {\n    const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n\n    const baseExtraConfig: BaseExtraConfig = {}\n\n    if (collection.upload.filenameCompoundIndex) {\n      const indexName = `${tableName}_filename_compound_idx`\n\n      baseExtraConfig.filename_compound_index = (cols) => {\n        const colsConstraint = collection.upload.filenameCompoundIndex.map((f) => {\n          return cols[f]\n        })\n        return uniqueIndex(indexName).on(colsConstraint[0], ...colsConstraint.slice(1))\n      }\n    }\n\n    buildTable({\n      adapter: this,\n      baseExtraConfig,\n      disableNotNull: !!collection?.versions?.drafts,\n      disableUnique: false,\n      fields: collection.fields,\n      joins: collection.joins,\n      tableName,\n      timestamps: collection.timestamps,\n      versions: false,\n    })\n\n    if (collection.versions) {\n      const versionsTableName = this.tableNameMap.get(\n        `_${toSnakeCase(collection.slug)}${this.versionsSuffix}`,\n      )\n      const versionFields = buildVersionCollectionFields(this.payload.config, collection)\n\n      buildTable({\n        adapter: this,\n        disableNotNull: !!collection.versions?.drafts,\n        disableUnique: true,\n        fields: versionFields,\n        tableName: versionsTableName,\n        timestamps: true,\n        versions: true,\n      })\n    }\n  })\n\n  this.payload.config.globals.forEach((global) => {\n    const tableName = createTableName({ adapter: this, config: global })\n\n    buildTable({\n      adapter: this,\n      disableNotNull: !!global?.versions?.drafts,\n      disableUnique: false,\n      fields: global.fields,\n      tableName,\n      timestamps: false,\n      versions: false,\n    })\n\n    if (global.versions) {\n      const versionsTableName = createTableName({\n        adapter: this,\n        config: global,\n        versions: true,\n        versionsCustomName: true,\n      })\n      const versionFields = buildVersionGlobalFields(this.payload.config, global)\n\n      buildTable({\n        adapter: this,\n        disableNotNull: !!global.versions?.drafts,\n        disableUnique: true,\n        fields: versionFields,\n        tableName: versionsTableName,\n        timestamps: true,\n        versions: true,\n      })\n    }\n  })\n\n  await executeSchemaHooks({ type: 'afterSchemaInit', adapter: this })\n}\n"],"names":["uniqueIndex","buildVersionCollectionFields","buildVersionGlobalFields","toSnakeCase","createTableName","executeSchemaHooks","buildTable","init","type","adapter","payload","config","localization","enums","enum__locales","pgSchema","enum","locales","map","code","collections","forEach","collection","versions","versionsCustomName","tableName","tableNameMap","get","slug","baseExtraConfig","upload","filenameCompoundIndex","indexName","filename_compound_index","cols","colsConstraint","f","on","slice","disableNotNull","drafts","disableUnique","fields","joins","timestamps","versionsTableName","versionsSuffix","versionFields","globals","global"],"mappings":"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"}
+{"version":3,"sources":["../../src/postgres/init.ts"],"sourcesContent":["import type { Init, SanitizedCollectionConfig } from 'payload'\n\nimport { uniqueIndex } from 'drizzle-orm/pg-core'\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BaseExtraConfig, BasePostgresAdapter } from './types.js'\n\nimport { createTableName } from '../createTableName.js'\nimport { executeSchemaHooks } from '../utilities/executeSchemaHooks.js'\nimport { buildTable } from './schema/build.js'\n\nexport const init: Init = async function init(this: BasePostgresAdapter) {\n  await executeSchemaHooks({ type: 'beforeSchemaInit', adapter: this })\n\n  if (this.payload.config.localization) {\n    this.enums.enum__locales = this.pgSchema.enum(\n      '_locales',\n      this.payload.config.localization.locales.map(({ code }) => code) as [string, ...string[]],\n    )\n  }\n\n  this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {\n    createTableName({\n      adapter: this,\n      config: collection,\n    })\n\n    if (collection.versions) {\n      createTableName({\n        adapter: this,\n        config: collection,\n        versions: true,\n        versionsCustomName: true,\n      })\n    }\n  })\n  this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {\n    const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n\n    const baseExtraConfig: BaseExtraConfig = {}\n\n    if (collection.upload.filenameCompoundIndex) {\n      const indexName = `${tableName}_filename_compound_idx`\n\n      baseExtraConfig.filename_compound_index = (cols) => {\n        const colsConstraint = collection.upload.filenameCompoundIndex.map((f) => {\n          return cols[f]\n        })\n        return uniqueIndex(indexName).on(colsConstraint[0], ...colsConstraint.slice(1))\n      }\n    }\n\n    buildTable({\n      adapter: this,\n      baseExtraConfig,\n      disableNotNull: !!collection?.versions?.drafts,\n      disableUnique: false,\n      fields: collection.fields,\n      tableName,\n      timestamps: collection.timestamps,\n      versions: false,\n    })\n\n    if (collection.versions) {\n      const versionsTableName = this.tableNameMap.get(\n        `_${toSnakeCase(collection.slug)}${this.versionsSuffix}`,\n      )\n      const versionFields = buildVersionCollectionFields(this.payload.config, collection)\n\n      buildTable({\n        adapter: this,\n        disableNotNull: !!collection.versions?.drafts,\n        disableUnique: true,\n        fields: versionFields,\n        tableName: versionsTableName,\n        timestamps: true,\n        versions: true,\n      })\n    }\n  })\n\n  this.payload.config.globals.forEach((global) => {\n    const tableName = createTableName({ adapter: this, config: global })\n\n    buildTable({\n      adapter: this,\n      disableNotNull: !!global?.versions?.drafts,\n      disableUnique: false,\n      fields: global.fields,\n      tableName,\n      timestamps: false,\n      versions: false,\n    })\n\n    if (global.versions) {\n      const versionsTableName = createTableName({\n        adapter: this,\n        config: global,\n        versions: true,\n        versionsCustomName: true,\n      })\n      const versionFields = buildVersionGlobalFields(this.payload.config, global)\n\n      buildTable({\n        adapter: this,\n        disableNotNull: !!global.versions?.drafts,\n        disableUnique: true,\n        fields: versionFields,\n        tableName: versionsTableName,\n        timestamps: true,\n        versions: true,\n      })\n    }\n  })\n\n  await executeSchemaHooks({ type: 'afterSchemaInit', adapter: this })\n}\n"],"names":["uniqueIndex","buildVersionCollectionFields","buildVersionGlobalFields","toSnakeCase","createTableName","executeSchemaHooks","buildTable","init","type","adapter","payload","config","localization","enums","enum__locales","pgSchema","enum","locales","map","code","collections","forEach","collection","versions","versionsCustomName","tableName","tableNameMap","get","slug","baseExtraConfig","upload","filenameCompoundIndex","indexName","filename_compound_index","cols","colsConstraint","f","on","slice","disableNotNull","drafts","disableUnique","fields","timestamps","versionsTableName","versionsSuffix","versionFields","globals","global"],"mappings":"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"}

package/dist/postgres/schema/build.d.ts

@@ -1,5 +1,5 @@
 import type { PgColumnBuilder } from 'drizzle-orm/pg-core';
-import type { Field, SanitizedJoins } from 'payload';
+import type { Field } from 'payload';
 import type { BaseExtraConfig, BasePostgresAdapter, RelationMap } from '../types.js';
 type Args = {
     adapter: BasePostgresAdapter;
@@ -15,7 +15,6 @@ type Args = {
     disableRelsTableUnique?: boolean;
     disableUnique: boolean;
     fields: Field[];
-    joins?: SanitizedJoins;
     rootRelationships?: Set<string>;
     rootRelationsToBuild?: RelationMap;
     rootTableIDColType?: string;
@@ -38,6 +37,6 @@ type Result = {
     hasManyTextField: 'index' | boolean;
     relationsToBuild: RelationMap;
 };
-export declare const buildTable: ({ adapter, baseColumns, baseExtraConfig, disableNotNull, disableRelsTableUnique, disableUnique, fields, joins, rootRelationships, rootRelationsToBuild, rootTableIDColType, rootTableName: incomingRootTableName, rootUniqueRelationships, tableName, timestamps, versions, withinLocalizedArrayOrBlock, }: Args) => Result;
+export declare const buildTable: ({ adapter, baseColumns, baseExtraConfig, disableNotNull, disableRelsTableUnique, disableUnique, fields, rootRelationships, rootRelationsToBuild, rootTableIDColType, rootTableName: incomingRootTableName, rootUniqueRelationships, tableName, timestamps, versions, withinLocalizedArrayOrBlock, }: Args) => Result;
 export {};
 //# sourceMappingURL=build.d.ts.map

package/dist/postgres/schema/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/postgres/schema/build.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,eAAe,EAEhB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAepD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAInB,WAAW,EACZ,MAAM,aAAa,CAAA;AASpB,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,mBAAmB,CAAA;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC7C;;;OAGG;IACH,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,cAAc,EAAE,OAAO,CAAA;IACvB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,aAAa,EAAE,OAAO,CAAA;IACtB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,cAAc,CAAA;IACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC/B,oBAAoB,CAAC,EAAE,WAAW,CAAA;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,uBAAuB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,OAAO,CAAA;IACjB;;;OAGG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAA;CACtC,CAAA;AAED,KAAK,MAAM,GAAG;IACZ,2BAA2B,EAAE,OAAO,CAAA;IACpC,yBAAyB,EAAE,OAAO,CAAA;IAClC,6BAA6B,EAAE,OAAO,CAAA;IACtC,kBAAkB,EAAE,OAAO,GAAG,OAAO,CAAA;IACrC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAA;IACnC,gBAAgB,EAAE,WAAW,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,UAAU,+SAkBpB,IAAI,KAAG,MA6aT,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/postgres/schema/build.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,eAAe,EAEhB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAkB,MAAM,SAAS,CAAA;AAepD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAInB,WAAW,EACZ,MAAM,aAAa,CAAA;AASpB,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,mBAAmB,CAAA;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC7C;;;OAGG;IACH,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,cAAc,EAAE,OAAO,CAAA;IACvB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,aAAa,EAAE,OAAO,CAAA;IACtB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC/B,oBAAoB,CAAC,EAAE,WAAW,CAAA;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,uBAAuB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,OAAO,CAAA;IACjB;;;OAGG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAA;CACtC,CAAA;AAED,KAAK,MAAM,GAAG;IACZ,2BAA2B,EAAE,OAAO,CAAA;IACpC,yBAAyB,EAAE,OAAO,CAAA;IAClC,6BAA6B,EAAE,OAAO,CAAA;IACtC,kBAAkB,EAAE,OAAO,GAAG,OAAO,CAAA;IACrC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAA;IACnC,gBAAgB,EAAE,WAAW,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,UAAU,wSAiBpB,IAAI,KAAG,MA4aT,CAAA"}

package/dist/postgres/schema/build.js

@@ -7,7 +7,7 @@ import { createIndex } from './createIndex.js';
 import { parentIDColumnMap } from './parentIDColumnMap.js';
 import { setColumnID } from './setColumnID.js';
 import { traverseFields } from './traverseFields.js';
-export const buildTable = ({ adapter, baseColumns = {}, baseExtraConfig = {}, disableNotNull, disableRelsTableUnique = false, disableUnique = false, fields, joins, rootRelationships, rootRelationsToBuild, rootTableIDColType, rootTableName: incomingRootTableName, rootUniqueRelationships, tableName, timestamps, versions, withinLocalizedArrayOrBlock })=>{
+export const buildTable = ({ adapter, baseColumns = {}, baseExtraConfig = {}, disableNotNull, disableRelsTableUnique = false, disableUnique = false, fields, rootRelationships, rootRelationsToBuild, rootTableIDColType, rootTableName: incomingRootTableName, rootUniqueRelationships, tableName, timestamps, versions, withinLocalizedArrayOrBlock })=>{
     const isRoot = !incomingRootTableName;
     const rootTableName = incomingRootTableName || tableName;
     const columns = baseColumns;
@@ -37,7 +37,6 @@ export const buildTable = ({ adapter, baseColumns = {}, baseExtraConfig = {}, di
         disableUnique,
         fields,
         indexes,
-        joins,
         localesColumns,
         localesIndexes,
         newTableName: tableName,