chore(db-postgres): correct joins order

payloadcms · May 26, 2024 · 0c2fd92 · 0c2fd92
1 parent 2a8f144
commit 0c2fd92
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/packages/db-postgres/src/find/findMany.ts b/packages/db-postgres/src/find/findMany.ts
@@ -122,6 +122,12 @@ export const findMany = async function find({
 
   if (pagination !== false && (orderedIDs ? orderedIDs?.length <= limit : true)) {
     const selectCountMethods: ChainedMethods = []
+    joinAliases.forEach(({ condition, table }) => {
+      selectCountMethods.push({
+        args: [table, condition],
+        method: 'leftJoin',
+      })
+    })
 
     Object.entries(joins).forEach(([joinTable, condition]) => {
       if (joinTable) {
@@ -132,13 +138,6 @@ export const findMany = async function find({
       }
     })
 
-    joinAliases.forEach(({ condition, table }) => {
-      selectCountMethods.push({
-        args: [table, condition],
-        method: 'leftJoin',
-      })
-    })
-
     const countResult = await chainMethods({
       methods: selectCountMethods,
       query: db

diff --git a/packages/db-postgres/src/queries/selectDistinct.ts b/packages/db-postgres/src/queries/selectDistinct.ts
@@ -36,6 +36,13 @@ export const selectDistinct = ({
       chainedMethods.push({ args: [where], method: 'where' })
     }
 
+    joinAliases.forEach(({ condition, table }) => {
+      chainedMethods.push({
+        args: [table, condition],
+        method: 'leftJoin',
+      })
+    })
+
     Object.entries(joins).forEach(([joinTable, condition]) => {
       if (joinTable) {
         chainedMethods.push({
@@ -44,14 +51,6 @@ export const selectDistinct = ({
         })
       }
     })
-
-    joinAliases.forEach(({ condition, table }) => {
-      chainedMethods.push({
-        args: [table, condition],
-        method: 'leftJoin',
-      })
-    })
-
     return chainMethods({
       methods: chainedMethods,
       query: db.selectDistinct(selectFields).from(adapter.tables[tableName]),