@payloadcms/drizzle 3.29.0-internal.2984e42 → 3.29.0-internal.9400be9

package/dist/updateMany.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateMany.d.ts","sourceRoot":"","sources":["../src/updateMany.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAWzC,eAAO,MAAM,UAAU,EAAE,UA8FxB,CAAA"}
+{"version":3,"file":"updateMany.d.ts","sourceRoot":"","sources":["../src/updateMany.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAYzC,eAAO,MAAM,UAAU,EAAE,UAiHxB,CAAA"}

package/dist/updateMany.js

@@ -1,22 +1,33 @@
 import toSnakeCase from 'to-snake-case';
+import { chainMethods } from './find/chainMethods.js';
 import buildQuery from './queries/buildQuery.js';
 import { selectDistinct } from './queries/selectDistinct.js';
 import { upsertRow } from './upsertRow/index.js';
 import { getTransaction } from './utilities/getTransaction.js';
-export const updateMany = async function updateMany({ collection: collectionSlug, data, joins: joinQuery, limit, locale, req, returning, select, where: whereToUse }) {
+export const updateMany = async function updateMany({ collection: collectionSlug, data, joins: joinQuery, limit, locale, req, returning, select, sort: sortArg, where: whereToUse }) {
     const db = await getTransaction(this, req);
     const collection = this.payload.collections[collectionSlug].config;
     const tableName = this.tableNameMap.get(toSnakeCase(collection.slug));
-    const { joins, selectFields, where } = buildQuery({
+    const sort = sortArg !== undefined && sortArg !== null ? sortArg : collection.defaultSort;
+    const { joins, orderBy, selectFields, where } = buildQuery({
         adapter: this,
         fields: collection.flattenedFields,
         locale,
+        sort,
         tableName,
         where: whereToUse
     });
     let idsToUpdate = [];
     const selectDistinctResult = await selectDistinct({
         adapter: this,
+        chainedMethods: orderBy ? [
+            {
+                args: [
+                    ()=>orderBy.map(({ column, order })=>order(column))
+                ],
+                method: 'orderBy'
+            }
+        ] : [],
         db,
         joins,
         selectFields,
@@ -25,15 +36,34 @@ export const updateMany = async function updateMany({ collection: collectionSlug
     });
     if (selectDistinctResult?.[0]?.id) {
         idsToUpdate = selectDistinctResult?.map((doc)=>doc.id);
-    // If id wasn't passed but `where` without any joins, retrieve it with findFirst
     } else if (whereToUse && !joins.length) {
+        // If id wasn't passed but `where` without any joins, retrieve it with findFirst
         const _db = db;
         const table = this.tables[tableName];
-        const docsToUpdate = typeof limit === 'number' && limit > 0 ? await _db.select({
-            id: table.id
-        }).from(table).where(where).limit(limit) : await _db.select({
+        const query = _db.select({
             id: table.id
         }).from(table).where(where);
+        const chainedMethods = [];
+        if (typeof limit === 'number' && limit > 0) {
+            chainedMethods.push({
+                args: [
+                    limit
+                ],
+                method: 'limit'
+            });
+        }
+        if (orderBy) {
+            chainedMethods.push({
+                args: [
+                    ()=>orderBy.map(({ column, order })=>order(column))
+                ],
+                method: 'orderBy'
+            });
+        }
+        const docsToUpdate = await chainMethods({
+            methods: chainedMethods,
+            query
+        });
         idsToUpdate = docsToUpdate?.map((doc)=>doc.id);
     }
     if (!idsToUpdate.length) {

package/dist/updateMany.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateMany.ts"],"sourcesContent":["import type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { UpdateMany } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport buildQuery from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { upsertRow } from './upsertRow/index.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const updateMany: UpdateMany = async function updateMany(\n  this: DrizzleAdapter,\n  {\n    collection: collectionSlug,\n    data,\n    joins: joinQuery,\n    limit,\n    locale,\n    req,\n    returning,\n    select,\n    where: whereToUse,\n  },\n) {\n  const db = await getTransaction(this, req)\n  const collection = this.payload.collections[collectionSlug].config\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n\n  const { joins, selectFields, where } = buildQuery({\n    adapter: this,\n    fields: collection.flattenedFields,\n    locale,\n    tableName,\n    where: whereToUse,\n  })\n\n  let idsToUpdate: (number | string)[] = []\n\n  const selectDistinctResult = await selectDistinct({\n    adapter: this,\n    db,\n    joins,\n    selectFields,\n    tableName,\n    where,\n  })\n\n  if (selectDistinctResult?.[0]?.id) {\n    idsToUpdate = selectDistinctResult?.map((doc) => doc.id)\n\n    // If id wasn't passed but `where` without any joins, retrieve it with findFirst\n  } else if (whereToUse && !joins.length) {\n    const _db = db as LibSQLDatabase\n\n    const table = this.tables[tableName]\n\n    const docsToUpdate =\n      typeof limit === 'number' && limit > 0\n        ? await _db\n            .select({\n              id: table.id,\n            })\n            .from(table)\n            .where(where)\n            .limit(limit)\n        : await _db\n            .select({\n              id: table.id,\n            })\n            .from(table)\n            .where(where)\n\n    idsToUpdate = docsToUpdate?.map((doc) => doc.id)\n  }\n\n  if (!idsToUpdate.length) {\n    return []\n  }\n\n  const results = []\n\n  // TODO: We need to batch this to reduce the amount of db calls. This can get very slow if we are updating a lot of rows.\n  for (const idToUpdate of idsToUpdate) {\n    const result = await upsertRow({\n      id: idToUpdate,\n      adapter: this,\n      data,\n      db,\n      fields: collection.flattenedFields,\n      ignoreResult: returning === false,\n      joinQuery,\n      operation: 'update',\n      req,\n      select,\n      tableName,\n    })\n    results.push(result)\n  }\n\n  if (returning === false) {\n    return null\n  }\n\n  return results\n}\n"],"names":["toSnakeCase","buildQuery","selectDistinct","upsertRow","getTransaction","updateMany","collection","collectionSlug","data","joins","joinQuery","limit","locale","req","returning","select","where","whereToUse","db","payload","collections","config","tableName","tableNameMap","get","slug","selectFields","adapter","fields","flattenedFields","idsToUpdate","selectDistinctResult","id","map","doc","length","_db","table","tables","docsToUpdate","from","results","idToUpdate","result","ignoreResult","operation","push"],"mappings":"AAGA,OAAOA,iBAAiB,gBAAe;AAIvC,OAAOC,gBAAgB,0BAAyB;AAChD,SAASC,cAAc,QAAQ,8BAA6B;AAC5D,SAASC,SAAS,QAAQ,uBAAsB;AAChD,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,MAAMC,aAAyB,eAAeA,WAEnD,EACEC,YAAYC,cAAc,EAC1BC,IAAI,EACJC,OAAOC,SAAS,EAChBC,KAAK,EACLC,MAAM,EACNC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,OAAOC,UAAU,EAClB;IAED,MAAMC,KAAK,MAAMd,eAAe,IAAI,EAAES;IACtC,MAAMP,aAAa,IAAI,CAACa,OAAO,CAACC,WAAW,CAACb,eAAe,CAACc,MAAM;IAClE,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACxB,YAAYM,WAAWmB,IAAI;IAEnE,MAAM,EAAEhB,KAAK,EAAEiB,YAAY,EAAEV,KAAK,EAAE,GAAGf,WAAW;QAChD0B,SAAS,IAAI;QACbC,QAAQtB,WAAWuB,eAAe;QAClCjB;QACAU;QACAN,OAAOC;IACT;IAEA,IAAIa,cAAmC,EAAE;IAEzC,MAAMC,uBAAuB,MAAM7B,eAAe;QAChDyB,SAAS,IAAI;QACbT;QACAT;QACAiB;QACAJ;QACAN;IACF;IAEA,IAAIe,sBAAsB,CAAC,EAAE,EAAEC,IAAI;QACjCF,cAAcC,sBAAsBE,IAAI,CAACC,MAAQA,IAAIF,EAAE;IAEvD,gFAAgF;IAClF,OAAO,IAAIf,cAAc,CAACR,MAAM0B,MAAM,EAAE;QACtC,MAAMC,MAAMlB;QAEZ,MAAMmB,QAAQ,IAAI,CAACC,MAAM,CAAChB,UAAU;QAEpC,MAAMiB,eACJ,OAAO5B,UAAU,YAAYA,QAAQ,IACjC,MAAMyB,IACHrB,MAAM,CAAC;YACNiB,IAAIK,MAAML,EAAE;QACd,GACCQ,IAAI,CAACH,OACLrB,KAAK,CAACA,OACNL,KAAK,CAACA,SACT,MAAMyB,IACHrB,MAAM,CAAC;YACNiB,IAAIK,MAAML,EAAE;QACd,GACCQ,IAAI,CAACH,OACLrB,KAAK,CAACA;QAEfc,cAAcS,cAAcN,IAAI,CAACC,MAAQA,IAAIF,EAAE;IACjD;IAEA,IAAI,CAACF,YAAYK,MAAM,EAAE;QACvB,OAAO,EAAE;IACX;IAEA,MAAMM,UAAU,EAAE;IAElB,yHAAyH;IACzH,KAAK,MAAMC,cAAcZ,YAAa;QACpC,MAAMa,SAAS,MAAMxC,UAAU;YAC7B6B,IAAIU;YACJf,SAAS,IAAI;YACbnB;YACAU;YACAU,QAAQtB,WAAWuB,eAAe;YAClCe,cAAc9B,cAAc;YAC5BJ;YACAmC,WAAW;YACXhC;YACAE;YACAO;QACF;QACAmB,QAAQK,IAAI,CAACH;IACf;IAEA,IAAI7B,cAAc,OAAO;QACvB,OAAO;IACT;IAEA,OAAO2B;AACT,EAAC"}
+{"version":3,"sources":["../src/updateMany.ts"],"sourcesContent":["import type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { UpdateMany } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { ChainedMethods, DrizzleAdapter } from './types.js'\n\nimport { chainMethods } from './find/chainMethods.js'\nimport buildQuery from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { upsertRow } from './upsertRow/index.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const updateMany: UpdateMany = async function updateMany(\n  this: DrizzleAdapter,\n  {\n    collection: collectionSlug,\n    data,\n    joins: joinQuery,\n    limit,\n    locale,\n    req,\n    returning,\n    select,\n    sort: sortArg,\n    where: whereToUse,\n  },\n) {\n  const db = await getTransaction(this, req)\n  const collection = this.payload.collections[collectionSlug].config\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : collection.defaultSort\n\n  const { joins, orderBy, selectFields, where } = buildQuery({\n    adapter: this,\n    fields: collection.flattenedFields,\n    locale,\n    sort,\n    tableName,\n    where: whereToUse,\n  })\n\n  let idsToUpdate: (number | string)[] = []\n\n  const selectDistinctResult = await selectDistinct({\n    adapter: this,\n    chainedMethods: orderBy\n      ? [\n          {\n            args: [() => orderBy.map(({ column, order }) => order(column))],\n            method: 'orderBy',\n          },\n        ]\n      : [],\n    db,\n    joins,\n    selectFields,\n    tableName,\n    where,\n  })\n\n  if (selectDistinctResult?.[0]?.id) {\n    idsToUpdate = selectDistinctResult?.map((doc) => doc.id)\n  } else if (whereToUse && !joins.length) {\n    // If id wasn't passed but `where` without any joins, retrieve it with findFirst\n\n    const _db = db as LibSQLDatabase\n\n    const table = this.tables[tableName]\n\n    const query = _db.select({ id: table.id }).from(table).where(where)\n\n    const chainedMethods: ChainedMethods = []\n\n    if (typeof limit === 'number' && limit > 0) {\n      chainedMethods.push({\n        args: [limit],\n        method: 'limit',\n      })\n    }\n\n    if (orderBy) {\n      chainedMethods.push({\n        args: [() => orderBy.map(({ column, order }) => order(column))],\n        method: 'orderBy',\n      })\n    }\n\n    const docsToUpdate = await chainMethods({\n      methods: chainedMethods,\n      query,\n    })\n\n    idsToUpdate = docsToUpdate?.map((doc) => doc.id)\n  }\n\n  if (!idsToUpdate.length) {\n    return []\n  }\n\n  const results = []\n\n  // TODO: We need to batch this to reduce the amount of db calls. This can get very slow if we are updating a lot of rows.\n  for (const idToUpdate of idsToUpdate) {\n    const result = await upsertRow({\n      id: idToUpdate,\n      adapter: this,\n      data,\n      db,\n      fields: collection.flattenedFields,\n      ignoreResult: returning === false,\n      joinQuery,\n      operation: 'update',\n      req,\n      select,\n      tableName,\n    })\n    results.push(result)\n  }\n\n  if (returning === false) {\n    return null\n  }\n\n  return results\n}\n"],"names":["toSnakeCase","chainMethods","buildQuery","selectDistinct","upsertRow","getTransaction","updateMany","collection","collectionSlug","data","joins","joinQuery","limit","locale","req","returning","select","sort","sortArg","where","whereToUse","db","payload","collections","config","tableName","tableNameMap","get","slug","undefined","defaultSort","orderBy","selectFields","adapter","fields","flattenedFields","idsToUpdate","selectDistinctResult","chainedMethods","args","map","column","order","method","id","doc","length","_db","table","tables","query","from","push","docsToUpdate","methods","results","idToUpdate","result","ignoreResult","operation"],"mappings":"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"}

package/package.json

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