orchid-orm 1.24.2 → 1.24.3

package/dist/index.js

@@ -226,12 +226,8 @@ const joinQueryChainingHOF = (reverseJoin, joinQuery) => (joiningQuery, baseQuer
   }
   const last = chain[chain.length - 1];
   const query = "relationConfig" in last ? last.relationConfig.joinQuery(last, baseQuery) : last;
-  const inner = reverseJoin(query, joiningQuery);
   return joiningQuery.where({
-    EXISTS: {
-      first: inner,
-      args: orchidCore.emptyArray
-    }
+    EXISTS: { q: reverseJoin(query, joiningQuery) }
   });
 };
 
@@ -1191,19 +1187,23 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     throughForeignKeysFull,
     throughPrimaryKeysFull
   };
-  const joinQuery = (joiningQuery, tableAs, foreignAs) => {
-    return joiningQuery.whereExists(subQuery, (q) => {
-      for (let i = 0; i < throughLen; i++) {
-        pqb._queryJoinOn(q, [
-          throughForeignKeysFull[i],
-          `${foreignAs}.${throughPrimaryKeys[i]}`
-        ]);
-      }
-      for (let i = 0; i < len; i++) {
-        pqb._queryJoinOn(q, [foreignKeysFull[i], `${tableAs}.${primaryKeys[i]}`]);
+  const joinQuery = (joiningQuery, tableAs, foreignAs, joinedShapes) => {
+    const cloned = joiningQuery.clone();
+    cloned.q.joinedShapes = joinedShapes;
+    return pqb._queryWhereExists(cloned, subQuery, [
+      (q) => {
+        for (let i = 0; i < throughLen; i++) {
+          pqb._queryJoinOn(q, [
+            throughForeignKeysFull[i],
+            `${foreignAs}.${throughPrimaryKeys[i]}`
+          ]);
+        }
+        for (let i = 0; i < len; i++) {
+          pqb._queryJoinOn(q, [foreignKeysFull[i], `${tableAs}.${primaryKeys[i]}`]);
+        }
+        return q;
       }
-      return q;
-    });
+    ]);
   };
   const obj = {};
   for (let i = 0; i < len; i++) {
@@ -1211,11 +1211,10 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
   }
   const selectPrimaryKeysAsForeignKeys = [{ selectAs: obj }];
   const reverseJoin = (baseQuery2, joiningQuery) => {
-    return joinQuery(
-      baseQuery2,
-      pqb.getQueryAs(baseQuery2),
-      pqb.getQueryAs(joiningQuery)
-    );
+    const foreignAs = pqb.getQueryAs(joiningQuery);
+    return joinQuery(baseQuery2, pqb.getQueryAs(baseQuery2), foreignAs, __spreadProps$1(__spreadValues$3({}, baseQuery2.q.joinedShapes), {
+      [foreignAs]: joiningQuery.q.shape
+    }));
   };
   return {
     returns: "many",
@@ -1240,17 +1239,12 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
       relationName,
       state
     ),
-    joinQuery: joinQueryChainingHOF(reverseJoin, (joiningQuery, baseQuery2) => {
-      const joined = joinQuery(
-        joiningQuery,
-        pqb.getQueryAs(baseQuery2),
-        pqb.getQueryAs(joiningQuery)
-      );
-      joined.q.joinedShapes = __spreadProps$1(__spreadValues$3({}, joined.q.joinedShapes), {
+    joinQuery: joinQueryChainingHOF(
+      reverseJoin,
+      (joiningQuery, baseQuery2) => joinQuery(joiningQuery, pqb.getQueryAs(baseQuery2), pqb.getQueryAs(joiningQuery), __spreadProps$1(__spreadValues$3({}, joiningQuery.q.joinedShapes), {
         [baseQuery2.q.as || baseQuery2.table]: baseQuery2.q.shape
-      });
-      return joined;
-    }),
+      }))
+    ),
     reverseJoin,
     modifyRelatedQuery(relationQuery) {
       const ref = {};
@@ -1348,7 +1342,9 @@ const nestedInsert = ({
       for (const [, { connect }] of items) {
         for (const item of connect) {
           queries.push(
-            pqb._queryFindBy(t.select(...throughPrimaryKeys), [item])
+            pqb._queryFindBy(t.select(...throughPrimaryKeys), [
+              item
+            ])
           );
         }
       }
@@ -1738,10 +1734,7 @@ const makeRelationQuery = (table, relationName, data, q) => {
       } else {
         query = pqb._queryWhere(pqb._queryAll(toTable), [
           {
-            EXISTS: {
-              first: data.reverseJoin(this, toTable),
-              args: orchidCore.emptyArray
-            }
+            EXISTS: { q: data.reverseJoin(this, toTable) }
           }
         ]);
       }