orchid-orm 1.49.5 → 1.49.7

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]
@@ -885,7 +932,11 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys }) => {
       ids
     );
     if (params.create || params.disconnect || params.set) {
-      await pqb._queryUpdate(currentRelationsQuery, setNulls);
+      let queryToDisconnect = currentRelationsQuery;
+      if (params.set) {
+        queryToDisconnect = queryToDisconnect.whereNot(params.set);
+      }
+      await pqb._queryUpdate(queryToDisconnect, setNulls);
       const record = data[0];
       if (params.create) {
         const obj = { ...params.create };
@@ -1238,27 +1289,27 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
       for (const foreignKey of foreignKeys) {
         obj[foreignKey] = null;
       }
-      await pqb._queryUpdate(
-        getWhereForNestedUpdate(
-          t,
-          data,
-          params.disconnect,
-          primaryKeys,
-          foreignKeys
-        ),
-        obj
+      const setConditions = params.set && (Array.isArray(params.set) ? params.set.length : orchidCore.objectHasValues(params.set)) && (Array.isArray(params.set) ? {
+        OR: params.set
+      } : params.set);
+      let queryToDisconnect = getWhereForNestedUpdate(
+        t,
+        data,
+        params.disconnect,
+        primaryKeys,
+        foreignKeys
       );
-      if (params.set && (Array.isArray(params.set) ? params.set.length : orchidCore.objectHasValues(params.set))) {
+      if (setConditions) {
+        queryToDisconnect = queryToDisconnect.whereNot(setConditions);
+      }
+      await pqb._queryUpdate(queryToDisconnect, obj);
+      if (setConditions) {
         const obj2 = {};
         for (let i = 0; i < len; i++) {
           obj2[foreignKeys[i]] = data[0][primaryKeys[i]];
         }
         await pqb._queryUpdate(
-          t.where(
-            Array.isArray(params.set) ? {
-              OR: params.set
-            } : params.set
-          ),
+          t.where(setConditions),
           obj2
         );
       }