@payloadcms/db-sqlite 3.22.0 → 3.23.0-canary.597254e

package/dist/countDistinct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"countDistinct.d.ts","sourceRoot":"","sources":["../src/countDistinct.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,YAAY,CAAA;AAE9D,eAAO,MAAM,aAAa,EAAE,aAwB3B,CAAA"}
+{"version":3,"file":"countDistinct.d.ts","sourceRoot":"","sources":["../src/countDistinct.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,YAAY,CAAA;AAE9D,eAAO,MAAM,aAAa,EAAE,aAiC3B,CAAA"}

package/dist/countDistinct.js

@@ -1,8 +1,18 @@
 import { chainMethods } from '@payloadcms/drizzle';
-import { count } from 'drizzle-orm';
+import { count, sql } from 'drizzle-orm';
 export const countDistinct = async function countDistinct({ db, joins, tableName, where }) {
     const chainedMethods = [];
-    joins.forEach(({ condition, table })=>{
+    // COUNT(DISTINCT id)  is slow on large tables, so we only use DISTINCT if we have to
+    const visitedPaths = new Set([]);
+    let useDistinct = false;
+    joins.forEach(({ condition, queryPath, table })=>{
+        if (!useDistinct && queryPath) {
+            if (visitedPaths.has(queryPath)) {
+                useDistinct = true;
+            } else {
+                visitedPaths.add(queryPath);
+            }
+        }
         chainedMethods.push({
             args: [
                 table,
@@ -14,7 +24,7 @@ export const countDistinct = async function countDistinct({ db, joins, tableName
     const countResult = await chainMethods({
         methods: chainedMethods,
         query: db.select({
-            count: count()
+            count: useDistinct ? sql`COUNT(DISTINCT ${this.tables[tableName].id})` : count()
         }).from(this.tables[tableName]).where(where)
     });
     return Number(countResult[0].count);

package/dist/countDistinct.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/countDistinct.ts"],"sourcesContent":["import type { ChainedMethods } from '@payloadcms/drizzle/types'\n\nimport { chainMethods } from '@payloadcms/drizzle'\nimport { count } from 'drizzle-orm'\n\nimport type { CountDistinct, SQLiteAdapter } from './types.js'\n\nexport const countDistinct: CountDistinct = async function countDistinct(\n  this: SQLiteAdapter,\n  { db, joins, tableName, where },\n) {\n  const chainedMethods: ChainedMethods = []\n\n  joins.forEach(({ condition, table }) => {\n    chainedMethods.push({\n      args: [table, condition],\n      method: 'leftJoin',\n    })\n  })\n\n  const countResult = await chainMethods({\n    methods: chainedMethods,\n    query: db\n      .select({\n        count: count(),\n      })\n      .from(this.tables[tableName])\n      .where(where),\n  })\n\n  return Number(countResult[0].count)\n}\n"],"names":["chainMethods","count","countDistinct","db","joins","tableName","where","chainedMethods","forEach","condition","table","push","args","method","countResult","methods","query","select","from","tables","Number"],"mappings":"AAEA,SAASA,YAAY,QAAQ,sBAAqB;AAClD,SAASC,KAAK,QAAQ,cAAa;AAInC,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,EAAE,EAAEC,KAAK,EAAEC,SAAS,EAAEC,KAAK,EAAE;IAE/B,MAAMC,iBAAiC,EAAE;IAEzCH,MAAMI,OAAO,CAAC,CAAC,EAAEC,SAAS,EAAEC,KAAK,EAAE;QACjCH,eAAeI,IAAI,CAAC;YAClBC,MAAM;gBAACF;gBAAOD;aAAU;YACxBI,QAAQ;QACV;IACF;IAEA,MAAMC,cAAc,MAAMd,aAAa;QACrCe,SAASR;QACTS,OAAOb,GACJc,MAAM,CAAC;YACNhB,OAAOA;QACT,GACCiB,IAAI,CAAC,IAAI,CAACC,MAAM,CAACd,UAAU,EAC3BC,KAAK,CAACA;IACX;IAEA,OAAOc,OAAON,WAAW,CAAC,EAAE,CAACb,KAAK;AACpC,EAAC"}
+{"version":3,"sources":["../src/countDistinct.ts"],"sourcesContent":["import type { ChainedMethods } from '@payloadcms/drizzle/types'\n\nimport { chainMethods } from '@payloadcms/drizzle'\nimport { count, sql } from 'drizzle-orm'\n\nimport type { CountDistinct, SQLiteAdapter } from './types.js'\n\nexport const countDistinct: CountDistinct = async function countDistinct(\n  this: SQLiteAdapter,\n  { db, joins, tableName, where },\n) {\n  const chainedMethods: ChainedMethods = []\n\n  // COUNT(DISTINCT id)  is slow on large tables, so we only use DISTINCT if we have to\n  const visitedPaths = new Set([])\n  let useDistinct = false\n  joins.forEach(({ condition, queryPath, table }) => {\n    if (!useDistinct && queryPath) {\n      if (visitedPaths.has(queryPath)) {\n        useDistinct = true\n      } else {\n        visitedPaths.add(queryPath)\n      }\n    }\n    chainedMethods.push({\n      args: [table, condition],\n      method: 'leftJoin',\n    })\n  })\n  const countResult = await chainMethods({\n    methods: chainedMethods,\n    query: db\n      .select({\n        count: useDistinct ? sql`COUNT(DISTINCT ${this.tables[tableName].id})` : count(),\n      })\n      .from(this.tables[tableName])\n      .where(where),\n  })\n\n  return Number(countResult[0].count)\n}\n"],"names":["chainMethods","count","sql","countDistinct","db","joins","tableName","where","chainedMethods","visitedPaths","Set","useDistinct","forEach","condition","queryPath","table","has","add","push","args","method","countResult","methods","query","select","tables","id","from","Number"],"mappings":"AAEA,SAASA,YAAY,QAAQ,sBAAqB;AAClD,SAASC,KAAK,EAAEC,GAAG,QAAQ,cAAa;AAIxC,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,EAAE,EAAEC,KAAK,EAAEC,SAAS,EAAEC,KAAK,EAAE;IAE/B,MAAMC,iBAAiC,EAAE;IAEzC,qFAAqF;IACrF,MAAMC,eAAe,IAAIC,IAAI,EAAE;IAC/B,IAAIC,cAAc;IAClBN,MAAMO,OAAO,CAAC,CAAC,EAAEC,SAAS,EAAEC,SAAS,EAAEC,KAAK,EAAE;QAC5C,IAAI,CAACJ,eAAeG,WAAW;YAC7B,IAAIL,aAAaO,GAAG,CAACF,YAAY;gBAC/BH,cAAc;YAChB,OAAO;gBACLF,aAAaQ,GAAG,CAACH;YACnB;QACF;QACAN,eAAeU,IAAI,CAAC;YAClBC,MAAM;gBAACJ;gBAAOF;aAAU;YACxBO,QAAQ;QACV;IACF;IACA,MAAMC,cAAc,MAAMrB,aAAa;QACrCsB,SAASd;QACTe,OAAOnB,GACJoB,MAAM,CAAC;YACNvB,OAAOU,cAAcT,GAAG,CAAC,eAAe,EAAE,IAAI,CAACuB,MAAM,CAACnB,UAAU,CAACoB,EAAE,CAAC,CAAC,CAAC,GAAGzB;QAC3E,GACC0B,IAAI,CAAC,IAAI,CAACF,MAAM,CAACnB,UAAU,EAC3BC,KAAK,CAACA;IACX;IAEA,OAAOqB,OAAOP,WAAW,CAAC,EAAE,CAACpB,KAAK;AACpC,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-sqlite",
-  "version": "3.22.0",
+  "version": "3.23.0-canary.597254e",
   "description": "The officially supported SQLite database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -69,16 +69,16 @@
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
     "uuid": "9.0.0",
-    "@payloadcms/drizzle": "3.22.0"
+    "@payloadcms/drizzle": "3.23.0-canary.597254e"
   },
   "devDependencies": {
     "@types/pg": "8.10.2",
     "@types/to-snake-case": "1.0.0",
-    "payload": "3.22.0",
+    "payload": "3.23.0-canary.597254e",
     "@payloadcms/eslint-config": "3.9.0"
   },
   "peerDependencies": {
-    "payload": "3.22.0"
+    "payload": "3.23.0-canary.597254e"
   },
   "scripts": {
     "build": "pnpm build:swc && pnpm build:types",