@payloadcms/db-postgres 3.0.0-canary.6041f49 → 3.0.0-canary.6659da8

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/types'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { GenericColumn, GenericTable, PostgresAdapter } from '../types.js'\n\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoins = Record<string, SQL>\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  table: GenericTable | PgTableWithColumns<any>\n}[]\n\ntype BuildQueryArgs = {\n  adapter: PostgresAdapter\n  fields: Field[]\n  locale?: string\n  sort?: string\n  tableName: string\n  where: Where\n}\n\ntype Result = {\n  joinAliases: BuildQueryJoinAliases\n  joins: BuildQueryJoins\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: BuildQueryJoins = {}\n  const joinAliases: 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        joinAliases,\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      joinAliases,\n      joins,\n      locale,\n      selectFields,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  return {\n    joinAliases,\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","joinAliases","orderBy","column","order","sortPath","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","replace","split","value","err","createdAt","Object","keys","length"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAIvC,SAASC,sBAAsB,QAAQ,8BAA6B;AACpE,SAASC,WAAW,QAAQ,mBAAkB;AA4B9C,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,QAAyB,CAAC;IAChC,MAAMC,cAAqC,EAAE;IAE7C,MAAMC,UAA6B;QACjCC,QAAQ;QACRC,OAAO;IACT;IAEA,IAAIX,MAAM;QACR,IAAIY;QAEJ,IAAIZ,IAAI,CAAC,EAAE,KAAK,KAAK;YACnBY,WAAWZ,KAAKa,SAAS,CAAC;YAC1BJ,QAAQE,KAAK,GAAGlB;QAClB,OAAO;YACLmB,WAAWZ;YACXS,QAAQE,KAAK,GAAGnB;QAClB;QAEA,IAAI;YACF,MAAM,EAAEsB,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAGvB,uBAAuB;gBACnFG;gBACAqB,gBAAgBN;gBAChBd;gBACAU;gBACAD;gBACAR;gBACAoB,cAAcP,SAASQ,OAAO,CAAC,OAAO,KAAKC,KAAK,CAAC;gBACjDjB;gBACAH;gBACAqB,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,GAAGlB;QAChB,MAAM+B,YAAY3B,QAAQS,MAAM,CAACL,UAAU,EAAEuB;QAE7C,IAAIA,WAAW;YACbf,QAAQC,MAAM,GAAGc;QACnB,OAAO;YACLf,QAAQC,MAAM,GAAGb,QAAQS,MAAM,CAACL,UAAU,CAACI,EAAE;QAC/C;IACF;IAEA,IAAII,QAAQC,MAAM,EAAE;QAClBN,aAAaJ,IAAI,GAAGS,QAAQC,MAAM;IACpC;IAEA,IAAIR;IAEJ,IAAIC,iBAAiBsB,OAAOC,IAAI,CAACvB,eAAewB,MAAM,GAAG,GAAG;QAC1DzB,QAAQ,MAAMP,YAAY;YACxBE;YACAC;YACAU;YACAD;YACAR;YACAK;YACAH;YACAC,OAAOC;QACT;IACF;IAEA,OAAO;QACLK;QACAD;QACAE;QACAL;QACAF;IACF;AACF;AAEA,eAAeN,WAAU"}
+{"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 { GenericColumn, GenericTable, PostgresAdapter } from '../types.js'\n\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoins = Record<string, SQL>\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  table: GenericTable | PgTableWithColumns<any>\n}[]\n\ntype BuildQueryArgs = {\n  adapter: PostgresAdapter\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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAIvC,SAASC,sBAAsB,QAAQ,8BAA6B;AACpE,SAASC,WAAW,QAAQ,mBAAkB;AA2B9C,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"}

package/dist/queries/getTableColumnFromPath.d.ts

@@ -1,8 +1,8 @@
 import type { SQL } from 'drizzle-orm';
 import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
-import type { Field, FieldAffectingData, TabAsField } from 'payload/types';
+import type { Field, FieldAffectingData, TabAsField } from 'payload';
 import type { GenericColumn, GenericTable, PostgresAdapter } from '../types.js';
