@payloadcms/drizzle 3.73.0-canary.3 → 3.73.0-canary.5

package/dist/findDistinct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findDistinct.d.ts","sourceRoot":"","sources":["../src/findDistinct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAkD,MAAM,SAAS,CAAA;AAU3F,eAAO,MAAM,YAAY,EAAE,YAuH1B,CAAA"}
+{"version":3,"file":"findDistinct.d.ts","sourceRoot":"","sources":["../src/findDistinct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAkD,MAAM,SAAS,CAAA;AA8B3F,eAAO,MAAM,YAAY,EAAE,YA6H1B,CAAA"}

package/dist/findDistinct.js

@@ -1,9 +1,22 @@
+import { max, sql } from 'drizzle-orm';
 import { getFieldByPath } from 'payload';
 import toSnakeCase from 'to-snake-case';
 import { buildQuery } from './queries/buildQuery.js';
 import { selectDistinct } from './queries/selectDistinct.js';
 import { getTransaction } from './utilities/getTransaction.js';
 import { DistinctSymbol } from './utilities/rawConstraint.js';
+const getOrderColumn = (orderBy, selectFields, joins)=>{
+    if (orderBy.length === 0) {
+        return null;
+    }
+    if (orderBy[0].column === selectFields['_selected']) {
+        return null;
+    }
+    if (joins.length > 0) {
+        return orderBy[0].column;
+    }
+    return max(orderBy[0]?.column).as('_order');
+};
 export const findDistinct = async function(args) {
     const collectionConfig = this.payload.collections[args.collection].config;
     const page = args.page || 1;
@@ -28,13 +41,19 @@ export const findDistinct = async function(args) {
     });
     orderBy.pop();
     const db = await getTransaction(this, args.req);
+    const _order = getOrderColumn(orderBy, selectFields, joins);
     const selectDistinctResult = await selectDistinct({
         adapter: this,
         db,
         forceRun: true,
+        hasAggregates: Boolean(_order) && !joins.length,
         joins,
         query: ({ query })=>{
-            query = query.orderBy(()=>orderBy.map(({ column, order })=>order(column)));
+            if (_order && orderBy.length > 0 && !joins.length) {
+                query = query.orderBy(orderBy[0].order(sql`_order`));
+            } else {
+                query = query.orderBy(()=>orderBy.map(({ column, order })=>order(column)));
+            }
             if (args.limit) {
                 if (offset) {
                     query = query.offset(offset);
@@ -45,9 +64,9 @@ export const findDistinct = async function(args) {
         },
         selectFields: {
             _selected: selectFields['_selected'],
-            ...orderBy.length && (orderBy[0].column === selectFields['_selected'] ? {} : {
-                _order: orderBy[0]?.column
-            })
+            ..._order ? {
+                _order
+            } : {}
         },
         tableName,
         where

package/dist/findDistinct.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findDistinct.ts"],"sourcesContent":["import { type FindDistinct, getFieldByPath, type SanitizedCollectionConfig } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, GenericColumn } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { DistinctSymbol } from './utilities/rawConstraint.js'\n\nexport const findDistinct: FindDistinct = async function (this: DrizzleAdapter, args) {\n  const collectionConfig: SanitizedCollectionConfig =\n    this.payload.collections[args.collection].config\n  const page = args.page || 1\n  const offset = args.limit ? (page - 1) * args.limit : undefined\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const { joins, orderBy, selectFields, where } = buildQuery({\n    adapter: this,\n    fields: collectionConfig.flattenedFields,\n    locale: args.locale,\n    sort: args.sort ?? args.field,\n    tableName,\n    where: {\n      and: [\n        args.where ?? {},\n        {\n          [args.field]: {\n            equals: DistinctSymbol,\n          },\n        },\n      ],\n    },\n  })\n\n  orderBy.pop()\n\n  const db = await getTransaction(this, args.req)\n\n  const selectDistinctResult = await selectDistinct({\n    adapter: this,\n    db,\n    forceRun: true,\n    joins,\n    query: ({ query }) => {\n      query = query.orderBy(() => orderBy.map(({ column, order }) => order(column)))\n\n      if (args.limit) {\n        if (offset) {\n          query = query.offset(offset)\n        }\n\n        query = query.limit(args.limit)\n      }\n\n      return query\n    },\n    selectFields: {\n      _selected: selectFields['_selected'],\n      ...(orderBy.length &&\n        (orderBy[0].column === selectFields['_selected'] ? {} : { _order: orderBy[0]?.column })),\n    } as Record<string, GenericColumn>,\n    tableName,\n    where,\n  })\n\n  const field = getFieldByPath({\n    config: this.payload.config,\n    fields: collectionConfig.flattenedFields,\n    includeRelationships: true,\n    path: args.field,\n  })?.field\n\n  if (field && 'relationTo' in field && Array.isArray(field.relationTo)) {\n    for (const row of selectDistinctResult as any) {\n      const json = JSON.parse(row._selected)\n      const relationTo = Object.keys(json).find((each) => Boolean(json[each]))\n      const value = json[relationTo]\n\n      if (!value) {\n        row._selected = null\n      } else {\n        row._selected = { relationTo, value }\n      }\n    }\n  }\n\n  const values = selectDistinctResult.map((each) => ({\n    [args.field]: (each as Record<string, any>)._selected,\n  }))\n\n  if (args.limit) {\n    const totalDocs = await this.countDistinct({\n      column: selectFields['_selected'],\n      db,\n      joins,\n      tableName,\n      where,\n    })\n\n    const totalPages = Math.ceil(totalDocs / args.limit)\n    const hasPrevPage = page > 1\n    const hasNextPage = totalPages > page\n    const pagingCounter = (page - 1) * args.limit + 1\n\n    return {\n      hasNextPage,\n      hasPrevPage,\n      limit: args.limit,\n      nextPage: hasNextPage ? page + 1 : null,\n      page,\n      pagingCounter,\n      prevPage: hasPrevPage ? page - 1 : null,\n      totalDocs,\n      totalPages,\n      values,\n    }\n  }\n\n  return {\n    hasNextPage: false,\n    hasPrevPage: false,\n    limit: 0,\n    page: 1,\n    pagingCounter: 1,\n    totalDocs: values.length,\n    totalPages: 1,\n    values,\n  }\n}\n"],"names":["getFieldByPath","toSnakeCase","buildQuery","selectDistinct","getTransaction","DistinctSymbol","findDistinct","args","collectionConfig","payload","collections","collection","config","page","offset","limit","undefined","tableName","tableNameMap","get","slug","joins","orderBy","selectFields","where","adapter","fields","flattenedFields","locale","sort","field","and","equals","pop","db","req","selectDistinctResult","forceRun","query","map","column","order","_selected","length","_order","includeRelationships","path","Array","isArray","relationTo","row","json","JSON","parse","Object","keys","find","each","Boolean","value","values","totalDocs","countDistinct","totalPages","Math","ceil","hasPrevPage","hasNextPage","pagingCounter","nextPage","prevPage"],"mappings":"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"}
+{"version":3,"sources":["../src/findDistinct.ts"],"sourcesContent":["import type { asc, desc, SQL } from 'drizzle-orm'\n\nimport { max, sql } from 'drizzle-orm'\nimport { type FindDistinct, getFieldByPath, type SanitizedCollectionConfig } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BuildQueryJoinAliases, DrizzleAdapter, GenericColumn } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { DistinctSymbol } from './utilities/rawConstraint.js'\n\nconst getOrderColumn = (\n  orderBy: { column: GenericColumn; order: typeof asc | typeof desc }[],\n  selectFields: Record<string, GenericColumn>,\n  joins: BuildQueryJoinAliases,\n): GenericColumn | null | SQL.Aliased => {\n  if (orderBy.length === 0) {\n    return null\n  }\n\n  if (orderBy[0].column === selectFields['_selected']) {\n    return null\n  }\n\n  if (joins.length > 0) {\n    return orderBy[0].column\n  }\n\n  return max(orderBy[0]?.column).as('_order')\n}\n\nexport const findDistinct: FindDistinct = async function (this: DrizzleAdapter, args) {\n  const collectionConfig: SanitizedCollectionConfig =\n    this.payload.collections[args.collection].config\n  const page = args.page || 1\n  const offset = args.limit ? (page - 1) * args.limit : undefined\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const { joins, orderBy, selectFields, where } = buildQuery({\n    adapter: this,\n    fields: collectionConfig.flattenedFields,\n    locale: args.locale,\n    sort: args.sort ?? args.field,\n    tableName,\n    where: {\n      and: [\n        args.where ?? {},\n        {\n          [args.field]: {\n            equals: DistinctSymbol,\n          },\n        },\n      ],\n    },\n  })\n\n  orderBy.pop()\n\n  const db = await getTransaction(this, args.req)\n\n  const _order = getOrderColumn(orderBy, selectFields, joins)\n\n  const selectDistinctResult = await selectDistinct({\n    adapter: this,\n    db,\n    forceRun: true,\n    hasAggregates: Boolean(_order) && !joins.length,\n    joins,\n    query: ({ query }) => {\n      if (_order && orderBy.length > 0 && !joins.length) {\n        query = query.orderBy(orderBy[0].order(sql`_order`))\n      } else {\n        query = query.orderBy(() => orderBy.map(({ column, order }) => order(column)))\n      }\n\n      if (args.limit) {\n        if (offset) {\n          query = query.offset(offset)\n        }\n\n        query = query.limit(args.limit)\n      }\n\n      return query\n    },\n    selectFields: {\n      _selected: selectFields['_selected'],\n      ...(_order ? { _order } : {}),\n    } as Record<string, any>,\n    tableName,\n    where,\n  })\n\n  const field = getFieldByPath({\n    config: this.payload.config,\n    fields: collectionConfig.flattenedFields,\n    includeRelationships: true,\n    path: args.field,\n  })?.field\n\n  if (field && 'relationTo' in field && Array.isArray(field.relationTo)) {\n    for (const row of selectDistinctResult as any) {\n      const json = JSON.parse(row._selected)\n      const relationTo = Object.keys(json).find((each) => Boolean(json[each]))\n      const value = json[relationTo]\n\n      if (!value) {\n        row._selected = null\n      } else {\n        row._selected = { relationTo, value }\n      }\n    }\n  }\n\n  const values = selectDistinctResult.map((each) => ({\n    [args.field]: (each as Record<string, any>)._selected,\n  }))\n\n  if (args.limit) {\n    const totalDocs = await this.countDistinct({\n      column: selectFields['_selected'],\n      db,\n      joins,\n      tableName,\n      where,\n    })\n\n    const totalPages = Math.ceil(totalDocs / args.limit)\n    const hasPrevPage = page > 1\n    const hasNextPage = totalPages > page\n    const pagingCounter = (page - 1) * args.limit + 1\n\n    return {\n      hasNextPage,\n      hasPrevPage,\n      limit: args.limit,\n      nextPage: hasNextPage ? page + 1 : null,\n      page,\n      pagingCounter,\n      prevPage: hasPrevPage ? page - 1 : null,\n      totalDocs,\n      totalPages,\n      values,\n    }\n  }\n\n  return {\n    hasNextPage: false,\n    hasPrevPage: false,\n    limit: 0,\n    page: 1,\n    pagingCounter: 1,\n    totalDocs: values.length,\n    totalPages: 1,\n    values,\n  }\n}\n"],"names":["max","sql","getFieldByPath","toSnakeCase","buildQuery","selectDistinct","getTransaction","DistinctSymbol","getOrderColumn","orderBy","selectFields","joins","length","column","as","findDistinct","args","collectionConfig","payload","collections","collection","config","page","offset","limit","undefined","tableName","tableNameMap","get","slug","where","adapter","fields","flattenedFields","locale","sort","field","and","equals","pop","db","req","_order","selectDistinctResult","forceRun","hasAggregates","Boolean","query","order","map","_selected","includeRelationships","path","Array","isArray","relationTo","row","json","JSON","parse","Object","keys","find","each","value","values","totalDocs","countDistinct","totalPages","Math","ceil","hasPrevPage","hasNextPage","pagingCounter","nextPage","prevPage"],"mappings":"AAEA,SAASA,GAAG,EAAEC,GAAG,QAAQ,cAAa;AACtC,SAA4BC,cAAc,QAAwC,UAAS;AAC3F,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,8BAA6B;AAC5D,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,cAAc,QAAQ,+BAA8B;AAE7D,MAAMC,iBAAiB,CACrBC,SACAC,cACAC;IAEA,IAAIF,QAAQG,MAAM,KAAK,GAAG;QACxB,OAAO;IACT;IAEA,IAAIH,OAAO,CAAC,EAAE,CAACI,MAAM,KAAKH,YAAY,CAAC,YAAY,EAAE;QACnD,OAAO;IACT;IAEA,IAAIC,MAAMC,MAAM,GAAG,GAAG;QACpB,OAAOH,OAAO,CAAC,EAAE,CAACI,MAAM;IAC1B;IAEA,OAAOb,IAAIS,OAAO,CAAC,EAAE,EAAEI,QAAQC,EAAE,CAAC;AACpC;AAEA,OAAO,MAAMC,eAA6B,eAAsCC,IAAI;IAClF,MAAMC,mBACJ,IAAI,CAACC,OAAO,CAACC,WAAW,CAACH,KAAKI,UAAU,CAAC,CAACC,MAAM;IAClD,MAAMC,OAAON,KAAKM,IAAI,IAAI;IAC1B,MAAMC,SAASP,KAAKQ,KAAK,GAAG,AAACF,CAAAA,OAAO,CAAA,IAAKN,KAAKQ,KAAK,GAAGC;IACtD,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACzB,YAAYc,iBAAiBY,IAAI;IAEzE,MAAM,EAAElB,KAAK,EAAEF,OAAO,EAAEC,YAAY,EAAEoB,KAAK,EAAE,GAAG1B,WAAW;QACzD2B,SAAS,IAAI;QACbC,QAAQf,iBAAiBgB,eAAe;QACxCC,QAAQlB,KAAKkB,MAAM;QACnBC,MAAMnB,KAAKmB,IAAI,IAAInB,KAAKoB,KAAK;QAC7BV;QACAI,OAAO;YACLO,KAAK;gBACHrB,KAAKc,KAAK,IAAI,CAAC;gBACf;oBACE,CAACd,KAAKoB,KAAK,CAAC,EAAE;wBACZE,QAAQ/B;oBACV;gBACF;aACD;QACH;IACF;IAEAE,QAAQ8B,GAAG;IAEX,MAAMC,KAAK,MAAMlC,eAAe,IAAI,EAAEU,KAAKyB,GAAG;IAE9C,MAAMC,SAASlC,eAAeC,SAASC,cAAcC;IAErD,MAAMgC,uBAAuB,MAAMtC,eAAe;QAChD0B,SAAS,IAAI;QACbS;QACAI,UAAU;QACVC,eAAeC,QAAQJ,WAAW,CAAC/B,MAAMC,MAAM;QAC/CD;QACAoC,OAAO,CAAC,EAAEA,KAAK,EAAE;YACf,IAAIL,UAAUjC,QAAQG,MAAM,GAAG,KAAK,CAACD,MAAMC,MAAM,EAAE;gBACjDmC,QAAQA,MAAMtC,OAAO,CAACA,OAAO,CAAC,EAAE,CAACuC,KAAK,CAAC/C,GAAG,CAAC,MAAM,CAAC;YACpD,OAAO;gBACL8C,QAAQA,MAAMtC,OAAO,CAAC,IAAMA,QAAQwC,GAAG,CAAC,CAAC,EAAEpC,MAAM,EAAEmC,KAAK,EAAE,GAAKA,MAAMnC;YACvE;YAEA,IAAIG,KAAKQ,KAAK,EAAE;gBACd,IAAID,QAAQ;oBACVwB,QAAQA,MAAMxB,MAAM,CAACA;gBACvB;gBAEAwB,QAAQA,MAAMvB,KAAK,CAACR,KAAKQ,KAAK;YAChC;YAEA,OAAOuB;QACT;QACArC,cAAc;YACZwC,WAAWxC,YAAY,CAAC,YAAY;YACpC,GAAIgC,SAAS;gBAAEA;YAAO,IAAI,CAAC,CAAC;QAC9B;QACAhB;QACAI;IACF;IAEA,MAAMM,QAAQlC,eAAe;QAC3BmB,QAAQ,IAAI,CAACH,OAAO,CAACG,MAAM;QAC3BW,QAAQf,iBAAiBgB,eAAe;QACxCkB,sBAAsB;QACtBC,MAAMpC,KAAKoB,KAAK;IAClB,IAAIA;IAEJ,IAAIA,SAAS,gBAAgBA,SAASiB,MAAMC,OAAO,CAAClB,MAAMmB,UAAU,GAAG;QACrE,KAAK,MAAMC,OAAOb,qBAA6B;YAC7C,MAAMc,OAAOC,KAAKC,KAAK,CAACH,IAAIN,SAAS;YACrC,MAAMK,aAAaK,OAAOC,IAAI,CAACJ,MAAMK,IAAI,CAAC,CAACC,OAASjB,QAAQW,IAAI,CAACM,KAAK;YACtE,MAAMC,QAAQP,IAAI,CAACF,WAAW;YAE9B,IAAI,CAACS,OAAO;gBACVR,IAAIN,SAAS,GAAG;YAClB,OAAO;gBACLM,IAAIN,SAAS,GAAG;oBAAEK;oBAAYS;gBAAM;YACtC;QACF;IACF;IAEA,MAAMC,SAAStB,qBAAqBM,GAAG,CAAC,CAACc,OAAU,CAAA;YACjD,CAAC/C,KAAKoB,KAAK,CAAC,EAAE,AAAC2B,KAA6Bb,SAAS;QACvD,CAAA;IAEA,IAAIlC,KAAKQ,KAAK,EAAE;QACd,MAAM0C,YAAY,MAAM,IAAI,CAACC,aAAa,CAAC;YACzCtD,QAAQH,YAAY,CAAC,YAAY;YACjC8B;YACA7B;YACAe;YACAI;QACF;QAEA,MAAMsC,aAAaC,KAAKC,IAAI,CAACJ,YAAYlD,KAAKQ,KAAK;QACnD,MAAM+C,cAAcjD,OAAO;QAC3B,MAAMkD,cAAcJ,aAAa9C;QACjC,MAAMmD,gBAAgB,AAACnD,CAAAA,OAAO,CAAA,IAAKN,KAAKQ,KAAK,GAAG;QAEhD,OAAO;YACLgD;YACAD;YACA/C,OAAOR,KAAKQ,KAAK;YACjBkD,UAAUF,cAAclD,OAAO,IAAI;YACnCA;YACAmD;YACAE,UAAUJ,cAAcjD,OAAO,IAAI;YACnC4C;YACAE;YACAH;QACF;IACF;IAEA,OAAO;QACLO,aAAa;QACbD,aAAa;QACb/C,OAAO;QACPF,MAAM;QACNmD,eAAe;QACfP,WAAWD,OAAOrD,MAAM;QACxBwD,YAAY;QACZH;IACF;AACF,EAAC"}

package/dist/queries/selectDistinct.d.ts

@@ -6,6 +6,7 @@ type Args = {
     adapter: DrizzleAdapter;
     db: DrizzleAdapter['drizzle'] | DrizzleTransaction;
     forceRun?: boolean;
+    hasAggregates?: boolean;
     joins: BuildQueryJoinAliases;
     query?: (args: {
         query: SQLiteSelect;
@@ -17,7 +18,7 @@ type Args = {
 /**
  * Selects distinct records from a table only if there are joins that need to be used, otherwise return null
  */
-export declare const selectDistinct: ({ adapter, db, forceRun, joins, query: queryModifier, selectFields, tableName, where, }: Args) => QueryPromise<{
+export declare const selectDistinct: ({ adapter, db, forceRun, hasAggregates, joins, query: queryModifier, selectFields, tableName, where, }: Args) => QueryPromise<{
     id: number | string;
 }[] & Record<string, GenericColumn>>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"selectDistinct.d.ts","sourceRoot":"","sources":["../../src/queries/selectDistinct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAEzE,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,aAAa,EAId,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAE5D,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAA;IAClD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,YAAY,CAAA;KAAE,KAAK,YAAY,CAAA;IACvD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,4FASxB,IAAI,KAAG,YAAY,CAAC;IAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CA8B/E,CAAA"}
+{"version":3,"file":"selectDistinct.d.ts","sourceRoot":"","sources":["../../src/queries/selectDistinct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAEzE,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,aAAa,EAEd,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAE5D,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAA;IAClD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,YAAY,CAAA;KAAE,KAAK,YAAY,CAAA;IACvD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,2GAUxB,IAAI,KAAG,YAAY,CAAC;IAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAmC/E,CAAA"}

package/dist/queries/selectDistinct.js

@@ -1,21 +1,25 @@
 /**
  * Selects distinct records from a table only if there are joins that need to be used, otherwise return null
- */ export const selectDistinct = ({ adapter, db, forceRun, joins, query: queryModifier = ({ query })=>query, selectFields, tableName, where })=>{
+ */ export const selectDistinct = ({ adapter, db, forceRun, hasAggregates, joins, query: queryModifier = ({ query })=>query, selectFields, tableName, where })=>{
     if (forceRun || Object.keys(joins).length > 0) {
         let query;
         const table = adapter.tables[tableName];
-        if (adapter.name === 'postgres') {
-            query = db.selectDistinct(selectFields).from(table).$dynamic();
-        }
-        if (adapter.name === 'sqlite') {
-            query = db.selectDistinct(selectFields).from(table).$dynamic();
-        }
+        // With hasAggregate we use groupBy so we don't need to use selectDistinct in that case
+        // @ts-expect-error - Drizzle types are not accurate here
+        let selectFunc = hasAggregates ? db.select : db.selectDistinct;
+        // bind this otherwise we get TypeError: Cannot read properties of undefined (reading 'session')
+        selectFunc = selectFunc.bind(db);
+        query = selectFunc(selectFields).from(table).$dynamic();
         if (where) {
             query = query.where(where);
         }
         joins.forEach(({ type, condition, table })=>{
             query = query[type ?? 'leftJoin'](table, condition);
         });
+        if (hasAggregates && '_selected' in selectFields) {
+            // @ts-expect-error - Drizzle types are not accurate here
+            query = query.groupBy(selectFields['_selected']);
+        }
         return queryModifier({
             query
         });

package/dist/queries/selectDistinct.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/selectDistinct.ts"],"sourcesContent":["import type { QueryPromise, SQL } from 'drizzle-orm'\nimport type { SQLiteColumn, SQLiteSelect } from 'drizzle-orm/sqlite-core'\n\nimport type {\n  DrizzleAdapter,\n  DrizzleTransaction,\n  GenericColumn,\n  GenericPgColumn,\n  TransactionPg,\n  TransactionSQLite,\n} from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  db: DrizzleAdapter['drizzle'] | DrizzleTransaction\n  forceRun?: boolean\n  joins: BuildQueryJoinAliases\n  query?: (args: { query: SQLiteSelect }) => SQLiteSelect\n  selectFields: Record<string, GenericColumn>\n  tableName: string\n  where: SQL\n}\n\n/**\n * Selects distinct records from a table only if there are joins that need to be used, otherwise return null\n */\nexport const selectDistinct = ({\n  adapter,\n  db,\n  forceRun,\n  joins,\n  query: queryModifier = ({ query }) => query,\n  selectFields,\n  tableName,\n  where,\n}: Args): QueryPromise<{ id: number | string }[] & Record<string, GenericColumn>> => {\n  if (forceRun || Object.keys(joins).length > 0) {\n    let query: SQLiteSelect\n    const table = adapter.tables[tableName]\n\n    if (adapter.name === 'postgres') {\n      query = (db as TransactionPg)\n        .selectDistinct(selectFields as Record<string, GenericPgColumn>)\n        .from(table)\n        .$dynamic() as unknown as SQLiteSelect\n    }\n    if (adapter.name === 'sqlite') {\n      query = (db as TransactionSQLite)\n        .selectDistinct(selectFields as Record<string, SQLiteColumn>)\n        .from(table)\n        .$dynamic()\n    }\n\n    if (where) {\n      query = query.where(where)\n    }\n\n    joins.forEach(({ type, condition, table }) => {\n      query = query[type ?? 'leftJoin'](table, condition)\n    })\n\n    return queryModifier({\n      query,\n    }) as unknown as QueryPromise<{ id: number | string }[] & Record<string, GenericColumn>>\n  }\n}\n"],"names":["selectDistinct","adapter","db","forceRun","joins","query","queryModifier","selectFields","tableName","where","Object","keys","length","table","tables","name","from","$dynamic","forEach","type","condition"],"mappings":"AAwBA;;CAEC,GACD,OAAO,MAAMA,iBAAiB,CAAC,EAC7BC,OAAO,EACPC,EAAE,EACFC,QAAQ,EACRC,KAAK,EACLC,OAAOC,gBAAgB,CAAC,EAAED,KAAK,EAAE,GAAKA,KAAK,EAC3CE,YAAY,EACZC,SAAS,EACTC,KAAK,EACA;IACL,IAAIN,YAAYO,OAAOC,IAAI,CAACP,OAAOQ,MAAM,GAAG,GAAG;QAC7C,IAAIP;QACJ,MAAMQ,QAAQZ,QAAQa,MAAM,CAACN,UAAU;QAEvC,IAAIP,QAAQc,IAAI,KAAK,YAAY;YAC/BV,QAAQ,AAACH,GACNF,cAAc,CAACO,cACfS,IAAI,CAACH,OACLI,QAAQ;QACb;QACA,IAAIhB,QAAQc,IAAI,KAAK,UAAU;YAC7BV,QAAQ,AAACH,GACNF,cAAc,CAACO,cACfS,IAAI,CAACH,OACLI,QAAQ;QACb;QAEA,IAAIR,OAAO;YACTJ,QAAQA,MAAMI,KAAK,CAACA;QACtB;QAEAL,MAAMc,OAAO,CAAC,CAAC,EAAEC,IAAI,EAAEC,SAAS,EAAEP,KAAK,EAAE;YACvCR,QAAQA,KAAK,CAACc,QAAQ,WAAW,CAACN,OAAOO;QAC3C;QAEA,OAAOd,cAAc;YACnBD;QACF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/queries/selectDistinct.ts"],"sourcesContent":["import type { QueryPromise, SQL } from 'drizzle-orm'\nimport type { SQLiteColumn, SQLiteSelect } from 'drizzle-orm/sqlite-core'\n\nimport type {\n  DrizzleAdapter,\n  DrizzleTransaction,\n  GenericColumn,\n  TransactionSQLite,\n} from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  db: DrizzleAdapter['drizzle'] | DrizzleTransaction\n  forceRun?: boolean\n  hasAggregates?: boolean\n  joins: BuildQueryJoinAliases\n  query?: (args: { query: SQLiteSelect }) => SQLiteSelect\n  selectFields: Record<string, GenericColumn>\n  tableName: string\n  where: SQL\n}\n\n/**\n * Selects distinct records from a table only if there are joins that need to be used, otherwise return null\n */\nexport const selectDistinct = ({\n  adapter,\n  db,\n  forceRun,\n  hasAggregates,\n  joins,\n  query: queryModifier = ({ query }) => query,\n  selectFields,\n  tableName,\n  where,\n}: Args): QueryPromise<{ id: number | string }[] & Record<string, GenericColumn>> => {\n  if (forceRun || Object.keys(joins).length > 0) {\n    let query: SQLiteSelect\n    const table = adapter.tables[tableName]\n\n    // With hasAggregate we use groupBy so we don't need to use selectDistinct in that case\n    // @ts-expect-error - Drizzle types are not accurate here\n    let selectFunc: TransactionSQLite['selectDistinct'] = hasAggregates\n      ? db.select\n      : db.selectDistinct\n\n    // bind this otherwise we get TypeError: Cannot read properties of undefined (reading 'session')\n    selectFunc = selectFunc.bind(db)\n\n    query = selectFunc(selectFields as Record<string, SQLiteColumn>)\n      .from(table)\n      .$dynamic()\n\n    if (where) {\n      query = query.where(where)\n    }\n\n    joins.forEach(({ type, condition, table }) => {\n      query = query[type ?? 'leftJoin'](table, condition)\n    })\n\n    if (hasAggregates && '_selected' in selectFields) {\n      // @ts-expect-error - Drizzle types are not accurate here\n      query = query.groupBy(selectFields['_selected'])\n    }\n\n    return queryModifier({\n      query,\n    }) as unknown as QueryPromise<{ id: number | string }[] & Record<string, GenericColumn>>\n  }\n}\n"],"names":["selectDistinct","adapter","db","forceRun","hasAggregates","joins","query","queryModifier","selectFields","tableName","where","Object","keys","length","table","tables","selectFunc","select","bind","from","$dynamic","forEach","type","condition","groupBy"],"mappings":"AAuBA;;CAEC,GACD,OAAO,MAAMA,iBAAiB,CAAC,EAC7BC,OAAO,EACPC,EAAE,EACFC,QAAQ,EACRC,aAAa,EACbC,KAAK,EACLC,OAAOC,gBAAgB,CAAC,EAAED,KAAK,EAAE,GAAKA,KAAK,EAC3CE,YAAY,EACZC,SAAS,EACTC,KAAK,EACA;IACL,IAAIP,YAAYQ,OAAOC,IAAI,CAACP,OAAOQ,MAAM,GAAG,GAAG;QAC7C,IAAIP;QACJ,MAAMQ,QAAQb,QAAQc,MAAM,CAACN,UAAU;QAEvC,uFAAuF;QACvF,yDAAyD;QACzD,IAAIO,aAAkDZ,gBAClDF,GAAGe,MAAM,GACTf,GAAGF,cAAc;QAErB,gGAAgG;QAChGgB,aAAaA,WAAWE,IAAI,CAAChB;QAE7BI,QAAQU,WAAWR,cAChBW,IAAI,CAACL,OACLM,QAAQ;QAEX,IAAIV,OAAO;YACTJ,QAAQA,MAAMI,KAAK,CAACA;QACtB;QAEAL,MAAMgB,OAAO,CAAC,CAAC,EAAEC,IAAI,EAAEC,SAAS,EAAET,KAAK,EAAE;YACvCR,QAAQA,KAAK,CAACgB,QAAQ,WAAW,CAACR,OAAOS;QAC3C;QAEA,IAAInB,iBAAiB,eAAeI,cAAc;YAChD,yDAAyD;YACzDF,QAAQA,MAAMkB,OAAO,CAAChB,YAAY,CAAC,YAAY;QACjD;QAEA,OAAOD,cAAc;YACnBD;QACF;IACF;AACF,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.73.0-canary.3",
+  "version": "3.73.0-canary.5",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -60,10 +60,10 @@
     "@types/pg": "8.10.2",
     "@types/to-snake-case": "1.0.0",
     "@payloadcms/eslint-config": "3.28.0",
-    "payload": "3.73.0-canary.3"
+    "payload": "3.73.0-canary.5"
   },
   "peerDependencies": {
-    "payload": "3.73.0-canary.3"
+    "payload": "3.73.0-canary.5"
   },
   "scripts": {
     "build": "pnpm build:swc && pnpm build:types",