@dbsp/core 1.3.0 → 1.4.0

package/dist/index.js

@@ -6163,7 +6163,10 @@ import {
   NqlLexer,
   compile as nqlCompile
 } from "@dbsp/nql";
-import { NQL_INTERNAL_COMPILER_OPTIONS } from "@dbsp/types/internal";
+import {
+  getTrustedNqlRelationFilterFields,
+  NQL_INTERNAL_COMPILER_OPTIONS
+} from "@dbsp/types/internal";
 var NQL_RAW_FRAGMENT = /* @__PURE__ */ Symbol("NqlRawFragment");
 function hasNqlBindings(bundle) {
   return (bundle.bindings?.size ?? 0) > 0;
@@ -6186,6 +6189,9 @@ function findBindingFinalRelationFilter(where) {
     case "not":
       return findBindingFinalRelationFilter(where.condition);
     case "relationFilter":
+      if (getTrustedNqlRelationFilterFields(where) !== void 0) {
+        return void 0;
+      }
       return formatBindingRelationPath(where.relation);
     case "exists":
     case "notExists":
@@ -6198,7 +6204,14 @@ function findBindingFinalRelationFilter(where) {
   }
 }
 function assertBindingFinalQueryCanUseSyntheticPlan(intent) {
-  const relationColumns = intent.select?.type === "expressions" ? intent.select.columns.filter((column) => column.kind === "relationColumn").map((column) => column.relation) : [];
+  const relationColumns = intent.select?.type === "expressions" ? intent.select.columns.flatMap((column) => {
+    if (column.kind !== "relationColumn") return [];
+    const trusted = getTrustedNqlRelationFilterFields(column);
+    if (trusted?.selectedColumn !== void 0 && trusted.cardinality === "one") {
+      return [];
+    }
+    return [column.relation];
+  }) : [];
   const relationFilter = intent.where ? findBindingFinalRelationFilter(intent.where) : void 0;
   const havingRelationFilter = intent.having ? findBindingFinalRelationFilter(intent.having) : void 0;
   if ((intent.include?.length ?? 0) > 0 || relationColumns.length > 0 || (intent.joins?.length ?? 0) > 0 || relationFilter !== void 0 || havingRelationFilter !== void 0) {