@payloadcms/drizzle 4.0.0-internal.77191e5 → 4.0.0-internal.7b53b6d

package/dist/queries/buildOrderBy.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { SQL, Table } from 'drizzle-orm'\nimport type { FlattenedField, Sort } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js'\n\nimport { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js'\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  aliasTable?: Table\n  fields: FlattenedField[]\n  joins: BuildQueryJoinAliases\n  locale?: string\n  parentIsLocalized: boolean\n  rawSort?: SQL\n  selectFields: Record<string, GenericColumn>\n  sort?: Sort\n  tableName: string\n}\n\n/**\n * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary\n */\nexport const buildOrderBy = ({\n  adapter,\n  aliasTable,\n  fields,\n  joins,\n  locale,\n  parentIsLocalized,\n  rawSort,\n  selectFields,\n  sort,\n  tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n  const orderBy: BuildQueryResult['orderBy'] = []\n\n  const createdAt = adapter.tables[tableName]?.createdAt\n\n  if (!sort) {\n    if (createdAt) {\n      sort = '-createdAt'\n    } else {\n      sort = '-id'\n    }\n  }\n\n  if (typeof sort === 'string') {\n    sort = [sort]\n  }\n\n  // In the case of Mongo, when sorting by a field that is not unique, the results are not guaranteed to be in the same order each time.\n  // So we add a fallback sort to ensure that the results are always in the same order.\n  let fallbackSort = '-id'\n\n  if (createdAt) {\n    fallbackSort = '-createdAt'\n  }\n\n  if (!(sort.includes(fallbackSort) || sort.includes(fallbackSort.replace('-', '')))) {\n    sort.push(fallbackSort)\n  }\n\n  for (const sortItem of sort) {\n    let sortProperty: string\n    let sortDirection: 'asc' | 'desc'\n    if (sortItem[0] === '-') {\n      sortProperty = sortItem.substring(1)\n      sortDirection = 'desc'\n    } else {\n      sortProperty = sortItem\n      sortDirection = 'asc'\n    }\n    try {\n      const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n        adapter,\n        collectionPath: sortProperty,\n        fields,\n        joins,\n        locale,\n        parentIsLocalized,\n        pathSegments: sortProperty.replace(/__/g, '.').split('.'),\n        selectFields,\n        tableName,\n        value: sortProperty,\n      })\n      if (sortTable?.[sortTableColumnName]) {\n        let order = sortDirection === 'asc' ? asc : desc\n\n        if (rawSort) {\n          order = () => rawSort\n        }\n\n        orderBy.push({\n          column:\n            aliasTable && tableName === getNameFromDrizzleTable(sortTable)\n              ? aliasTable[sortTableColumnName]\n              : sortTable[sortTableColumnName],\n          order,\n        })\n\n        // Only add to selectFields if not already present (avoid duplicates from getTableColumnFromPath)\n        const columnToAdd = sortTable[sortTableColumnName]\n        const alreadyExists = Object.values(selectFields).some((col) => col === columnToAdd)\n        if (!alreadyExists) {\n          selectFields[sortTableColumnName] = columnToAdd\n        }\n      }\n    } catch (_) {\n      // continue\n    }\n  }\n\n  return orderBy\n}\n"],"names":["asc","desc","getNameFromDrizzleTable","getTableColumnFromPath","buildOrderBy","adapter","aliasTable","fields","joins","locale","parentIsLocalized","rawSort","selectFields","sort","tableName","orderBy","createdAt","tables","fallbackSort","includes","replace","push","sortItem","sortProperty","sortDirection","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","split","value","order","column","columnToAdd","alreadyExists","Object","values","some","col","_"],"mappings":"AAGA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,uBAAuB,QAAQ,0CAAyC;AACjF,SAASC,sBAAsB,QAAQ,8BAA6B;AAepE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,iBAAiB,EACjBC,OAAO,EACPC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC,EAAE;IAE/C,MAAMC,YAAYX,QAAQY,MAAM,CAACH,UAAU,EAAEE;IAE7C,IAAI,CAACH,MAAM;QACT,IAAIG,WAAW;YACbH,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,sIAAsI;IACtI,qFAAqF;IACrF,IAAIK,eAAe;IAEnB,IAAIF,WAAW;QACbE,eAAe;IACjB;IAEA,IAAI,CAAEL,CAAAA,KAAKM,QAAQ,CAACD,iBAAiBL,KAAKM,QAAQ,CAACD,aAAaE,OAAO,CAAC,KAAK,IAAG,GAAI;QAClFP,KAAKQ,IAAI,CAACH;IACZ;IAEA,KAAK,MAAMI,YAAYT,KAAM;QAC3B,IAAIU;QACJ,IAAIC;QACJ,IAAIF,QAAQ,CAAC,EAAE,KAAK,KAAK;YACvBC,eAAeD,SAASG,SAAS,CAAC;YAClCD,gBAAgB;QAClB,OAAO;YACLD,eAAeD;YACfE,gBAAgB;QAClB;QACA,IAAI;YACF,MAAM,EAAEE,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAG1B,uBAAuB;gBACnFE;gBACAyB,gBAAgBP;gBAChBhB;gBACAC;gBACAC;gBACAC;gBACAqB,cAAcR,aAAaH,OAAO,CAAC,OAAO,KAAKY,KAAK,CAAC;gBACrDpB;gBACAE;gBACAmB,OAAOV;YACT;YACA,IAAIM,WAAW,CAACF,oBAAoB,EAAE;gBACpC,IAAIO,QAAQV,kBAAkB,QAAQxB,MAAMC;gBAE5C,IAAIU,SAAS;oBACXuB,QAAQ,IAAMvB;gBAChB;gBAEAI,QAAQM,IAAI,CAAC;oBACXc,QACE7B,cAAcQ,cAAcZ,wBAAwB2B,aAChDvB,UAAU,CAACqB,oBAAoB,GAC/BE,SAAS,CAACF,oBAAoB;oBACpCO;gBACF;gBAEA,iGAAiG;gBACjG,MAAME,cAAcP,SAAS,CAACF,oBAAoB;gBAClD,MAAMU,gBAAgBC,OAAOC,MAAM,CAAC3B,cAAc4B,IAAI,CAAC,CAACC,MAAQA,QAAQL;gBACxE,IAAI,CAACC,eAAe;oBAClBzB,YAAY,CAACe,oBAAoB,GAAGS;gBACtC;YACF;QACF,EAAE,OAAOM,GAAG;QACV,WAAW;QACb;IACF;IAEA,OAAO3B;AACT,EAAC"}
+{"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { SQL, Table } from 'drizzle-orm'\nimport type { FlattenedField, PayloadRequest, Sort } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js'\n\nimport { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js'\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  aliasTable?: Table\n  fields: FlattenedField[]\n  joins: BuildQueryJoinAliases\n  locale?: string\n  parentIsLocalized: boolean\n  rawSort?: SQL\n  req?: Partial<PayloadRequest>\n  selectFields: Record<string, GenericColumn>\n  sort?: Sort\n  tableName: string\n}\n\n/**\n * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary\n */\nexport const buildOrderBy = ({\n  adapter,\n  aliasTable,\n  fields,\n  joins,\n  locale,\n  parentIsLocalized,\n  rawSort,\n  req,\n  selectFields,\n  sort,\n  tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n  const orderBy: BuildQueryResult['orderBy'] = []\n\n  const createdAt = adapter.tables[tableName]?.createdAt\n\n  if (!sort) {\n    if (createdAt) {\n      sort = '-createdAt'\n    } else {\n      sort = '-id'\n    }\n  }\n\n  if (typeof sort === 'string') {\n    sort = [sort]\n  }\n\n  // In the case of Mongo, when sorting by a field that is not unique, the results are not guaranteed to be in the same order each time.\n  // So we add a fallback sort to ensure that the results are always in the same order.\n  let fallbackSort = '-id'\n\n  if (createdAt) {\n    fallbackSort = '-createdAt'\n  }\n\n  if (!(sort.includes(fallbackSort) || sort.includes(fallbackSort.replace('-', '')))) {\n    sort.push(fallbackSort)\n  }\n\n  for (const sortItem of sort) {\n    let sortProperty: string\n    let sortDirection: 'asc' | 'desc'\n    if (sortItem[0] === '-') {\n      sortProperty = sortItem.substring(1)\n      sortDirection = 'desc'\n    } else {\n      sortProperty = sortItem\n      sortDirection = 'asc'\n    }\n    try {\n      const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n        adapter,\n        collectionPath: sortProperty,\n        fields,\n        joins,\n        locale,\n        parentIsLocalized,\n        pathSegments: sortProperty.replace(/__/g, '.').split('.'),\n        req,\n        selectFields,\n        tableName,\n        value: sortProperty,\n      })\n      if (sortTable?.[sortTableColumnName]) {\n        let order = sortDirection === 'asc' ? asc : desc\n\n        if (rawSort) {\n          order = () => rawSort\n        }\n\n        orderBy.push({\n          column:\n            aliasTable && tableName === getNameFromDrizzleTable(sortTable)\n              ? aliasTable[sortTableColumnName]\n              : sortTable[sortTableColumnName],\n          order,\n        })\n\n        // Only add to selectFields if not already present (avoid duplicates from getTableColumnFromPath)\n        const columnToAdd = sortTable[sortTableColumnName]\n        const alreadyExists = Object.values(selectFields).some((col) => col === columnToAdd)\n        if (!alreadyExists) {\n          selectFields[sortTableColumnName] = columnToAdd\n        }\n      }\n    } catch (_) {\n      // continue\n    }\n  }\n\n  return orderBy\n}\n"],"names":["asc","desc","getNameFromDrizzleTable","getTableColumnFromPath","buildOrderBy","adapter","aliasTable","fields","joins","locale","parentIsLocalized","rawSort","req","selectFields","sort","tableName","orderBy","createdAt","tables","fallbackSort","includes","replace","push","sortItem","sortProperty","sortDirection","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","split","value","order","column","columnToAdd","alreadyExists","Object","values","some","col","_"],"mappings":"AAGA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,uBAAuB,QAAQ,0CAAyC;AACjF,SAASC,sBAAsB,QAAQ,8BAA6B;AAgBpE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,iBAAiB,EACjBC,OAAO,EACPC,GAAG,EACHC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC,EAAE;IAE/C,MAAMC,YAAYZ,QAAQa,MAAM,CAACH,UAAU,EAAEE;IAE7C,IAAI,CAACH,MAAM;QACT,IAAIG,WAAW;YACbH,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,sIAAsI;IACtI,qFAAqF;IACrF,IAAIK,eAAe;IAEnB,IAAIF,WAAW;QACbE,eAAe;IACjB;IAEA,IAAI,CAAEL,CAAAA,KAAKM,QAAQ,CAACD,iBAAiBL,KAAKM,QAAQ,CAACD,aAAaE,OAAO,CAAC,KAAK,IAAG,GAAI;QAClFP,KAAKQ,IAAI,CAACH;IACZ;IAEA,KAAK,MAAMI,YAAYT,KAAM;QAC3B,IAAIU;QACJ,IAAIC;QACJ,IAAIF,QAAQ,CAAC,EAAE,KAAK,KAAK;YACvBC,eAAeD,SAASG,SAAS,CAAC;YAClCD,gBAAgB;QAClB,OAAO;YACLD,eAAeD;YACfE,gBAAgB;QAClB;QACA,IAAI;YACF,MAAM,EAAEE,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAG3B,uBAAuB;gBACnFE;gBACA0B,gBAAgBP;gBAChBjB;gBACAC;gBACAC;gBACAC;gBACAsB,cAAcR,aAAaH,OAAO,CAAC,OAAO,KAAKY,KAAK,CAAC;gBACrDrB;gBACAC;gBACAE;gBACAmB,OAAOV;YACT;YACA,IAAIM,WAAW,CAACF,oBAAoB,EAAE;gBACpC,IAAIO,QAAQV,kBAAkB,QAAQzB,MAAMC;gBAE5C,IAAIU,SAAS;oBACXwB,QAAQ,IAAMxB;gBAChB;gBAEAK,QAAQM,IAAI,CAAC;oBACXc,QACE9B,cAAcS,cAAcb,wBAAwB4B,aAChDxB,UAAU,CAACsB,oBAAoB,GAC/BE,SAAS,CAACF,oBAAoB;oBACpCO;gBACF;gBAEA,iGAAiG;gBACjG,MAAME,cAAcP,SAAS,CAACF,oBAAoB;gBAClD,MAAMU,gBAAgBC,OAAOC,MAAM,CAAC3B,cAAc4B,IAAI,CAAC,CAACC,MAAQA,QAAQL;gBACxE,IAAI,CAACC,eAAe;oBAClBzB,YAAY,CAACe,oBAAoB,GAAGS;gBACtC;YACF;QACF,EAAE,OAAOM,GAAG;QACV,WAAW;QACb;IACF;IAEA,OAAO3B;AACT,EAAC"}

package/dist/queries/buildQuery.d.ts

@@ -1,6 +1,6 @@
 import type { asc, desc, SQL, Table } from 'drizzle-orm';
 import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
-import type { FlattenedField, Sort, Where } from 'payload';
+import type { FlattenedField, PayloadRequest, Sort, Where } from 'payload';
 import type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js';
 export type BuildQueryJoinAliases = {
     condition: SQL;
@@ -16,6 +16,7 @@ type BuildQueryArgs = {
     joins?: BuildQueryJoinAliases;
     locale?: string;
     parentIsLocalized?: boolean;
+    req?: Partial<PayloadRequest>;
     selectLocale?: boolean;
     sort?: Sort;
     tableName: string;
@@ -30,6 +31,6 @@ export type BuildQueryResult = {
     selectFields: Record<string, GenericColumn>;
     where: SQL;
 };
-export declare const buildQuery: ({ adapter, aliasTable, fields, joins, locale, parentIsLocalized, selectLocale, sort, tableName, where: incomingWhere, }: BuildQueryArgs) => BuildQueryResult;
+export declare const buildQuery: ({ adapter, aliasTable, fields, joins, locale, parentIsLocalized, req, selectLocale, sort, tableName, where: incomingWhere, }: BuildQueryArgs) => BuildQueryResult;
 export {};
 //# sourceMappingURL=buildQuery.d.ts.map

package/dist/queries/buildQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IAEd,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,CAAA;CAC9C,EAAE,CAAA;AAEH,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,OAAO,EAAE;QACP,MAAM,EAAE,aAAa,CAAA;QACrB,KAAK,EAAE,OAAO,GAAG,GAAG,OAAO,IAAI,CAAA;KAChC,EAAE,CAAA;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAED,eAAO,MAAM,UAAU,4HAWpB,cAAc,KAAG,gBA2CnB,CAAA"}
+{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE1E,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IAEd,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,CAAA;CAC9C,EAAE,CAAA;AAEH,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,OAAO,EAAE;QACP,MAAM,EAAE,aAAa,CAAA;QACrB,KAAK,EAAE,OAAO,GAAG,GAAG,OAAO,IAAI,CAAA;KAChC,EAAE,CAAA;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAED,eAAO,MAAM,UAAU,iIAYpB,cAAc,KAAG,gBA6CnB,CAAA"}

package/dist/queries/buildQuery.js

@@ -1,8 +1,8 @@
 import { buildOrderBy } from './buildOrderBy.js';
 import { parseParams } from './parseParams.js';
-export const buildQuery = function buildQuery({ adapter, aliasTable, fields, joins = [], locale, parentIsLocalized, selectLocale, sort, tableName, where: incomingWhere }) {
+export const buildQuery = function buildQuery({ adapter, aliasTable, fields, joins = [], locale, parentIsLocalized, req, selectLocale, sort, tableName, where: incomingWhere }) {
     const selectFields = {
-        id: adapter.tables[tableName].id
+        id: (aliasTable ?? adapter.tables[tableName])['id']
     };
     let where;
     const context = {
@@ -17,6 +17,7 @@ export const buildQuery = function buildQuery({ adapter, aliasTable, fields, joi
             joins,
             locale,
             parentIsLocalized,
+            req,
             selectFields,
             selectLocale,
             tableName,
@@ -31,6 +32,7 @@ export const buildQuery = function buildQuery({ adapter, aliasTable, fields, joi
         locale,
         parentIsLocalized,
         rawSort: context.rawSort,
+        req,
         selectFields,
         sort: context.sort,
         tableName

package/dist/queries/buildQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL, Table } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { FlattenedField, Sort, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\nimport type { QueryContext } from './parseParams.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  // with parent\n  isOneToMany?: boolean\n  queryPath?: string\n  table: GenericTable | PgTableWithColumns<any>\n  type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  aliasTable?: Table\n  fields: FlattenedField[]\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  parentIsLocalized?: boolean\n  selectLocale?: boolean\n  sort?: Sort\n  tableName: string\n  where: Where\n}\n\nexport type BuildQueryResult = {\n  joins: BuildQueryJoinAliases\n  orderBy: {\n    column: GenericColumn\n    order: typeof asc | typeof desc\n  }[]\n  selectFields: Record<string, GenericColumn>\n  where: SQL\n}\n\nexport const buildQuery = function buildQuery({\n  adapter,\n  aliasTable,\n  fields,\n  joins = [],\n  locale,\n  parentIsLocalized,\n  selectLocale,\n  sort,\n  tableName,\n  where: incomingWhere,\n}: BuildQueryArgs): BuildQueryResult {\n  const selectFields: Record<string, GenericColumn> = {\n    id: adapter.tables[tableName].id,\n  }\n\n  let where: SQL\n\n  const context: QueryContext = { sort }\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = parseParams({\n      adapter,\n      aliasTable,\n      context,\n      fields,\n      joins,\n      locale,\n      parentIsLocalized,\n      selectFields,\n      selectLocale,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  const orderBy = buildOrderBy({\n    adapter,\n    aliasTable,\n    fields,\n    joins,\n    locale,\n    parentIsLocalized,\n    rawSort: context.rawSort,\n    selectFields,\n    sort: context.sort,\n    tableName,\n  })\n\n  return {\n    joins,\n    orderBy,\n    selectFields,\n    where,\n  }\n}\n"],"names":["buildOrderBy","parseParams","buildQuery","adapter","aliasTable","fields","joins","locale","parentIsLocalized","selectLocale","sort","tableName","where","incomingWhere","selectFields","id","tables","context","Object","keys","length","orderBy","rawSort"],"mappings":"AAOA,SAASA,YAAY,QAAQ,oBAAmB;AAChD,SAASC,WAAW,QAAQ,mBAAkB;AAkC9C,OAAO,MAAMC,aAAa,SAASA,WAAW,EAC5CC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,QAAQ,EAAE,EACVC,MAAM,EACNC,iBAAiB,EACjBC,YAAY,EACZC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAIZ,QAAQa,MAAM,CAACL,UAAU,CAACI,EAAE;IAClC;IAEA,IAAIH;IAEJ,MAAMK,UAAwB;QAAEP;IAAK;IACrC,IAAIG,iBAAiBK,OAAOC,IAAI,CAACN,eAAeO,MAAM,GAAG,GAAG;QAC1DR,QAAQX,YAAY;YAClBE;YACAC;YACAa;YACAZ;YACAC;YACAC;YACAC;YACAM;YACAL;YACAE;YACAC,OAAOC;QACT;IACF;IAEA,MAAMQ,UAAUrB,aAAa;QAC3BG;QACAC;QACAC;QACAC;QACAC;QACAC;QACAc,SAASL,QAAQK,OAAO;QACxBR;QACAJ,MAAMO,QAAQP,IAAI;QAClBC;IACF;IAEA,OAAO;QACLL;QACAe;QACAP;QACAF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL, Table } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { FlattenedField, PayloadRequest, Sort, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\nimport type { QueryContext } from './parseParams.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  // with parent\n  isOneToMany?: boolean\n  queryPath?: string\n  table: GenericTable | PgTableWithColumns<any>\n  type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  aliasTable?: Table\n  fields: FlattenedField[]\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  parentIsLocalized?: boolean\n  req?: Partial<PayloadRequest>\n  selectLocale?: boolean\n  sort?: Sort\n  tableName: string\n  where: Where\n}\n\nexport type BuildQueryResult = {\n  joins: BuildQueryJoinAliases\n  orderBy: {\n    column: GenericColumn\n    order: typeof asc | typeof desc\n  }[]\n  selectFields: Record<string, GenericColumn>\n  where: SQL\n}\n\nexport const buildQuery = function buildQuery({\n  adapter,\n  aliasTable,\n  fields,\n  joins = [],\n  locale,\n  parentIsLocalized,\n  req,\n  selectLocale,\n  sort,\n  tableName,\n  where: incomingWhere,\n}: BuildQueryArgs): BuildQueryResult {\n  const selectFields: Record<string, GenericColumn> = {\n    id: (aliasTable ?? adapter.tables[tableName])['id'],\n  }\n\n  let where: SQL\n\n  const context: QueryContext = { sort }\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = parseParams({\n      adapter,\n      aliasTable,\n      context,\n      fields,\n      joins,\n      locale,\n      parentIsLocalized,\n      req,\n      selectFields,\n      selectLocale,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  const orderBy = buildOrderBy({\n    adapter,\n    aliasTable,\n    fields,\n    joins,\n    locale,\n    parentIsLocalized,\n    rawSort: context.rawSort,\n    req,\n    selectFields,\n    sort: context.sort,\n    tableName,\n  })\n\n  return {\n    joins,\n    orderBy,\n    selectFields,\n    where,\n  }\n}\n"],"names":["buildOrderBy","parseParams","buildQuery","adapter","aliasTable","fields","joins","locale","parentIsLocalized","req","selectLocale","sort","tableName","where","incomingWhere","selectFields","id","tables","context","Object","keys","length","orderBy","rawSort"],"mappings":"AAOA,SAASA,YAAY,QAAQ,oBAAmB;AAChD,SAASC,WAAW,QAAQ,mBAAkB;AAmC9C,OAAO,MAAMC,aAAa,SAASA,WAAW,EAC5CC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,QAAQ,EAAE,EACVC,MAAM,EACNC,iBAAiB,EACjBC,GAAG,EACHC,YAAY,EACZC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAI,AAACZ,CAAAA,cAAcD,QAAQc,MAAM,CAACL,UAAU,AAAD,CAAE,CAAC,KAAK;IACrD;IAEA,IAAIC;IAEJ,MAAMK,UAAwB;QAAEP;IAAK;IACrC,IAAIG,iBAAiBK,OAAOC,IAAI,CAACN,eAAeO,MAAM,GAAG,GAAG;QAC1DR,QAAQZ,YAAY;YAClBE;YACAC;YACAc;YACAb;YACAC;YACAC;YACAC;YACAC;YACAM;YACAL;YACAE;YACAC,OAAOC;QACT;IACF;IAEA,MAAMQ,UAAUtB,aAAa;QAC3BG;QACAC;QACAC;QACAC;QACAC;QACAC;QACAe,SAASL,QAAQK,OAAO;QACxBd;QACAM;QACAJ,MAAMO,QAAQP,IAAI;QAClBC;IACF;IAEA,OAAO;QACLN;QACAgB;QACAP;QACAF;IACF;AACF,EAAC"}

package/dist/queries/getTableColumnFromPath.d.ts

@@ -1,6 +1,6 @@
 import type { SQL } from 'drizzle-orm';
 import type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
-import type { FlattenedField } from 'payload';
+import type { FlattenedField, PayloadRequest } from 'payload';
 import { type PgTableWithColumns } from 'drizzle-orm/pg-core';
 import type { DrizzleAdapter, GenericColumn } from '../types.js';
 import type { BuildQueryJoinAliases } from './buildQuery.js';
@@ -37,6 +37,7 @@ type Args = {
     parentAliasTable?: PgTableWithColumns<any> | SQLiteTableWithColumns<any>;
     parentIsLocalized: boolean;
     pathSegments: string[];
+    req?: Partial<PayloadRequest>;
     rootTableName?: string;
     selectFields: Record<string, GenericColumn>;
     selectLocale?: boolean;
@@ -62,6 +63,6 @@ type Args = {
  *
  * @returns The final field and column, plus any extra constraints discovered while resolving it.
  */
-export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joins, locale: incomingLocale, parentAliasTable, parentIsLocalized, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, selectLocale, tableName, tableNameSuffix, value, }: Args) => TableColumn;
+export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joins, locale: incomingLocale, parentAliasTable, parentIsLocalized, pathSegments: incomingSegments, req, rootTableName: incomingRootTableName, selectFields, selectLocale, tableName, tableNameSuffix, value, }: Args) => TableColumn;
 export {};
 //# sourceMappingURL=getTableColumnFromPath.d.ts.map

package/dist/queries/getTableColumnFromPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAEV,cAAc,EAIf,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAW5D,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAC5D,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;QAClC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;KACxB,EAAE,CAAA;IACH,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,KAAK,EAAE,cAAc,CAAA;IACrB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAA;IAClD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,GAAG,CAAA;IACf,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;CAC7D,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,8FAA8F;IAC9F,UAAU,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAClE,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IACxE,iBAAiB,EAAE,OAAO,CAAA;IAC1B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AACD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,iUAmBhC,IAAI,KAAG,WAy9BT,CAAA"}
+{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAEV,cAAc,EAEd,cAAc,EAIf,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAY5D,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAC5D,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;QAClC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;KACxB,EAAE,CAAA;IACH,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,KAAK,EAAE,cAAc,CAAA;IACrB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAA;IAClD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,GAAG,CAAA;IACf,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;CAC7D,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,8FAA8F;IAC9F,UAAU,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAClE,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IACxE,iBAAiB,EAAE,OAAO,CAAA;IAC1B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAsGD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,sUAoBhC,IAAI,KAAG,WAwiCT,CAAA"}

package/dist/queries/getTableColumnFromPath.js

@@ -1,5 +1,5 @@
-import { and, eq, getTableName, like, sql } from 'drizzle-orm';
-import { APIError, getFieldByPath } from 'payload';
+import { and, eq, getTableName, isNull, like, notInArray, or, sql } from 'drizzle-orm';
+import { APIError, getBranchPredicateSync, getFieldByPath, resolveBranchReadState } from 'payload';
 import { fieldShouldBeLocalized, tabHasName } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
 import { validate as uuidValidate } from 'uuid';
@@ -9,8 +9,77 @@ import { jsonBuildObject } from '../utilities/json.js';
 import { DistinctSymbol } from '../utilities/rawConstraint.js';
 import { resolveBlockTableName } from '../utilities/validateExistingBlockIsIdentical.js';
 import { addJoinTable } from './addJoinTable.js';
+import { buildBranchVisibility } from './buildBranchVisibility.js';
 import { getTableAlias } from './getTableAlias.js';
 import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRelationshipPath.js';
+const getRelationshipJoinCondition = ({ adapter, collectionSlug, relationshipID, req, table, value })=>{
+    const branchReadState = resolveBranchReadState({
+        collectionSlug,
+        req
+    });
+    const branchPredicate = branchReadState.useBranching ? null : getBranchPredicateSync({
+        collectionSlug,
+        req
+    });
+    const shouldMatchCanonicalID = Boolean(table._branchDocID && (branchReadState.useBranching || branchPredicate || value === DistinctSymbol));
+    const identityCondition = shouldMatchCanonicalID ? or(eq(table.id, relationshipID), eq(table._branchDocID, relationshipID)) : eq(table.id, relationshipID);
+    const branchCondition = getBranchTableCondition({
+        adapter,
+        collectionSlug,
+        req,
+        table
+    });
+    return branchCondition ? and(identityCondition, branchCondition) : identityCondition;
+};
+const getBranchTableCondition = ({ adapter, collectionSlug, req, table })=>{
+    const branchReadState = resolveBranchReadState({
+        collectionSlug,
+        req
+    });
+    if (branchReadState.useBranching) {
+        return buildBranchVisibility({
+            adapter,
+            branch: branchReadState.branch,
+            collectionSlug,
+            table
+        });
+    }
+    const branchPredicate = getBranchPredicateSync({
+        collectionSlug,
+        req
+    });
+    return branchPredicate ? buildBranchPredicateCondition({
+        table,
+        where: branchPredicate
+    }) : undefined;
+};
+const buildBranchPredicateCondition = ({ table, where })=>{
+    const conditions = [];
+    for (const [fieldName, condition] of Object.entries(where)){
+        if ((fieldName === 'and' || fieldName === 'or') && Array.isArray(condition)) {
+            const nestedConditions = condition.map((nestedWhere)=>buildBranchPredicateCondition({
+                    table,
+                    where: nestedWhere
+                })).filter((nestedCondition)=>Boolean(nestedCondition));
+            const nestedResult = fieldName === 'and' ? and(...nestedConditions) : or(...nestedConditions);
+            if (nestedResult) {
+                conditions.push(nestedResult);
+            }
+            continue;
+        }
+        const column = table[fieldName];
+        if (!column || !condition || typeof condition !== 'object') {
+            continue;
+        }
+        if ('equals' in condition) {
+            conditions.push(condition.equals === null ? isNull(column) : eq(column, condition.equals));
+        }
+        if ('not_in' in condition && Array.isArray(condition.not_in) && condition.not_in.length > 0) {
+            conditions.push(notInArray(column, condition.not_in));
+        }
+    }
+    return conditions.length === 1 ? conditions[0] : and(...conditions);
+};
 /**
  * Resolves a field path to the database table and column that store its value.
  *
@@ -22,7 +91,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
  * to the `movies` table. The returned column is `movies.name`.
  *
  * @returns The final field and column, plus any extra constraints discovered while resolving it.
- */ export const getTableColumnFromPath = ({ adapter, aliasTable, collectionPath, columnPrefix = '', constraintPath: incomingConstraintPath, constraints = [], fields, joins, locale: incomingLocale, parentAliasTable, parentIsLocalized, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, selectLocale, tableName, tableNameSuffix = '', value })=>{
+ */ export const getTableColumnFromPath = ({ adapter, aliasTable, collectionPath, columnPrefix = '', constraintPath: incomingConstraintPath, constraints = [], fields, joins, locale: incomingLocale, parentAliasTable, parentIsLocalized, pathSegments: incomingSegments, req, rootTableName: incomingRootTableName, selectFields, selectLocale, tableName, tableNameSuffix = '', value })=>{
     const fieldPath = incomingSegments[0];
     let locale = incomingLocale;
     const rootTableName = incomingRootTableName || tableName;
@@ -31,7 +100,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
     const field = fields.find((fieldToFind)=>fieldToFind.name === fieldPath);
     let newTableName = tableName;
     if (!field && fieldPath === 'id') {
-        selectFields.id = adapter.tables[newTableName].id;
+        const idTable = aliasTable ?? adapter.tables[newTableName];
         return {
             columnName: 'id',
             constraints,
@@ -39,7 +108,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                 name: 'id',
                 type: isUUIDType(adapter.idType) ? 'text' : 'number'
             },
-            table: adapter.tables[newTableName]
+            table: idTable
         };
     }
     let localizedPathQuery = false;
@@ -106,6 +175,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                         parentAliasTable: aliasTable,
                         parentIsLocalized: parentIsLocalized || field.localized,
                         pathSegments: pathSegments.slice(1),
+                        req,
                         rootTableName,
                         selectFields,
                         selectLocale,
@@ -189,6 +259,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                                 locale,
                                 parentIsLocalized: parentIsLocalized || field.localized,
                                 pathSegments: pathSegments.slice(1),
+                                req,
                                 rootTableName,
                                 selectFields: blockSelectFields,
                                 selectLocale,
@@ -255,6 +326,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                         locale,
                         parentIsLocalized: parentIsLocalized || field.localized,
                         pathSegments: pathSegments.slice(1),
+                        req,
                         rootTableName,
                         selectFields,
                         selectLocale,
@@ -321,8 +393,15 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                             tableName: relationshipTableName
                         }).newAliasTable;
                         if (!existingMainTable) {
+                            const branchCondition = getBranchTableCondition({
+                                adapter,
+                                collectionSlug: field.collection,
+                                req,
+                                table: relationshipTable
+                            });
+                            const relationshipCondition = eq(aliasRelationshipTable.parent, relationshipTable.id);
                             joins.push({
-                                condition: eq(aliasRelationshipTable.parent, relationshipTable.id),
+                                condition: branchCondition ? and(relationshipCondition, branchCondition) : relationshipCondition,
                                 queryPath: `${constraintPath}${field.name}`,
                                 table: relationshipTable
                             });
@@ -338,6 +417,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                             // A join reads from a different collection, so localization does not carry over
                             parentIsLocalized: false,
                             pathSegments: pathSegments.slice(1),
+                            req,
                             rootTableName: relationshipTableName,
                             selectFields,
                             selectLocale,
@@ -368,13 +448,29 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                                 table: arrayAliasTable
                             });
                             joins.push({
-                                condition: eq(newAliasTable.id, arrayAliasTable._parentID),
+                                condition: (()=>{
+                                    const relationshipCondition = eq(newAliasTable['id'], arrayAliasTable._parentID);
+                                    const branchCondition = getBranchTableCondition({
+                                        adapter,
+                                        collectionSlug: field.collection,
+                                        req,
+                                        table: newAliasTable
+                                    });
+                                    return branchCondition ? and(relationshipCondition, branchCondition) : relationshipCondition;
+                                })(),
                                 queryPath: `${constraintPath}${field.name}`,
                                 table: newAliasTable
                             });
                         } else {
+                            const relationshipCondition = eq(newAliasTable[field.on.replaceAll('.', '_')], aliasTable ? aliasTable.id : adapter.tables[tableName].id);
+                            const branchCondition = getBranchTableCondition({
+                                adapter,
+                                collectionSlug: field.collection,
+                                req,
+                                table: newAliasTable
+                            });
                             joins.push({
-                                condition: eq(newAliasTable[field.on.replaceAll('.', '_')], aliasTable ? aliasTable.id : adapter.tables[tableName].id),
+                                condition: branchCondition ? and(relationshipCondition, branchCondition) : relationshipCondition,
                                 queryPath: `${constraintPath}${field.name}`,
                                 table: newAliasTable
                             });
@@ -403,6 +499,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                         // A join reads from a different collection, so localization does not carry over
                         parentIsLocalized: false,
                         pathSegments: pathSegments.slice(1),
+                        req,
                         selectFields,
                         tableName: newTableName,
                         value
@@ -463,6 +560,8 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
             case 'upload':
                 {
                     const newCollectionPath = pathSegments.slice(1).join('.');
+                    const relationshipQueryPath = `${getTableName(tableContainingField)}.${fieldStoragePath}._rels`;
+                    const targetQueryPath = `${getTableName(tableContainingField)}.${fieldStoragePath}._target`;
                     if (Array.isArray(field.relationTo) || field.hasMany) {
                         const relationshipPath = resolveRelationshipPath({
                             adapter,
@@ -477,7 +576,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                         }
                         let relationshipFields;
                         const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`;
-                        const existingJoin = joins.find((e)=>e.queryPath === `${constraintPath}.${field.name}`);
+                        const existingJoin = joins.find((e)=>e.queryPath === relationshipQueryPath);
                         let aliasRelationshipTable;
                         let aliasRelationshipTableName;
                         if (existingJoin) {
@@ -504,7 +603,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                             addJoinTable({
                                 condition: and(...conditions),
                                 joins,
-                                queryPath: `${constraintPath}.${field.name}`,
+                                queryPath: relationshipQueryPath,
                                 table: aliasRelationshipTable
                             });
                         } else {
@@ -512,7 +611,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                             addJoinTable({
                                 condition: and(eq(tableContainingField.id, aliasRelationshipTable.parent), like(aliasRelationshipTable.path, relationshipPath.path)),
                                 joins,
-                                queryPath: `${constraintPath}.${field.name}`,
+                                queryPath: relationshipQueryPath,
                                 table: aliasRelationshipTable
                             });
                         }
@@ -523,15 +622,31 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                             newTableName = adapter.tableNameMap.get(toSnakeCase(relationshipConfig.slug));
                             // parent to relationship join table
                             relationshipFields = relationshipConfig.flattenedFields;
-                            ({ newAliasTable } = getTableAlias({
-                                adapter,
-                                tableName: newTableName
-                            }));
-                            joins.push({
-                                condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),
-                                table: newAliasTable
-                            });
-                            if (newCollectionPath === '' || newCollectionPath === 'id') {
+                            const existingTargetJoin = joins.find((join)=>join.queryPath === targetQueryPath);
+                            if (existingTargetJoin) {
+                                newAliasTable = existingTargetJoin.table;
+                            } else {
+                                ;
+                                ({ newAliasTable } = getTableAlias({
+                                    adapter,
+                                    tableName: newTableName
+                                }));
+                                const relationshipID = aliasRelationshipTable[`${field.relationTo}ID`];
+                                const condition = getRelationshipJoinCondition({
+                                    adapter,
+                                    collectionSlug: field.relationTo,
+                                    relationshipID,
+                                    req,
+                                    table: newAliasTable,
+                                    value
+                                });
+                                joins.push({
+                                    condition,
+                                    queryPath: targetQueryPath,
+                                    table: newAliasTable
+                                });
+                            }
+                            if (newCollectionPath === '' || newCollectionPath === 'id' && !existingTargetJoin) {
                                 return {
                                     columnName: `${field.relationTo}ID`,
                                     constraints,
@@ -634,21 +749,23 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                             // A relationship jumps to a different collection, so localization does not carry over
                             parentIsLocalized: false,
                             pathSegments: pathSegments.slice(1),
+                            req,
                             rootTableName: newTableName,
                             selectFields,
                             selectLocale,
                             tableName: newTableName,
                             value
                         });
-                    } else if (pathSegments.length > 1 && !(pathSegments.length === 2 && pathSegments[1] === 'id')) {
+                    } else if (pathSegments.length > 1 && (!(pathSegments.length === 2 && pathSegments[1] === 'id') || joins.some((join)=>join.queryPath === targetQueryPath))) {
                         // simple relationships
                         const columnName = `${columnPrefix}${field.name}`;
                         const newTableName = adapter.tableNameMap.get(toSnakeCase(adapter.payload.collections[field.relationTo].config.slug));
-                        const { newAliasTable } = getTableAlias({
+                        const existingTargetJoin = joins.find((join)=>join.queryPath === targetQueryPath);
+                        const newAliasTable = existingTargetJoin?.table ?? getTableAlias({
                             adapter,
                             tableName: newTableName
-                        });
-                        if (isFieldLocalized && adapter.payload.config.localization) {
+                        }).newAliasTable;
+                        if (!existingTargetJoin && isFieldLocalized && adapter.payload.config.localization) {
                             const { newAliasTable: aliasLocaleTable } = getTableAlias({
                                 adapter,
                                 tableName: `${rootTableName}${adapter.localesSuffix}`
@@ -668,13 +785,32 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                                 joins,
                                 table: localesTable
                             });
+                            const condition = getRelationshipJoinCondition({
+                                adapter,
+                                collectionSlug: field.relationTo,
+                                relationshipID: localesTable[columnName],
+                                req,
+                                table: newAliasTable,
+                                value
+                            });
                             joins.push({
-                                condition: eq(localesTable[columnName], newAliasTable.id),
+                                condition,
+                                queryPath: targetQueryPath,
                                 table: newAliasTable
                             });
-                        } else {
+                        } else if (!existingTargetJoin) {
+                            const relationshipID = aliasTable ? aliasTable[columnName] : adapter.tables[tableName][columnName];
+                            const condition = getRelationshipJoinCondition({
+                                adapter,
+                                collectionSlug: field.relationTo,
+                                relationshipID,
+                                req,
+                                table: newAliasTable,
+                                value
+                            });
                             joins.push({
-                                condition: eq(newAliasTable.id, aliasTable ? aliasTable[columnName] : adapter.tables[tableName][columnName]),
+                                condition,
+                                queryPath: targetQueryPath,
                                 table: newAliasTable
                             });
                         }
@@ -690,6 +826,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                             // A relationship jumps to a different collection, so localization does not carry over
                             parentIsLocalized: false,
                             pathSegments: pathSegments.slice(1),
+                            req,
                             selectFields,
                             tableName: newTableName,
                             value
@@ -746,6 +883,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                             locale,
                             parentIsLocalized: parentIsLocalized || field.localized,
                             pathSegments: pathSegments.slice(1),
+                            req,
                             rootTableName,
                             selectFields,
                             selectLocale,
@@ -766,6 +904,7 @@ import { appendFieldToStoragePath, resolveRelationshipPath } from './resolveRela
                         locale,
                         parentIsLocalized: parentIsLocalized || field.localized,
                         pathSegments: pathSegments.slice(1),
+                        req,
                         rootTableName,
                         selectFields,
                         selectLocale,