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

package/dist/queries/buildOrderBy.d.ts

@@ -1,4 +1,4 @@
-import type { Field } from 'payload';
+import type { Field, Sort } from 'payload';
 import type { DrizzleAdapter, GenericColumn } from '../types.js';
 import type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js';
 type Args = {
@@ -7,7 +7,7 @@ type Args = {
     joins: BuildQueryJoinAliases;
     locale?: string;
     selectFields: Record<string, GenericColumn>;
-    sort?: string;
+    sort?: Sort;
     tableName: string;
 };
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"buildOrderBy.d.ts","sourceRoot":"","sources":["../../src/queries/buildOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAIpC,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAI9E,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,uEAQtB,IAAI,KAAG,gBAAgB,CAAC,SAAS,CAoDnC,CAAA"}
+{"version":3,"file":"buildOrderBy.d.ts","sourceRoot":"","sources":["../../src/queries/buildOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAI1C,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAI9E,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,uEAQtB,IAAI,KAAG,gBAAgB,CAAC,SAAS,CAoDnC,CAAA"}

package/dist/queries/buildOrderBy.js

@@ -3,49 +3,53 @@ import { getTableColumnFromPath } from './getTableColumnFromPath.js';
 /**
  * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary
  */ export const buildOrderBy = ({ adapter, fields, joins, locale, selectFields, sort, tableName })=>{
-    const orderBy = {
-        column: null,
-        order: null
-    };
-    if (sort) {
-        let sortPath;
-        if (sort[0] === '-') {
-            sortPath = sort.substring(1);
-            orderBy.order = desc;
+    const orderBy = [];
+    if (!sort) {
+        const createdAt = adapter.tables[tableName]?.createdAt;
+        if (createdAt) {
+            sort = '-createdAt';
+        } else {
+            sort = '-id';
+        }
+    }
+    if (typeof sort === 'string') {
+        sort = [
+            sort
+        ];
+    }
+    for (const sortItem of sort){
+        let sortProperty;
+        let sortDirection;
+        if (sortItem[0] === '-') {
+            sortProperty = sortItem.substring(1);
+            sortDirection = 'desc';
         } else {
-            sortPath = sort;
-            orderBy.order = asc;
+            sortProperty = sortItem;
+            sortDirection = 'asc';
         }
         try {
             const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({
                 adapter,
-                collectionPath: sortPath,
+                collectionPath: sortProperty,
                 fields,
                 joins,
                 locale,
-                pathSegments: sortPath.replace(/__/g, '.').split('.'),
+                pathSegments: sortProperty.replace(/__/g, '.').split('.'),
                 selectFields,
                 tableName,
-                useAlias: true,
-                value: sortPath
+                value: sortProperty
             });
-            orderBy.column = sortTable?.[sortTableColumnName];
+            if (sortTable?.[sortTableColumnName]) {
+                orderBy.push({
+                    column: sortTable[sortTableColumnName],
+                    order: sortDirection === 'asc' ? asc : desc
+                });
+                selectFields[sortTableColumnName] = sortTable[sortTableColumnName];
+            }
         } catch (err) {
         // continue
         }
     }
-    if (!orderBy?.column) {
-        orderBy.order = desc;
-        const createdAt = adapter.tables[tableName]?.createdAt;
-        if (createdAt) {
-            orderBy.column = createdAt;
-        } else {
-            orderBy.column = adapter.tables[tableName].id;
-        }
-    }
-    if (orderBy.column) {
-        selectFields.sort = orderBy.column;
-    }
     return orderBy;
 };
 

package/dist/queries/buildOrderBy.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { Field } 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 { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  joins: BuildQueryJoinAliases\n  locale?: string\n  selectFields: Record<string, GenericColumn>\n  sort?: string\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  fields,\n  joins,\n  locale,\n  selectFields,\n  sort,\n  tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n  const orderBy: BuildQueryResult['orderBy'] = {\n    column: null,\n    order: null,\n  }\n\n  if (sort) {\n    let sortPath\n\n    if (sort[0] === '-') {\n      sortPath = sort.substring(1)\n      orderBy.order = desc\n    } else {\n      sortPath = sort\n      orderBy.order = asc\n    }\n\n    try {\n      const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n        adapter,\n        collectionPath: sortPath,\n        fields,\n        joins,\n        locale,\n        pathSegments: sortPath.replace(/__/g, '.').split('.'),\n        selectFields,\n        tableName,\n        useAlias: true,\n        value: sortPath,\n      })\n      orderBy.column = sortTable?.[sortTableColumnName]\n    } catch (err) {\n      // continue\n    }\n  }\n\n  if (!orderBy?.column) {\n    orderBy.order = desc\n    const createdAt = adapter.tables[tableName]?.createdAt\n\n    if (createdAt) {\n      orderBy.column = createdAt\n    } else {\n      orderBy.column = adapter.tables[tableName].id\n    }\n  }\n\n  if (orderBy.column) {\n    selectFields.sort = orderBy.column\n  }\n\n  return orderBy\n}\n"],"names":["asc","desc","getTableColumnFromPath","buildOrderBy","adapter","fields","joins","locale","selectFields","sort","tableName","orderBy","column","order","sortPath","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","replace","split","useAlias","value","err","createdAt","tables","id"],"mappings":"AAEA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,sBAAsB,QAAQ,8BAA6B;AAYpE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC;QAC3CC,QAAQ;QACRC,OAAO;IACT;IAEA,IAAIJ,MAAM;QACR,IAAIK;QAEJ,IAAIL,IAAI,CAAC,EAAE,KAAK,KAAK;YACnBK,WAAWL,KAAKM,SAAS,CAAC;YAC1BJ,QAAQE,KAAK,GAAGZ;QAClB,OAAO;YACLa,WAAWL;YACXE,QAAQE,KAAK,GAAGb;QAClB;QAEA,IAAI;YACF,MAAM,EAAEgB,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAGjB,uBAAuB;gBACnFE;gBACAgB,gBAAgBN;gBAChBT;gBACAC;gBACAC;gBACAc,cAAcP,SAASQ,OAAO,CAAC,OAAO,KAAKC,KAAK,CAAC;gBACjDf;gBACAE;gBACAc,UAAU;gBACVC,OAAOX;YACT;YACAH,QAAQC,MAAM,GAAGO,WAAW,CAACF,oBAAoB;QACnD,EAAE,OAAOS,KAAK;QACZ,WAAW;QACb;IACF;IAEA,IAAI,CAACf,SAASC,QAAQ;QACpBD,QAAQE,KAAK,GAAGZ;QAChB,MAAM0B,YAAYvB,QAAQwB,MAAM,CAAClB,UAAU,EAAEiB;QAE7C,IAAIA,WAAW;YACbhB,QAAQC,MAAM,GAAGe;QACnB,OAAO;YACLhB,QAAQC,MAAM,GAAGR,QAAQwB,MAAM,CAAClB,UAAU,CAACmB,EAAE;QAC/C;IACF;IAEA,IAAIlB,QAAQC,MAAM,EAAE;QAClBJ,aAAaC,IAAI,GAAGE,QAAQC,MAAM;IACpC;IAEA,OAAOD;AACT,EAAC"}
+{"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { Field, 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 { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  joins: BuildQueryJoinAliases\n  locale?: string\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  fields,\n  joins,\n  locale,\n  selectFields,\n  sort,\n  tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n  const orderBy: BuildQueryResult['orderBy'] = []\n\n  if (!sort) {\n    const createdAt = adapter.tables[tableName]?.createdAt\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  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        pathSegments: sortProperty.replace(/__/g, '.').split('.'),\n        selectFields,\n        tableName,\n        value: sortProperty,\n      })\n      if (sortTable?.[sortTableColumnName]) {\n        orderBy.push({\n          column: sortTable[sortTableColumnName],\n          order: sortDirection === 'asc' ? asc : desc,\n        })\n\n        selectFields[sortTableColumnName] = sortTable[sortTableColumnName]\n      }\n    } catch (err) {\n      // continue\n    }\n  }\n\n  return orderBy\n}\n"],"names":["asc","desc","getTableColumnFromPath","buildOrderBy","adapter","fields","joins","locale","selectFields","sort","tableName","orderBy","createdAt","tables","sortItem","sortProperty","sortDirection","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","replace","split","value","push","column","order","err"],"mappings":"AAEA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,sBAAsB,QAAQ,8BAA6B;AAYpE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC,EAAE;IAE/C,IAAI,CAACF,MAAM;QACT,MAAMG,YAAYR,QAAQS,MAAM,CAACH,UAAU,EAAEE;QAC7C,IAAIA,WAAW;YACbH,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,KAAK,MAAMK,YAAYL,KAAM;QAC3B,IAAIM;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,GAAGnB,uBAAuB;gBACnFE;gBACAkB,gBAAgBP;gBAChBV;gBACAC;gBACAC;gBACAgB,cAAcR,aAAaS,OAAO,CAAC,OAAO,KAAKC,KAAK,CAAC;gBACrDjB;gBACAE;gBACAgB,OAAOX;YACT;YACA,IAAIM,WAAW,CAACF,oBAAoB,EAAE;gBACpCR,QAAQgB,IAAI,CAAC;oBACXC,QAAQP,SAAS,CAACF,oBAAoB;oBACtCU,OAAOb,kBAAkB,QAAQhB,MAAMC;gBACzC;gBAEAO,YAAY,CAACW,oBAAoB,GAAGE,SAAS,CAACF,oBAAoB;YACpE;QACF,EAAE,OAAOW,KAAK;QACZ,WAAW;QACb;IACF;IAEA,OAAOnB;AACT,EAAC"}

package/dist/queries/buildQuery.d.ts

@@ -1,6 +1,6 @@
 import type { asc, desc, SQL } from 'drizzle-orm';
 import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
-import type { Field, Where } from 'payload';
+import type { Field, Sort, Where } from 'payload';
 import type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js';
 export type BuildQueryJoinAliases = {
     condition: SQL;
@@ -12,7 +12,7 @@ type BuildQueryArgs = {
     fields: Field[];
     joins?: BuildQueryJoinAliases;
     locale?: string;
-    sort?: string;
+    sort?: Sort;
     tableName: string;
     where: Where;
 };
@@ -21,7 +21,7 @@ export type BuildQueryResult = {
     orderBy: {
         column: GenericColumn;
         order: typeof asc | typeof desc;
-    };
+    }[];
     selectFields: Record<string, GenericColumn>;
     where: SQL;
 };

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,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAK9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,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,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,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,CAAA;IACD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AACD,QAAA,MAAM,UAAU,+EAQb,cAAc,KAAG,gBAmCnB,CAAA;AAED,eAAe,UAAU,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,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAK9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,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,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,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;AACD,QAAA,MAAM,UAAU,+EAQb,cAAc,KAAG,gBAmCnB,CAAA;AAED,eAAe,UAAU,CAAA"}

package/dist/queries/buildQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  table: GenericTable | PgTableWithColumns<any>\n  type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  joins?: BuildQueryJoinAliases\n  locale?: string\n  sort?: string\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}\nconst buildQuery = function buildQuery({\n  adapter,\n  fields,\n  joins = [],\n  locale,\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  const orderBy = buildOrderBy({\n    adapter,\n    fields,\n    joins,\n    locale,\n    selectFields,\n    sort,\n    tableName,\n  })\n\n  let where: SQL\n\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = parseParams({\n      adapter,\n      fields,\n      joins,\n      locale,\n      selectFields,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  return {\n    joins,\n    orderBy,\n    selectFields,\n    where,\n  }\n}\n\nexport default buildQuery\n"],"names":["buildOrderBy","parseParams","buildQuery","adapter","fields","joins","locale","sort","tableName","where","incomingWhere","selectFields","id","tables","orderBy","Object","keys","length"],"mappings":"AAMA,SAASA,YAAY,QAAQ,oBAAmB;AAChD,SAASC,WAAW,QAAQ,mBAAkB;AA2B9C,MAAMC,aAAa,SAASA,WAAW,EACrCC,OAAO,EACPC,MAAM,EACNC,QAAQ,EAAE,EACVC,MAAM,EACNC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAIT,QAAQU,MAAM,CAACL,UAAU,CAACI,EAAE;IAClC;IAEA,MAAME,UAAUd,aAAa;QAC3BG;QACAC;QACAC;QACAC;QACAK;QACAJ;QACAC;IACF;IAEA,IAAIC;IAEJ,IAAIC,iBAAiBK,OAAOC,IAAI,CAACN,eAAeO,MAAM,GAAG,GAAG;QAC1DR,QAAQR,YAAY;YAClBE;YACAC;YACAC;YACAC;YACAK;YACAH;YACAC,OAAOC;QACT;IACF;IAEA,OAAO;QACLL;QACAS;QACAH;QACAF;IACF;AACF;AAEA,eAAeP,WAAU"}
+{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, Sort, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  table: GenericTable | PgTableWithColumns<any>\n  type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  joins?: BuildQueryJoinAliases\n  locale?: string\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}\nconst buildQuery = function buildQuery({\n  adapter,\n  fields,\n  joins = [],\n  locale,\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  const orderBy = buildOrderBy({\n    adapter,\n    fields,\n    joins,\n    locale,\n    selectFields,\n    sort,\n    tableName,\n  })\n\n  let where: SQL\n\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = parseParams({\n      adapter,\n      fields,\n      joins,\n      locale,\n      selectFields,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  return {\n    joins,\n    orderBy,\n    selectFields,\n    where,\n  }\n}\n\nexport default buildQuery\n"],"names":["buildOrderBy","parseParams","buildQuery","adapter","fields","joins","locale","sort","tableName","where","incomingWhere","selectFields","id","tables","orderBy","Object","keys","length"],"mappings":"AAMA,SAASA,YAAY,QAAQ,oBAAmB;AAChD,SAASC,WAAW,QAAQ,mBAAkB;AA2B9C,MAAMC,aAAa,SAASA,WAAW,EACrCC,OAAO,EACPC,MAAM,EACNC,QAAQ,EAAE,EACVC,MAAM,EACNC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAIT,QAAQU,MAAM,CAACL,UAAU,CAACI,EAAE;IAClC;IAEA,MAAME,UAAUd,aAAa;QAC3BG;QACAC;QACAC;QACAC;QACAK;QACAJ;QACAC;IACF;IAEA,IAAIC;IAEJ,IAAIC,iBAAiBK,OAAOC,IAAI,CAACN,eAAeO,MAAM,GAAG,GAAG;QAC1DR,QAAQR,YAAY;YAClBE;YACAC;YACAC;YACAC;YACAK;YACAH;YACAC,OAAOC;QACT;IACF;IAEA,OAAO;QACLL;QACAS;QACAH;QACAF;IACF;AACF;AAEA,eAAeP,WAAU"}

package/dist/queries/getTableColumnFromPath.d.ts

@@ -40,7 +40,6 @@ type Args = {
      * If creating a new table name for arrays and blocks, this suffix should be appended to the table name
      */
     tableNameSuffix?: string;
-    useAlias?: boolean;
     /**
      * The raw value of the query before sanitization
      */
@@ -51,6 +50,6 @@ type Args = {
  * Adds tables to `join`
  * @returns TableColumn
  */
-export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix, useAlias, value, }: Args) => TableColumn;
+export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, 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,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAG5F,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;AAK5D,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,kBAAkB,CAAA;IACzB,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,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,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AACD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,wRAiBhC,IAAI,KAAG,WA+pBT,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,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAG5F,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;AAM5D,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,kBAAkB,CAAA;IACzB,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,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,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AACD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,8QAgBhC,IAAI,KAAG,WAopBT,CAAA"}

package/dist/queries/getTableColumnFromPath.js

@@ -4,12 +4,13 @@ import { fieldAffectsData, tabHasName } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
 import { validate as uuidValidate } from 'uuid';
 import { isPolymorphicRelationship } from '../utilities/isPolymorphicRelationship.js';
+import { addJoinTable } from './addJoinTable.js';
 import { getTableAlias } from './getTableAlias.js';
 /**
  * Transforms path to table and column name or to a list of OR columns
  * Adds tables to `join`
  * @returns TableColumn
- */ export const getTableColumnFromPath = ({ adapter, aliasTable, collectionPath, columnPrefix = '', constraintPath: incomingConstraintPath, constraints = [], fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix = '', useAlias, value })=>{
+ */ export const getTableColumnFromPath = ({ adapter, aliasTable, collectionPath, columnPrefix = '', constraintPath: incomingConstraintPath, constraints = [], fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix = '', value })=>{
     const fieldPath = incomingSegments[0];
     let locale = incomingLocale;
     const rootTableName = incomingRootTableName || tableName;
@@ -62,7 +63,6 @@ import { getTableAlias } from './getTableAlias.js';
                         selectFields,
                         tableName: newTableName,
                         tableNameSuffix,
-                        useAlias,
                         value
                     });
                 }
@@ -84,7 +84,6 @@ import { getTableAlias } from './getTableAlias.js';
                             selectFields,
                             tableName: newTableName,
                             tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,
-                            useAlias,
                             value
                         });
                     }
@@ -103,7 +102,6 @@ import { getTableAlias } from './getTableAlias.js';
                         selectFields,
                         tableName: newTableName,
                         tableNameSuffix,
-                        useAlias,
                         value
                     });
                 }
@@ -111,17 +109,15 @@ import { getTableAlias } from './getTableAlias.js';
                 {
                     if (locale && field.localized && adapter.payload.config.localization) {
                         newTableName = `${tableName}${adapter.localesSuffix}`;
-                        joins.push({
-                            condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),
-                            table: adapter.tables[newTableName]
-                        });
+                        let condition = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
                         if (locale !== 'all') {
-                            constraints.push({
-                                columnName: '_locale',
-                                table: adapter.tables[newTableName],
-                                value: locale
-                            });
+                            condition = and(condition, eq(adapter.tables[newTableName]._locale, locale));
                         }
+                        addJoinTable({
+                            condition,
+                            joins,
+                            table: adapter.tables[newTableName]
+                        });
                     }
                     return getTableColumnFromPath({
                         adapter,
@@ -138,7 +134,6 @@ import { getTableAlias } from './getTableAlias.js';
                         selectFields,
                         tableName: newTableName,
                         tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,
-                        useAlias,
                         value
                     });
                 }
@@ -147,20 +142,22 @@ import { getTableAlias } from './getTableAlias.js';
                     if (field.hasMany) {
                         const newTableName = adapter.tableNameMap.get(`${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`);
                         if (locale && field.localized && adapter.payload.config.localization) {
-                            joins.push({
-                                condition: and(eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent), eq(adapter.tables[newTableName]._locale, locale)),
-                                table: adapter.tables[newTableName]
-                            });
+                            const conditions = [
+                                eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
+                                eq(adapter.tables[newTableName]._locale, locale)
+                            ];
                             if (locale !== 'all') {
-                                constraints.push({
-                                    columnName: '_locale',
-                                    table: adapter.tables[newTableName],
-                                    value: locale
-                                });
+                                conditions.push(eq(adapter.tables[newTableName]._locale, locale));
                             }
+                            addJoinTable({
+                                condition: and(...conditions),
+                                joins,
+                                table: adapter.tables[newTableName]
+                            });
                         } else {
-                            joins.push({
+                            addJoinTable({
                                 condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
+                                joins,
                                 table: adapter.tables[newTableName]
                             });
                         }
@@ -189,20 +186,21 @@ import { getTableAlias } from './getTableAlias.js';
                             like(adapter.tables[newTableName].path, `${constraintPath}${field.name}`)
                         ];
                         if (locale && field.localized && adapter.payload.config.localization) {
-                            joins.push({
-                                condition: and(...joinConstraints, eq(adapter.tables[newTableName]._locale, locale)),
-                                table: adapter.tables[newTableName]
-                            });
+                            const conditions = [
+                                ...joinConstraints
+                            ];
                             if (locale !== 'all') {
-                                constraints.push({
-                                    columnName: 'locale',
-                                    table: adapter.tables[newTableName],
-                                    value: locale
-                                });
+                                conditions.push(eq(adapter.tables[newTableName]._locale, locale));
                             }
+                            addJoinTable({
+                                condition: and(...conditions),
+                                joins,
+                                table: adapter.tables[newTableName]
+                            });
                         } else {
-                            joins.push({
+                            addJoinTable({
                                 condition: and(...joinConstraints),
+                                joins,
                                 table: adapter.tables[newTableName]
                             });
                         }
@@ -221,20 +219,21 @@ import { getTableAlias } from './getTableAlias.js';
                     const arrayParentTable = aliasTable || adapter.tables[tableName];
                     constraintPath = `${constraintPath}${field.name}.%.`;
                     if (locale && field.localized && adapter.payload.config.localization) {
-                        joins.push({
-                            condition: and(eq(arrayParentTable.id, adapter.tables[newTableName]._parentID), eq(adapter.tables[newTableName]._locale, locale)),
-                            table: adapter.tables[newTableName]
-                        });
+                        const conditions = [
+                            eq(arrayParentTable.id, adapter.tables[newTableName]._parentID)
+                        ];
                         if (locale !== 'all') {
-                            constraints.push({
-                                columnName: '_locale',
-                                table: adapter.tables[newTableName],
-                                value: locale
-                            });
+                            conditions.push(eq(adapter.tables[newTableName]._locale, locale));
                         }
+                        addJoinTable({
+                            condition: and(...conditions),
+                            joins,
+                            table: adapter.tables[newTableName]
+                        });
                     } else {
-                        joins.push({
+                        addJoinTable({
                             condition: eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),
+                            joins,
                             table: adapter.tables[newTableName]
                         });
                     }
@@ -250,7 +249,6 @@ import { getTableAlias } from './getTableAlias.js';
                         rootTableName,
                         selectFields,
                         tableName: newTableName,
-                        useAlias,
                         value
                     });
                 }
@@ -307,7 +305,6 @@ import { getTableAlias } from './getTableAlias.js';
                                 rootTableName,
                                 selectFields: blockSelectFields,
                                 tableName: newTableName,
-                                useAlias,
                                 value
                             });
                         } catch (error) {
@@ -323,17 +320,16 @@ import { getTableAlias } from './getTableAlias.js';
                             ...blockSelectFields
                         };
                         if (field.localized && adapter.payload.config.localization) {
+                            const conditions = [
+                                eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID)
+                            ];
+                            if (locale !== 'all') {
+                                conditions.push(eq(adapter.tables[newTableName]._locale, locale));
+                            }
                             joins.push({
-                                condition: and(eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID), eq(adapter.tables[newTableName]._locale, locale)),
+                                condition: and(...conditions),
                                 table: adapter.tables[newTableName]
                             });