-import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery.js';
+import type { BuildQueryJoinAliases } from './buildQuery.js';
 type Constraint = {
     columnName: string;
     table: GenericTable | PgTableWithColumns<any>;
@@ -25,8 +25,7 @@ type Args = {
     constraintPath?: string;
     constraints?: Constraint[];
     fields: (Field | TabAsField)[];
-    joinAliases: BuildQueryJoinAliases;
-    joins: BuildQueryJoins;
+    joins: BuildQueryJoinAliases;
     locale?: string;
     pathSegments: string[];
     rootTableName?: string;
@@ -46,6 +45,6 @@ type Args = {
  * Adds tables to `join`
  * @returns TableColumn
  */
-export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joinAliases, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix, 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":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,eAAe,CAAA;AAUlG,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAE7E,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,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,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;CAC9C,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,CAAC,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IACnD,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,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,EAAE,eAAe,CAAA;IACtB,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,2RAiBhC,IAAI,KAAG,WA4fT,CAAA"}
+{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAS5F,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAE5D,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,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,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;CAC9C,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,CAAC,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IACnD,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,WAykBT,CAAA"}

package/dist/queries/getTableColumnFromPath.js

@@ -1,15 +1,14 @@
 /* eslint-disable no-param-reassign */ import { and, eq, like, sql } from 'drizzle-orm';
 import { alias } from 'drizzle-orm/pg-core';
-import { APIError } from 'payload/errors';
-import { fieldAffectsData, tabHasName } from 'payload/types';
-import { flattenTopLevelFields } from 'payload/utilities';
+import { APIError, flattenTopLevelFields } from 'payload';
+import { fieldAffectsData, tabHasName } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
 import { v4 as uuid } from 'uuid';
 /**
  * Transforms path to table and column name
  * Adds tables to `join`
  * @returns TableColumn
- */ export const getTableColumnFromPath = ({ adapter, aliasTable, collectionPath, columnPrefix = '', constraintPath: incomingConstraintPath, constraints = [], fields, joinAliases, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix = '', 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;
@@ -55,7 +54,6 @@ import { v4 as uuid } from 'uuid';
                                 ...tab,
                                 type: 'tab'
                             })),
-                        joinAliases,
                         joins,
                         locale,
                         pathSegments: pathSegments.slice(1),
@@ -77,7 +75,6 @@ import { v4 as uuid } from 'uuid';
                             constraintPath: `${constraintPath}${field.name}.`,
                             constraints,
                             fields: field.fields,
-                            joinAliases,
                             joins,
                             locale,
                             pathSegments: pathSegments.slice(1),
@@ -96,7 +93,6 @@ import { v4 as uuid } from 'uuid';
                         constraintPath,
                         constraints,
                         fields: field.fields,
-                        joinAliases,
                         joins,
                         locale,
                         pathSegments: pathSegments.slice(1),
@@ -111,7 +107,10 @@ import { v4 as uuid } from 'uuid';
                 {
                     if (locale && field.localized && adapter.payload.config.localization) {
                         newTableName = `${tableName}${adapter.localesSuffix}`;
-                        joins[tableName] = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
+                        joins.push({
+                            condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),
+                            table: adapter.tables[newTableName]
+                        });
                         if (locale !== 'all') {
                             constraints.push({
                                 columnName: '_locale',
@@ -128,7 +127,6 @@ import { v4 as uuid } from 'uuid';
                         constraintPath: `${constraintPath}${field.name}.`,
                         constraints,
                         fields: field.fields,
-                        joinAliases,
                         joins,
                         locale,
                         pathSegments: pathSegments.slice(1),
@@ -144,7 +142,10 @@ import { v4 as uuid } from 'uuid';
                     if (field.hasMany) {
                         const newTableName = adapter.tableNameMap.get(`${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`);
                         if (locale && field.localized && adapter.payload.config.localization) {
-                            joins[newTableName] = and(eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent), eq(adapter.tables[newTableName]._locale, locale));
+                            joins.push({
+                                condition: and(eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent), eq(adapter.tables[newTableName]._locale, locale)),
+                                table: adapter.tables[newTableName]
+                            });
                             if (locale !== 'all') {
                                 constraints.push({
                                     columnName: '_locale',
@@ -153,7 +154,10 @@ import { v4 as uuid } from 'uuid';
                                 });
                             }
                         } else {
-                            joins[newTableName] = eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent);
+                            joins.push({
+                                condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
+                                table: adapter.tables[newTableName]
+                            });
                         }
                         return {
                             columnName: 'value',
@@ -180,7 +184,10 @@ import { v4 as uuid } from 'uuid';
                             eq(adapter.tables[newTableName].path, `${constraintPath}${field.name}`)
                         ];
                         if (locale && field.localized && adapter.payload.config.localization) {
-                            joins[newTableName] = and(...joinConstraints, eq(adapter.tables[newTableName]._locale, locale));
+                            joins.push({
+                                condition: and(...joinConstraints, eq(adapter.tables[newTableName]._locale, locale)),
+                                table: adapter.tables[newTableName]
+                            });
                             if (locale !== 'all') {
                                 constraints.push({
                                     columnName: 'locale',
@@ -189,7 +196,10 @@ import { v4 as uuid } from 'uuid';
                                 });
                             }
                         } else {
-                            joins[newTableName] = and(...joinConstraints);
+                            joins.push({
+                                condition: and(...joinConstraints),
+                                table: adapter.tables[newTableName]
+                            });
                         }
                         return {
                             columnName,
@@ -205,7 +215,10 @@ import { v4 as uuid } from 'uuid';
                     newTableName = adapter.tableNameMap.get(`${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`);
                     constraintPath = `${constraintPath}${field.name}.%.`;
                     if (locale && field.localized && adapter.payload.config.localization) {
-                        joins[newTableName] = and(eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID), eq(adapter.tables[newTableName]._locale, locale));
+                        joins.push({
+                            condition: and(eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID), eq(adapter.tables[newTableName]._locale, locale)),
+                            table: adapter.tables[newTableName]
+                        });
                         if (locale !== 'all') {
                             constraints.push({
                                 columnName: '_locale',
@@ -214,7 +227,10 @@ import { v4 as uuid } from 'uuid';
                             });
                         }
                     } else {
-                        joins[newTableName] = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
+                        joins.push({
+                            condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),
+                            table: adapter.tables[newTableName]
+                        });
                     }
                     return getTableColumnFromPath({
                         adapter,
@@ -222,7 +238,6 @@ import { v4 as uuid } from 'uuid';
                         constraintPath,
                         constraints,
                         fields: field.fields,
-                        joinAliases,
                         joins,
                         locale,
                         pathSegments: pathSegments.slice(1),
@@ -245,10 +260,15 @@ import { v4 as uuid } from 'uuid';
                         blockTypes.forEach((blockType)=>{
                             const block = field.blocks.find((block)=>block.slug === blockType);
                             newTableName = adapter.tableNameMap.get(`${tableName}_blocks_${toSnakeCase(block.slug)}`);
-                            joins[newTableName] = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
+                            const newAliasTableName = toSnakeCase(uuid());
+                            const newAliasTable = alias(adapter.tables[newTableName], newAliasTableName);
+                            joins.push({
+                                condition: eq(adapter.tables[tableName].id, newAliasTable._parentID),
+                                table: newAliasTable
+                            });
                             constraints.push({
                                 columnName: '_path',
-                                table: adapter.tables[newTableName],
+                                table: newAliasTable,
                                 value: pathSegments[0]
                             });
                         });
@@ -272,7 +292,6 @@ import { v4 as uuid } from 'uuid';
                                 constraintPath,
                                 constraints: blockConstraints,
                                 fields: block.fields,
-                                joinAliases,
                                 joins,
                                 locale,
                                 pathSegments: pathSegments.slice(1),
@@ -294,7 +313,10 @@ import { v4 as uuid } from 'uuid';
                             ...blockSelectFields
                         };
                         if (field.localized && adapter.payload.config.localization) {
-                            joins[newTableName] = and(eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID), 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)),
+                                table: adapter.tables[newTableName]
+                            });
                             if (locale) {
                                 constraints.push({
                                     columnName: '_locale',
@@ -303,7 +325,10 @@ import { v4 as uuid } from 'uuid';
                                 });
                             }
                         } else {
-                            joins[newTableName] = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
+                            joins.push({
+                                condition: eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID),
+                                table: adapter.tables[newTableName]
+                            });
                         }
                         return true;
                     });
