orchid-orm 1.49.4 → 1.49.6

package/dist/index.js

@@ -298,6 +298,52 @@ const joinQueryChainHOF = (relPKeys, reverseJoin, joinQuery) => (joiningQuery, b
   }
   const last = chain[chain.length - 1];
   const query = "relationConfig" in last ? last.relationConfig.joinQuery(last, baseQuery) : last;
+  let useWhereExist = true;
+  if (jq.q.returnType !== "value" && jq.q.returnType !== "valueOrThrow") {
+    let tablePrefix;
+    if (jq.q.order) {
+      const prefix = tablePrefix = pqb.getQueryAs(jq) + ".";
+      useWhereExist = jq.q.order.every((o) => {
+        if (typeof o === "string") {
+          return isOwnColumn(prefix, o);
+        } else if (orchidCore.isExpression(o)) {
+          return false;
+        } else {
+          for (const key in o) {
+            if (!isOwnColumn(prefix, key)) {
+              return false;
+            }
+          }
+          return true;
+        }
+      });
+    }
+    if (useWhereExist && jq.q.select) {
+      const prefix = tablePrefix || pqb.getQueryAs(jq) + ".";
+      useWhereExist = jq.q.select.every((s) => {
+        if (typeof s === "string") {
+          return isOwnColumn(prefix, s);
+        } else if (orchidCore.isExpression(s)) {
+          return false;
+        } else if (!s) {
+          return false;
+        } else {
+          for (const key in s.selectAs) {
+            const value = s.selectAs[key];
+            if (typeof value !== "string" || !isOwnColumn(prefix, value)) {
+              return false;
+            }
+          }
+          return true;
+        }
+      });
+    }
+  }
+  if (useWhereExist) {
+    return jq.where({
+      EXISTS: { q: reverseJoin(query, jq) }
+    });
+  }
   const result = jq.join(
     { _internalJoin: reverseJoin(query, jq) },
     void 0
@@ -310,6 +356,7 @@ const joinQueryChainHOF = (relPKeys, reverseJoin, joinQuery) => (joiningQuery, b
   if (!result.q.select) result.q.select = ["*"];
   return wrapQuery(jq, result, item);
 };
+const isOwnColumn = (prefix, column) => !column.includes(".") || column.startsWith(prefix);
 const selectRowNumber = (result, relPKeys) => {
   const hookSelect = result.q.hookSelect = new Map(
     result.q.hookSelect && [...result.q.hookSelect]