-                            if (locale) {
-                                constraints.push({
-                                    columnName: '_locale',
-                                    table: adapter.tables[newTableName],
-                                    value: locale
-                                });
-                            }
                         } else {
                             joins.push({
                                 condition: eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID),
@@ -367,17 +363,17 @@ import { getTableAlias } from './getTableAlias.js';
                         });
                         // Join in the relationships table
                         if (locale && field.localized && adapter.payload.config.localization) {
+                            const conditions = [
+                                eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),
+                                like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)
+                            ];
+                            if (locale !== 'all') {
+                                conditions.push(eq(aliasRelationshipTable.locale, locale));
+                            }
                             joins.push({
-                                condition: and(eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent), eq(aliasRelationshipTable.locale, locale), like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)),
+                                condition: and(...conditions),
                                 table: aliasRelationshipTable
                             });
-                            if (locale !== 'all') {
-                                constraints.push({
-                                    columnName: 'locale',
-                                    table: aliasRelationshipTable,
-                                    value: locale
-                                });
-                            }
                         } else {
                             // Join in the relationships table
                             joins.push({
@@ -488,7 +484,6 @@ import { getTableAlias } from './getTableAlias.js';
                             rootTableName: newTableName,
                             selectFields,
                             tableName: newTableName,
-                            useAlias,
                             value
                         });
                     } else if (pathSegments.length > 1 && !(pathSegments.length === 2 && pathSegments[1] === 'id')) {
@@ -504,12 +499,20 @@ import { getTableAlias } from './getTableAlias.js';
                                 adapter,
                                 tableName: `${rootTableName}${adapter.localesSuffix}`
                             });