@@ -322,103 +347,149 @@ import { v4 as uuid } from 'uuid';
             case 'relationship':
             case 'upload':
                 {
-                    let relationshipFields;
-                    const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`;
                     const newCollectionPath = pathSegments.slice(1).join('.');
-                    const aliasRelationshipTableName = uuid();
-                    const aliasRelationshipTable = alias(adapter.tables[relationTableName], aliasRelationshipTableName);
-                    // Join in the relationships table
-                    if (locale && field.localized && adapter.payload.config.localization) {
-                        joinAliases.push({
-                            condition: and(eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent), eq(aliasRelationshipTable.locale, locale), like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)),
-                            table: aliasRelationshipTable
-                        });
-                        if (locale !== 'all') {
-                            constraints.push({
-                                columnName: 'locale',
-                                table: aliasRelationshipTable,
-                                value: locale
+                    if (Array.isArray(field.relationTo) || field.type === 'relationship' && field.hasMany) {
+                        let relationshipFields;
+                        const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`;
+                        const aliasRelationshipTableName = uuid();
+                        const aliasRelationshipTable = alias(adapter.tables[relationTableName], aliasRelationshipTableName);
+                        // Join in the relationships table
+                        if (locale && field.localized && adapter.payload.config.localization) {
+                            joins.push({
+                                condition: and(eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent), eq(aliasRelationshipTable.locale, locale), like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)),
+                                table: aliasRelationshipTable
+                            });
+                            if (locale !== 'all') {
+                                constraints.push({
+                                    columnName: 'locale',
+                                    table: aliasRelationshipTable,
+                                    value: locale
+                                });
+                            }
+                        } else {
+                            // Join in the relationships table
+                            joins.push({
+                                condition: and(eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent), like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)),
+                                table: aliasRelationshipTable
                             });
                         }
