@payloadcms/drizzle 3.0.0-canary.b922438 → 3.0.0-canary.bb00d64

package/dist/queries/buildQuery.js

@@ -1,56 +1,21 @@
-import { asc, desc } from 'drizzle-orm';
-import { getTableColumnFromPath } from './getTableColumnFromPath.js';
+import { buildOrderBy } from './buildOrderBy.js';
 import { parseParams } from './parseParams.js';
-const buildQuery = async function buildQuery({ adapter, fields, locale, sort, tableName, where: incomingWhere }) {
+const buildQuery = function buildQuery({ adapter, fields, joins = [], locale, sort, tableName, where: incomingWhere }) {
     const selectFields = {
         id: adapter.tables[tableName].id
     };
-    const joins = [];
-    const orderBy = {
-        column: null,
-        order: null
-    };
-    if (sort) {
-        let sortPath;
-        if (sort[0] === '-') {
-            sortPath = sort.substring(1);
-            orderBy.order = desc;
-        } else {
-            sortPath = sort;
-            orderBy.order = asc;
-        }
-        try {
-            const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({
-                adapter,
-                collectionPath: sortPath,
-                fields,
-                joins,
-                locale,
-                pathSegments: sortPath.replace(/__/g, '.').split('.'),
-                selectFields,
-                tableName,
-                value: sortPath
-            });
-            orderBy.column = 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;
-    }
+    const orderBy = buildOrderBy({
+        adapter,
+        fields,
+        joins,
+        locale,
+        selectFields,
+        sort,
+        tableName
+    });
     let where;
     if (incomingWhere && Object.keys(incomingWhere).length > 0) {
-        where = await parseParams({
+        where = parseParams({
             adapter,
             fields,
             joins,

package/dist/queries/buildQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, Where } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\n\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  table: GenericTable | PgTableWithColumns<any>\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  locale?: string\n  sort?: string\n  tableName: string\n  where: Where\n}\n\ntype Result = {\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 = async function buildQuery({\n  adapter,\n  fields,\n  locale,\n  sort,\n  tableName,\n  where: incomingWhere,\n}: BuildQueryArgs): Promise<Result> {\n  const selectFields: Record<string, GenericColumn> = {\n    id: adapter.tables[tableName].id,\n  }\n  const joins: BuildQueryJoinAliases = []\n\n  const orderBy: Result['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        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  let where: SQL\n\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = await 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":["asc","desc","getTableColumnFromPath","parseParams","buildQuery","adapter","fields","locale","sort","tableName","where","incomingWhere","selectFields","id","tables","joins","orderBy","column","order","sortPath","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","replace","split","value","err","createdAt","Object","keys","length"],"mappings":"AAIA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAIvC,SAASC,sBAAsB,QAAQ,8BAA6B;AACpE,SAASC,WAAW,QAAQ,mBAAkB;AAyB9C,MAAMC,aAAa,eAAeA,WAAW,EAC3CC,OAAO,EACPC,MAAM,EACNC,MAAM,EACNC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAIR,QAAQS,MAAM,CAACL,UAAU,CAACI,EAAE;IAClC;IACA,MAAME,QAA+B,EAAE;IAEvC,MAAMC,UAA6B;QACjCC,QAAQ;QACRC,OAAO;IACT;IAEA,IAAIV,MAAM;QACR,IAAIW;QAEJ,IAAIX,IAAI,CAAC,EAAE,KAAK,KAAK;YACnBW,WAAWX,KAAKY,SAAS,CAAC;YAC1BJ,QAAQE,KAAK,GAAGjB;QAClB,OAAO;YACLkB,WAAWX;YACXQ,QAAQE,KAAK,GAAGlB;QAClB;QAEA,IAAI;YACF,MAAM,EAAEqB,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAGtB,uBAAuB;gBACnFG;gBACAoB,gBAAgBN;gBAChBb;gBACAS;gBACAR;gBACAmB,cAAcP,SAASQ,OAAO,CAAC,OAAO,KAAKC,KAAK,CAAC;gBACjDhB;gBACAH;gBACAoB,OAAOV;YACT;YACAH,QAAQC,MAAM,GAAGO,WAAW,CAACF,oBAAoB;QACnD,EAAE,OAAOQ,KAAK;QACZ,WAAW;QACb;IACF;IAEA,IAAI,CAACd,SAASC,QAAQ;QACpBD,QAAQE,KAAK,GAAGjB;QAChB,MAAM8B,YAAY1B,QAAQS,MAAM,CAACL,UAAU,EAAEsB;QAE7C,IAAIA,WAAW;YACbf,QAAQC,MAAM,GAAGc;QACnB,OAAO;YACLf,QAAQC,MAAM,GAAGZ,QAAQS,MAAM,CAACL,UAAU,CAACI,EAAE;QAC/C;IACF;IAEA,IAAIG,QAAQC,MAAM,EAAE;QAClBL,aAAaJ,IAAI,GAAGQ,QAAQC,MAAM;IACpC;IAEA,IAAIP;IAEJ,IAAIC,iBAAiBqB,OAAOC,IAAI,CAACtB,eAAeuB,MAAM,GAAG,GAAG;QAC1DxB,QAAQ,MAAMP,YAAY;YACxBE;YACAC;YACAS;YACAR;YACAK;YACAH;YACAC,OAAOC;QACT;IACF;IAEA,OAAO;QACLI;QACAC;QACAJ;QACAF;IACF;AACF;AAEA,eAAeN,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

@@ -1,7 +1,7 @@
 import type { SQL } from 'drizzle-orm';
-import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
 import type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
 import type { Field, FieldAffectingData, TabAsField } from 'payload';
+import { type PgTableWithColumns } from 'drizzle-orm/pg-core';
 import type { DrizzleAdapter, GenericColumn } from '../types.js';
 import type { BuildQueryJoinAliases } from './buildQuery.js';
 type Constraint = {
@@ -11,6 +11,10 @@ type Constraint = {
 };
 type TableColumn = {
     columnName?: string;
+    columns?: {
+        idType: 'number' | 'text' | 'uuid';
+        rawColumn: SQL<unknown>;
+    }[];
     constraints: Constraint[];
     field: FieldAffectingData;
     getNotNullColumnByValue?: (val: unknown) => string;
@@ -42,7 +46,7 @@ type Args = {
     value: unknown;
 };
 /**
- * Transforms path to table and column name
+ * Transforms path to table and column name or to a list of OR columns
  * Adds tables to `join`
  * @returns TableColumn
  */

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,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAO5F,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAI5D,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,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,WA8kBT,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

@@ -2,9 +2,12 @@ import { and, eq, like, sql } from 'drizzle-orm';
 import { APIError, flattenTopLevelFields } from 'payload';
 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
+ * 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 = '', value })=>{
@@ -106,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,
@@ -141,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]
                             });
                         }
@@ -177,26 +180,27 @@ import { getTableAlias } from './getTableAlias.js';
                             tableType = 'numbers';
                             columnName = 'number';
                         }
-                        newTableName = `${tableName}_${tableType}`;
+                        newTableName = `${rootTableName}_${tableType}`;
                         const joinConstraints = [
-                            eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
-                            eq(adapter.tables[newTableName].path, `${constraintPath}${field.name}`)
+                            eq(adapter.tables[rootTableName].id, adapter.tables[newTableName].parent),
+                            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]
                             });
                         }
@@ -212,22 +216,24 @@ import { getTableAlias } from './getTableAlias.js';
             case 'array':
                 {
                     newTableName = adapter.tableNameMap.get(`${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`);
+                    const arrayParentTable = aliasTable || adapter.tables[tableName];
                     constraintPath = `${constraintPath}${field.name}.%.`;
                     if (locale && field.localized && adapter.payload.config.localization) {
-                        joins.push({
-                            condition: and(eq(adapter.tables[tableName].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({
-                            condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),
+                        addJoinTable({
+                            condition: eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),
+                            joins,
                             table: adapter.tables[newTableName]
                         });
                     }
@@ -314,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),
@@ -349,7 +354,7 @@ import { getTableAlias } from './getTableAlias.js';
             case 'upload':
                 {
                     const newCollectionPath = pathSegments.slice(1).join('.');
-                    if (Array.isArray(field.relationTo) || field.type === 'relationship' && field.hasMany) {
+                    if (Array.isArray(field.relationTo) || field.hasMany) {
                         let relationshipFields;
                         const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`;
                         const { newAliasTable: aliasRelationshipTable, newAliasTableName: aliasRelationshipTableName } = getTableAlias({
@@ -358,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({
@@ -400,20 +405,43 @@ import { getTableAlias } from './getTableAlias.js';
                                 };
                             }
                         } else if (newCollectionPath === 'value') {
-                            const tableColumnsNames = field.relationTo.map((relationTo)=>{
+                            const hasCustomCollectionWithCustomID = field.relationTo.some((relationTo)=>!!adapter.payload.collections[relationTo].customIDType);
+                            const columns = field.relationTo.map((relationTo)=>{
+                                let idType = adapter.idType === 'uuid' ? 'uuid' : 'number';
+                                const { customIDType } = adapter.payload.collections[relationTo];
+                                if (customIDType) {
+                                    idType = customIDType;
+                                }
+                                const idTypeTextOrUuid = idType === 'text' || idType === 'uuid';
+                                // Do not add the column to OR if we know that it can't match by the type
+                                // We can't do the same with idType: 'number' because `value` can be from the REST search query params
+                                if (typeof value === 'number' && idTypeTextOrUuid) {
+                                    return null;
+                                }
+                                if (Array.isArray(value) && value.every((val)=>typeof val === 'number') && idTypeTextOrUuid) {
+                                    return null;
+                                }
+                                // Do not add the UUID type column if incoming query value doesn't match UUID. If there aren't any collections with
+                                // a custom ID type, we skip this check
+                                // We need this because Postgres throws an error if querying by UUID column with a value that isn't a valid UUID.
+                                if (value && !Array.isArray(value) && idType === 'uuid' && hasCustomCollectionWithCustomID) {
+                                    if (!uuidValidate(value)) {
+                                        return null;
+                                    }
+                                }
+                                if (Array.isArray(value) && idType === 'uuid' && hasCustomCollectionWithCustomID && !value.some((val)=>uuidValidate(val))) {
+                                    return null;
+                                }
                                 const relationTableName = adapter.tableNameMap.get(toSnakeCase(adapter.payload.collections[relationTo].config.slug));
-                                return `"${aliasRelationshipTableName}"."${relationTableName}_id"`;
-                            });
-                            let column;
-                            if (tableColumnsNames.length === 1) {
-                                column = tableColumnsNames[0];
-                            } else {
-                                column = `COALESCE(${tableColumnsNames.join(', ')})`;
-                            }
+                                return {
+                                    idType,
+                                    rawColumn: sql.raw(`"${aliasRelationshipTableName}"."${relationTableName}_id"`)
+                                };
+                            }).filter(Boolean);
                             return {
+                                columns,
                                 constraints,
                                 field,
-                                rawColumn: sql.raw(`${column}`),
                                 table: aliasRelationshipTable
                             };
                         } else if (newCollectionPath === 'relationTo') {
@@ -425,11 +453,22 @@ import { getTableAlias } from './getTableAlias.js';
                                 field,
                                 getNotNullColumnByValue: (val)=>{
                                     const matchedRelation = relationTo.find((relation)=>relation === val);
-                                    if (matchedRelation) return `${matchedRelation}ID`;
+                                    if (matchedRelation) {
+                                        return `${matchedRelation}ID`;
+                                    }
                                     return undefined;
                                 },
                                 table: aliasRelationshipTable
                             };
+                        } else if (isPolymorphicRelationship(value)) {
+                            const { relationTo } = value;
+                            const relationTableName = adapter.tableNameMap.get(toSnakeCase(adapter.payload.collections[relationTo].config.slug));
+                            return {
+                                constraints,
+                                field,
+                                rawColumn: sql.raw(`"${aliasRelationshipTableName}"."${relationTableName}_id"`),
+                                table: aliasRelationshipTable
+                            };
                         } else {
                             throw new APIError('Not supported');
                         }
@@ -460,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 {
@@ -497,25 +544,25 @@ import { getTableAlias } from './getTableAlias.js';
                 }
         }
         if (fieldAffectsData(field)) {
+            let newTable = adapter.tables[newTableName];
             if (field.localized && adapter.payload.config.localization) {
                 // If localized, we go to localized table and set aliasTable to undefined
                 // so it is not picked up below to be used as targetTable
                 const parentTable = aliasTable || adapter.tables[tableName];
                 newTableName = `${tableName}${adapter.localesSuffix}`;
-                joins.push({
-                    condition: eq(parentTable.id, adapter.tables[newTableName]._parentID),
-                    table: adapter.tables[newTableName]
-                });
-                aliasTable = undefined;
+                newTable = adapter.tables[newTableName];
+                let condition = eq(parentTable.id, newTable._parentID);
                 if (locale !== 'all') {
-                    constraints.push({
-                        columnName: '_locale',
-                        table: adapter.tables[newTableName],
-                        value: locale
-                    });
+                    condition = and(condition, eq(newTable._locale, locale));
                 }
+                addJoinTable({
+                    condition,
+                    joins,
+                    table: newTable
+                });
+                aliasTable = undefined;
             }
-            const targetTable = aliasTable || adapter.tables[newTableName];
+            const targetTable = aliasTable || newTable;
             selectFields[`${newTableName}.${columnPrefix}${field.name}`] = targetTable[`${columnPrefix}${field.name}`];
             return {
                 columnName: `${columnPrefix}${field.name}`,