-                            joins.push({
-                                condition: and(eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id), eq(aliasLocaleTable._locale, locale)),
-                                table: aliasLocaleTable
+                            const condtions = [
+                                eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id)
+                            ];
+                            if (locale !== 'all') {
+                                condtions.push(eq(aliasLocaleTable._locale, locale));
+                            }
+                            const localesTable = adapter.tables[`${rootTableName}${adapter.localesSuffix}`];
+                            addJoinTable({
+                                condition: and(...condtions),
+                                joins,
+                                table: localesTable
                             });
                             joins.push({
-                                condition: eq(aliasLocaleTable[columnName], newAliasTable.id),
+                                condition: eq(localesTable[columnName], newAliasTable.id),
                                 table: newAliasTable
                             });
                         } else {
@@ -530,7 +533,6 @@ import { getTableAlias } from './getTableAlias.js';
                             pathSegments: pathSegments.slice(1),
                             selectFields,
                             tableName: newTableName,
-                            useAlias,
                             value
                         });
                     }
@@ -548,22 +550,17 @@ import { getTableAlias } from './getTableAlias.js';
                 // so it is not picked up below to be used as targetTable
                 const parentTable = aliasTable || adapter.tables[tableName];
                 newTableName = `${tableName}${adapter.localesSuffix}`;
-                newTable = useAlias ? getTableAlias({
-                    adapter,
-                    tableName: newTableName
-                }).newAliasTable : adapter.tables[newTableName];
-                joins.push({
-                    condition: eq(parentTable.id, newTable._parentID),
+                newTable = adapter.tables[newTableName];
+                let condition = eq(parentTable.id, newTable._parentID);
+                if (locale !== 'all') {
+                    condition = and(condition, eq(newTable._locale, locale));
+                }
+                addJoinTable({
+                    condition,
+                    joins,
                     table: newTable
                 });
                 aliasTable = undefined;
-                if (locale !== 'all') {
-                    constraints.push({
-                        columnName: '_locale',
-                        table: newTable,
-                        value: locale
-                    });
-                }
             }
             const targetTable = aliasTable || newTable;
             selectFields[`${newTableName}.${columnPrefix}${field.name}`] = targetTable[`${columnPrefix}${field.name}`];