-                    } else {
-                        // Join in the relationships table
-                        joinAliases.push({
-                            condition: and(eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent), like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)),
-                            table: aliasRelationshipTable
-                        });
-                    }
-                    selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path;
-                    let newAliasTable;
-                    if (typeof field.relationTo === 'string') {
-                        const relationshipConfig = adapter.payload.collections[field.relationTo].config;
-                        newTableName = adapter.tableNameMap.get(toSnakeCase(relationshipConfig.slug));
-                        // parent to relationship join table
-                        relationshipFields = relationshipConfig.fields;
-                        newAliasTable = alias(adapter.tables[newTableName], toSnakeCase(uuid()));
-                        joinAliases.push({
-                            condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),
-                            table: newAliasTable
-                        });
-                        if (newCollectionPath === '' || newCollectionPath === 'id') {
+                        selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path;
+                        let newAliasTable;
+                        if (typeof field.relationTo === 'string') {
+                            const relationshipConfig = adapter.payload.collections[field.relationTo].config;
+                            newTableName = adapter.tableNameMap.get(toSnakeCase(relationshipConfig.slug));
+                            // parent to relationship join table
+                            relationshipFields = relationshipConfig.fields;
+                            newAliasTable = alias(adapter.tables[newTableName], toSnakeCase(uuid()));
+                            joins.push({
+                                condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),
+                                table: newAliasTable
+                            });
+                            if (newCollectionPath === '' || newCollectionPath === 'id') {
+                                return {
+                                    columnName: `${field.relationTo}ID`,
+                                    constraints,
+                                    field,
+                                    table: aliasRelationshipTable
+                                };
+                            }
+                        } else if (newCollectionPath === 'value') {
+                            const tableColumnsNames = field.relationTo.map((relationTo)=>{
+                                const relationTableName = adapter.tableNameMap.get(toSnakeCase(adapter.payload.collections[relationTo].config.slug));
+                                return `"${aliasRelationshipTableName}"."${relationTableName}_id"`;
+                            });
                             return {
-                                columnName: `${field.relationTo}ID`,
                                 constraints,
                                 field,
+                                rawColumn: sql.raw(`COALESCE(${tableColumnsNames.join(', ')})`),
                                 table: aliasRelationshipTable
                             };
+                        } else if (newCollectionPath === 'relationTo') {
+                            const relationTo = Array.isArray(field.relationTo) ? field.relationTo : [
+                                field.relationTo
+                            ];
+                            return {
+                                constraints,
+                                field,
+                                getNotNullColumnByValue: (val)=>{
+                                    const matchedRelation = relationTo.find((relation)=>relation === val);
+                                    if (matchedRelation) return `${matchedRelation}ID`;
+                                    return undefined;
+                                },
+                                table: aliasRelationshipTable
+                            };
+                        } else {
+                            throw new APIError('Not supported');
                         }
-                    } else if (newCollectionPath === 'value') {
-                        const tableColumnsNames = field.relationTo.map((relationTo)=>{
-                            const relationTableName = adapter.tableNameMap.get(toSnakeCase(adapter.payload.collections[relationTo].config.slug));
-                            return `"${aliasRelationshipTableName}"."${relationTableName}_id"`;
-                        });
-                        return {
+                        return getTableColumnFromPath({
+                            adapter,
+                            aliasTable: newAliasTable,
+                            collectionPath: newCollectionPath,
                             constraints,
-                            field,
-                            rawColumn: sql.raw(`COALESCE(${tableColumnsNames.join(', ')})`),
-                            table: aliasRelationshipTable
-                        };
-                    } else if (newCollectionPath === 'relationTo') {
-                        const relationTo = Array.isArray(field.relationTo) ? field.relationTo : [
-                            field.relationTo
-                        ];
-                        return {
+                            fields: relationshipFields,
+                            joins,
+                            locale,
+                            pathSegments: pathSegments.slice(1),
+                            rootTableName: newTableName,
+                            selectFields,
+                            tableName: newTableName,
+                            value
+                        });
+                    } else if (pathSegments.length > 1 && !(pathSegments.length === 2 && pathSegments[1] === 'id')) {
+                        // simple relationships
+                        const columnName = `${columnPrefix}${field.name}`;
+                        const newTableName = adapter.tableNameMap.get(toSnakeCase(adapter.payload.collections[field.relationTo].config.slug));
+                        const aliasTableName = uuid();
+                        const newAliasTable = alias(adapter.tables[newTableName], aliasTableName);
+                        if (field.localized && adapter.payload.config.localization) {
+                            const aliasLocaleTableName = uuid();
+                            const aliasLocaleTable = alias(adapter.tables[`${rootTableName}${adapter.localesSuffix}`], aliasLocaleTableName);
+                            joins.push({
+                                condition: and(eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id), eq(aliasLocaleTable._locale, locale)),
+                                table: aliasLocaleTable
+                            });
+                            joins.push({
+                                condition: eq(aliasLocaleTable[columnName], newAliasTable.id),
+                                table: newAliasTable
+                            });
+                        } else {
+                            joins.push({
+                                condition: eq(newAliasTable.id, aliasTable ? aliasTable[columnName] : adapter.tables[tableName][columnName]),
+                                table: newAliasTable
+                            });
+                        }
+                        return getTableColumnFromPath({
+                            adapter,
+                            aliasTable: newAliasTable,
+                            collectionPath: newCollectionPath,
+                            constraintPath: '',
                             constraints,
-                            field,
-                            getNotNullColumnByValue: (val)=>{
-                                const matchedRelation = relationTo.find((relation)=>relation === val);
-                                if (matchedRelation) return `${matchedRelation}ID`;
-                                return undefined;
-                            },
-                            table: aliasRelationshipTable
-                        };
-                    } else {
-                        throw new APIError('Not supported');
+                            fields: adapter.payload.collections[field.relationTo].config.fields,
+                            joins,
+                            locale,
+                            pathSegments: pathSegments.slice(1),
+                            selectFields,
+                            tableName: newTableName,
+                            value
+                        });
                     }
-                    return getTableColumnFromPath({
-                        adapter,
-                        aliasTable: newAliasTable,
-                        collectionPath: newCollectionPath,
-                        constraints,
-                        fields: relationshipFields,
-                        joinAliases,
-                        joins,
-                        locale,
-                        pathSegments: pathSegments.slice(1),
-                        rootTableName: newTableName,
-                        selectFields,
-                        tableName: newTableName,
-                        value
-                    });
+                    break;
+                }
+            default:
+                {
+                    break;
                 }
         }
         if (fieldAffectsData(field)) {
             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
-                newTableName = `${tableName}${adapter.localesSuffix}`;
                 const parentTable = aliasTable || adapter.tables[tableName];
-                joins[newTableName] = eq(parentTable.id, adapter.tables[newTableName]._parentID);
+                newTableName = `${tableName}${adapter.localesSuffix}`;
+                joins.push({
+                    condition: eq(parentTable.id, adapter.tables[newTableName]._parentID),
+                    table: adapter.tables[newTableName]
+                });
                 aliasTable = undefined;
                 if (locale !== 'all') {
                     constraints.push({