rawsql-ts 0.28.0 → 0.30.0

package/dist/esm/transformers/StaticPredicatePlacementOptimizer.js

@@ -1,71 +1,12 @@
-import { DistinctOn, SubQuerySource, TableSource, WhereClause } from "../models/Clause";
+import { DistinctOn, JoinOnClause, SubQuerySource, TableSource } from "../models/Clause";
 import { BinarySelectQuery, SimpleSelectQuery } from "../models/SelectQuery";
-import { ArrayExpression, ArrayQueryExpression, BetweenExpression, BinaryExpression, CaseExpression, CastExpression, ColumnReference, FunctionCall, InlineQuery, JsonPredicateExpression, ParameterExpression, ParenExpression, TupleExpression, TypeValue, UnaryExpression, ValueList } from "../models/ValueComponent";
+import { ArrayExpression, ArrayQueryExpression, BetweenExpression, BinaryExpression, CaseExpression, CastExpression, ColumnReference, FunctionCall, InlineQuery, JsonPredicateExpression, ParameterExpression, TupleExpression, TypeValue, UnaryExpression, ValueList } from "../models/ValueComponent";
 import { SelectQueryParser } from "../parsers/SelectQueryParser";
-import { ValueParser } from "../parsers/ValueParser";
 import { formatSqlComponent, hasSqlComponentFormatOverride } from "./SqlComponentFormatter";
 import { SelectOutputCollector } from "./SelectOutputCollector";
+import { dedupeTopLevelAndConditions, dedupeWhereTopLevelAndConditions } from "./TopLevelAndConditionDeduper";
+import { appendUnique, cloneColumnReference, cloneValueComponent, collectTopLevelAndTerms, columnReferenceText, identifiersEqual, normalizeIdentifier, rebuildWhereWithoutTerms, sameColumnReference, unwrapParens } from "./PredicateExpressionUtils";
 const VOLATILE_OR_UNSUPPORTED_FUNCTION_REASON = "Predicate contains a function call; volatile and expression predicates are not moved in the safe-only implementation.";
-const normalizeIdentifier = (value) => value.trim().toLowerCase();
-const unwrapParens = (expression) => {
-    let candidate = expression;
-    while (candidate instanceof ParenExpression) {
-        candidate = candidate.expression;
-    }
-    return candidate;
-};
-const isBinaryOperator = (expression, operator) => {
-    const candidate = unwrapParens(expression);
-    return candidate instanceof BinaryExpression
-        && candidate.operator.value.trim().toLowerCase() === operator;
-};
-const collectTopLevelAndTerms = (expression) => {
-    const candidate = unwrapParens(expression);
-    if (!isBinaryOperator(candidate, "and")) {
-        return [expression];
-    }
-    return [
-        ...collectTopLevelAndTerms(candidate.left),
-        ...collectTopLevelAndTerms(candidate.right)
-    ];
-};
-const rebuildWhereWithoutTerms = (query, termsToRemove) => {
-    if (!query.whereClause || termsToRemove.size === 0) {
-        return;
-    }
-    const remaining = collectTopLevelAndTerms(query.whereClause.condition)
-        .filter(term => !termsToRemove.has(term));
-    if (remaining.length === 0) {
-        query.whereClause = null;
-        return;
-    }
-    let rebuilt = remaining[0];
-    for (let index = 1; index < remaining.length; index += 1) {
-        rebuilt = new BinaryExpression(rebuilt, "and", remaining[index]);
-    }
-    query.whereClause = new WhereClause(rebuilt);
-};
-const cloneValueComponent = (expression, options) => {
-    return ValueParser.parse(formatSqlComponent(expression, options));
-};
-const cloneColumnReference = (reference) => {
-    var _a, _b;
-    const namespaces = (_b = (_a = reference.namespaces) === null || _a === void 0 ? void 0 : _a.map(namespace => namespace.name)) !== null && _b !== void 0 ? _b : null;
-    return new ColumnReference(namespaces, reference.column.name);
-};
-const columnReferenceText = (reference) => {
-    const namespace = reference.getNamespace();
-    return namespace ? `${namespace}.${reference.column.name}` : reference.column.name;
-};
-const sameColumnReference = (left, right) => {
-    return normalizeIdentifier(left.column.name) === normalizeIdentifier(right.column.name)
-        && normalizeIdentifier(left.getNamespace()) === normalizeIdentifier(right.getNamespace());
-};
-const appendUnique = (items, value) => {
-    if (!items.includes(value)) {
-        items.push(value);
-    }
-};
 export class StaticPredicatePlacementOptimizer {
     plan(input, options = {}) {
         var _a, _b, _c;
@@ -103,71 +44,8 @@ export class StaticPredicatePlacementOptimizer {
         const query = parsed.query;
         const applied = [];
         const skipped = [];
-        const movedTerms = [];
-        for (const term of query.whereClause ? collectTopLevelAndTerms(query.whereClause.condition) : []) {
-            const candidate = this.analyzeCandidate(query, term, options);
-            if (!candidate) {
-                continue;
-            }
-            if ("code" in candidate) {
-                skipped.push(this.makeSkipped(term, candidate, options));
-                continue;
-            }
-            const target = this.resolveTarget(query, candidate);
-            if ("code" in target) {
-                skipped.push(this.makeSkipped(term, target, options));
-                continue;
-            }
-            let appliedReason = "";
-            if (target.kind === "simple") {
-                const targetColumns = this.resolveTargetColumns(query, target.query, candidate.references);
-                if ("code" in targetColumns) {
-                    skipped.push(this.makeSkipped(term, targetColumns, options));
-                    continue;
-                }
-                const placement = this.resolveTargetPlacement(target.query, targetColumns);
-                if ("code" in placement) {
-                    skipped.push(this.makeSkipped(term, placement, options));
-                    continue;
-                }
-                const movedPredicate = this.rebasePredicate(candidate.expression, targetColumns, options);
-                target.query.appendWhere(movedPredicate);
-                appliedReason = placement.reason;
-            }
-            else {
-                const placements = [];
-                let skip = null;
-                for (const branch of target.branches) {
-                    const placement = this.resolveTargetPlacement(branch.query, branch.targetColumns);
-                    if ("code" in placement) {
-                        skip = placement;
-                        break;
-                    }
-                    placements.push(placement);
-                }
-                if (skip) {
-                    skipped.push(this.makeSkipped(term, skip, options));
-                    continue;
-                }
-                for (const branch of target.branches) {
-                    const movedPredicate = this.rebasePredicate(candidate.expression, branch.targetColumns, options);
-                    branch.query.appendWhere(movedPredicate);
-                }
-                appliedReason = placements.some(item => /group by/i.test(item.reason))
-                    ? "Predicate is distributed to every UNION branch by output column position; grouped branches only receive GROUP BY-key predicates."
-                    : "Predicate is distributed to every UNION branch by output column position before unsafe query boundaries.";
-            }
-            movedTerms.push(term);
-            applied.push({
-                kind: "move_static_predicate",
-                predicateSql: candidate.predicateSql,
-                fromScopeId: "scope:root",
-                toScopeId: target.scopeId,
-                reason: appliedReason,
-                columnReferences: candidate.references.map(columnReferenceText)
-            });
-        }
-        rebuildWhereWithoutTerms(query, new Set(movedTerms));
+        this.placePredicatesInScopes(query, options, applied, skipped);
+        // API output shape review: keep result.sql/result.query compatibility while expanding scope-aware placement.
         const sql = applied.length > 0 || hasSqlComponentFormatOverride(options)
             ? formatSqlComponent(query, options)
             : parsed.sql;
@@ -182,6 +60,121 @@ export class StaticPredicatePlacementOptimizer {
             formatterGeneratedSource: parsed.formatterGeneratedSource
         });
     }
+    placePredicatesInScopes(contextRoot, options, applied, skipped) {
+        var _a;
+        const queue = [{ query: contextRoot, scopeId: "scope:root" }];
+        let processed = 0;
+        while (queue.length > 0) {
+            processed += 1;
+            if (processed > 1000) {
+                skipped.push({
+                    predicateSql: "",
+                    scopeId: "scope:root",
+                    code: "RECURSIVE_PLACEMENT_LIMIT",
+                    reason: "Static predicate recursive placement stopped after reaching the safety iteration limit."
+                });
+                return;
+            }
+            const work = queue.shift();
+            const movedTerms = [];
+            const reportSkipped = work.pendingTerms === undefined;
+            const terms = (_a = work.pendingTerms) !== null && _a !== void 0 ? _a : (work.query.whereClause
+                ? collectTopLevelAndTerms(work.query.whereClause.condition)
+                : []);
+            for (const term of terms) {
+                const candidate = this.analyzeCandidate(work.query, term, options);
+                if (!candidate) {
+                    continue;
+                }
+                if ("code" in candidate) {
+                    if (reportSkipped) {
+                        skipped.push(this.makeSkipped(term, work.scopeId, candidate, options));
+                    }
+                    continue;
+                }
+                const target = this.resolveTarget(contextRoot, work.query, candidate);
+                if ("code" in target) {
+                    if (reportSkipped) {
+                        skipped.push(this.makeSkipped(term, work.scopeId, target, options));
+                    }
+                    continue;
+                }
+                let appliedReason = "";
+                if (target.kind === "join_on") {
+                    this.appendJoinOnPredicate(target.join, candidate.expression, options);
+                    appliedReason = target.reason;
+                }
+                else if (target.kind === "simple") {
+                    const targetColumns = this.resolveTargetColumns(contextRoot, target.query, candidate.references);
+                    if ("code" in targetColumns) {
+                        if (reportSkipped) {
+                            skipped.push(this.makeSkipped(term, work.scopeId, targetColumns, options));
+                        }
+                        continue;
+                    }
+                    const placement = this.resolveTargetPlacement(contextRoot, target.query, targetColumns);
+                    if ("code" in placement) {
+                        if (reportSkipped) {
+                            skipped.push(this.makeSkipped(term, work.scopeId, placement, options));
+                        }
+                        continue;
+                    }
+                    const movedPredicate = this.rebasePredicate(candidate.expression, targetColumns, options);
+                    target.query.appendWhere(movedPredicate);
+                    dedupeWhereTopLevelAndConditions(target.query, options);
+                    appliedReason = work.scopeId === "scope:root"
+                        ? placement.reason
+                        : `${placement.reason} Predicate was safely rebased from a previously moved predicate.`;
+                    const retainedTerms = target.query.whereClause
+                        ? collectTopLevelAndTerms(target.query.whereClause.condition)
+                        : [];
+                    if (retainedTerms.includes(movedPredicate)) {
+                        queue.push({
+                            query: target.query,
+                            scopeId: target.scopeId,
+                            pendingTerms: [movedPredicate]
+                        });
+                    }
+                }
+                else {
+                    const placements = [];
+                    let skip = null;
+                    for (const branch of target.branches) {
+                        const placement = this.resolveTargetPlacement(contextRoot, branch.query, branch.targetColumns);
+                        if ("code" in placement) {
+                            skip = placement;
+                            break;
+                        }
+                        placements.push(placement);
+                    }
+                    if (skip) {
+                        if (reportSkipped) {
+                            skipped.push(this.makeSkipped(term, work.scopeId, skip, options));
+                        }
+                        continue;
+                    }
+                    for (const branch of target.branches) {
+                        const movedPredicate = this.rebasePredicate(candidate.expression, branch.targetColumns, options);
+                        branch.query.appendWhere(movedPredicate);
+                        dedupeWhereTopLevelAndConditions(branch.query, options);
+                    }
+                    appliedReason = placements.some(item => /group by/i.test(item.reason))
+                        ? "Predicate is distributed to every UNION branch by output column position; grouped branches only receive GROUP BY-key predicates."
+                        : "Predicate is distributed to every UNION branch by output column position before unsafe query boundaries.";
+                }
+                movedTerms.push(term);
+                applied.push({
+                    kind: "move_static_predicate",
+                    predicateSql: candidate.predicateSql,
+                    fromScopeId: work.scopeId,
+                    toScopeId: target.scopeId,
+                    reason: appliedReason,
+                    columnReferences: candidate.references.map(columnReferenceText)
+                });
+            }
+            rebuildWhereWithoutTerms(work.query, new Set(movedTerms));
+        }
+    }
     optimize(input, options = {}) {
         var _a;
         return this.plan(input, Object.assign(Object.assign({}, options), { dryRun: (_a = options.dryRun) !== null && _a !== void 0 ? _a : false }));
@@ -377,12 +370,13 @@ export class StaticPredicatePlacementOptimizer {
         visit(expression);
         return found;
     }
-    resolveTarget(root, candidate) {
-        const boundary = this.findRootQueryBoundary(root);
+    resolveTarget(contextRoot, currentQuery, candidate) {
+        var _a;
+        const boundary = this.findRootQueryBoundary(currentQuery);
         if (boundary) {
             return boundary;
         }
-        if (!root.fromClause) {
+        if (!currentQuery.fromClause) {
             return {
                 code: "NO_FROM_CLAUSE",
                 reason: "Predicate has no FROM source that can receive it safely."
@@ -390,7 +384,7 @@ export class StaticPredicatePlacementOptimizer {
         }
         const bindings = [];
         for (const reference of candidate.references) {
-            const binding = this.resolveSourceBinding(root, root, reference);
+            const binding = this.resolveSourceBinding(contextRoot, currentQuery, reference);
             if ("code" in binding) {
                 return binding;
             }
@@ -405,12 +399,25 @@ export class StaticPredicatePlacementOptimizer {
             };
         }
         const binding = bindings[0];
-        const nullableSide = this.findNullableSideBoundary(root.fromClause, binding);
+        if ((_a = binding.join) === null || _a === void 0 ? void 0 : _a.lateral) {
+            return {
+                code: "LATERAL_JOIN_BOUNDARY",
+                reason: "Predicate crosses a LATERAL JOIN boundary; moving it may change semantics."
+            };
+        }
+        const nullableSide = this.findNullableSideBoundary(currentQuery.fromClause, binding);
         if (nullableSide) {
             return nullableSide;
         }
-        const upstream = this.resolveUpstreamQuery(root, binding, candidate.references);
+        const upstream = this.resolveUpstreamQuery(contextRoot, binding, candidate.references);
         if ("code" in upstream) {
+            if (upstream.code === "NO_SAFE_UPSTREAM_QUERY") {
+                const joinOnTarget = this.resolveBaseTableJoinOnTarget(contextRoot, currentQuery, binding);
+                if (!("code" in joinOnTarget)) {
+                    return joinOnTarget;
+                }
+                return joinOnTarget;
+            }
             return upstream;
         }
         return upstream;
@@ -430,7 +437,7 @@ export class StaticPredicatePlacementOptimizer {
         }
         return null;
     }
-    resolveTargetPlacement(query, targetColumns) {
+    resolveTargetPlacement(contextRoot, query, targetColumns) {
         const hasOrdinaryDistinct = this.hasOrdinaryDistinct(query);
         if (this.hasDistinctOnBoundary(query)) {
             return {
@@ -450,11 +457,11 @@ export class StaticPredicatePlacementOptimizer {
                 reason: "Predicate crosses LIMIT/OFFSET/FETCH boundary; moving it may change row selection semantics."
             };
         }
-        if (query.fromClause && this.hasOuterJoin(query.fromClause)) {
-            return {
-                code: "OUTER_JOIN_BOUNDARY",
-                reason: "Target query contains an OUTER JOIN boundary that is not moved across in the safe-only implementation."
-            };
+        if (query.fromClause) {
+            const nullableSide = this.findNullableSideBoundaryForTargetColumns(contextRoot, query, targetColumns);
+            if (nullableSide) {
+                return nullableSide;
+            }
         }
         if (query.groupByClause) {
             const allReferencesAreGroupKeys = targetColumns.every(item => this.isGroupKeyColumn(query, item.targetColumn));
@@ -483,6 +490,22 @@ export class StaticPredicatePlacementOptimizer {
             reason: "All outer references resolve to direct upstream outputs before unsafe query boundaries."
         };
     }
+    findNullableSideBoundaryForTargetColumns(contextRoot, query, targetColumns) {
+        if (!query.fromClause) {
+            return null;
+        }
+        for (const item of targetColumns) {
+            const binding = this.resolveSourceBinding(contextRoot, query, item.targetColumn);
+            if ("code" in binding) {
+                return binding;
+            }
+            const nullableSide = this.findNullableSideBoundary(query.fromClause, binding);
+            if (nullableSide) {
+                return nullableSide;
+            }
+        }
+        return null;
+    }
     resolveSourceBinding(contextRoot, query, column) {
         const fromClause = query.fromClause;
         if (!fromClause) {
@@ -492,10 +515,10 @@ export class StaticPredicatePlacementOptimizer {
             };
         }
         const bindings = this.getSourceBindings(fromClause);
-        const namespace = normalizeIdentifier(column.getNamespace());
+        const namespace = column.getNamespace();
         const columnName = column.column.name;
         if (namespace) {
-            const matches = bindings.filter(binding => normalizeIdentifier(binding.alias) === namespace);
+            const matches = bindings.filter(binding => identifiersEqual(binding.alias, namespace));
             if (matches.length !== 1) {
                 return {
                     code: "AMBIGUOUS_COLUMN_SOURCE",
@@ -503,6 +526,9 @@ export class StaticPredicatePlacementOptimizer {
                 };
             }
             const matchCount = this.getOutputColumnMatchCount(contextRoot, matches[0], columnName);
+            if (matchCount === 0 && this.isBaseTableBinding(contextRoot, matches[0])) {
+                return matches[0];
+            }
             if (matchCount === 0) {
                 return {
                     code: "COLUMN_NOT_AVAILABLE_UPSTREAM",
@@ -631,7 +657,7 @@ export class StaticPredicatePlacementOptimizer {
     resolveTargetColumns(root, query, references) {
         const resolved = [];
         for (const reference of references) {
-            const matches = this.collectSelectOutputs(root, query).filter(item => normalizeIdentifier(item.name) === normalizeIdentifier(reference.column.name));
+            const matches = this.collectDirectOutputMatches(root, query, reference.column.name);
             if (matches.length !== 1) {
                 return {
                     code: "AMBIGUOUS_TARGET_COLUMN",
@@ -658,6 +684,57 @@ export class StaticPredicatePlacementOptimizer {
         }
         return resolved;
     }
+    resolveBaseTableJoinOnTarget(contextRoot, currentQuery, binding) {
+        var _a, _b, _c;
+        if (!currentQuery.fromClause || !this.isBaseTableBinding(contextRoot, binding)) {
+            return {
+                code: "NO_SAFE_UPSTREAM_QUERY",
+                reason: "The referenced source is a base table, so there is no upstream query block to move into."
+            };
+        }
+        if (this.hasOuterJoin(currentQuery.fromClause)) {
+            return {
+                code: "OUTER_JOIN_BOUNDARY",
+                reason: "Predicate crosses an OUTER JOIN boundary; moving it into JOIN ON may change semantics."
+            };
+        }
+        const join = binding.isPrimary
+            ? (_b = (_a = currentQuery.fromClause.joins) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : null
+            : binding.join;
+        if (join === null || join === void 0 ? void 0 : join.lateral) {
+            return {
+                code: "LATERAL_JOIN_BOUNDARY",
+                reason: "Predicate crosses a LATERAL JOIN boundary; moving it into JOIN ON may change semantics."
+            };
+        }
+        if (!join || !this.isInnerJoin(join)) {
+            return {
+                code: "NO_SAFE_JOIN_ON_TARGET",
+                reason: "Base-table predicates are moved only into INNER JOIN ON clauses in the safe-only implementation."
+            };
+        }
+        if (!(join.condition instanceof JoinOnClause)) {
+            return {
+                code: "NO_SAFE_JOIN_ON_TARGET",
+                reason: "Base-table predicates are moved only into existing JOIN ON clauses, not USING or conditionless joins."
+            };
+        }
+        return {
+            kind: "join_on",
+            join,
+            scopeId: `join_on:${(_c = join.source.getAliasName()) !== null && _c !== void 0 ? _c : "unknown"}`,
+            reason: binding.isPrimary
+                ? "Predicate references the primary source of an INNER JOIN; it is moved into the first JOIN ON clause."
+                : "Predicate references the joined source of an INNER JOIN; it is moved into that JOIN ON clause."
+        };
+    }
+    appendJoinOnPredicate(join, expression, options) {
+        if (!(join.condition instanceof JoinOnClause)) {
+            return;
+        }
+        join.condition.condition = new BinaryExpression(join.condition.condition, "and", cloneValueComponent(expression, options));
+        join.condition.condition = dedupeTopLevelAndConditions(join.condition.condition, options);
+    }
     resolveDeepestBranchTarget(contextRoot, query, targetColumns, visited = new Set()) {
         if (visited.has(query) || targetColumns.length === 0) {
             return { query, targetColumns: [...targetColumns] };
@@ -685,14 +762,17 @@ export class StaticPredicatePlacementOptimizer {
             return { query, targetColumns: [...targetColumns] };
         }
         const upstream = this.resolveUpstreamQuery(contextRoot, binding, targetColumns.map(item => item.targetColumn));
-        if ("code" in upstream || upstream.kind === "union") {
+        if ("code" in upstream) {
+            return { query, targetColumns: [...targetColumns] };
+        }
+        if (upstream.kind !== "simple") {
             return { query, targetColumns: [...targetColumns] };
         }
         const upstreamColumns = this.resolveTargetColumns(contextRoot, upstream.query, targetColumns.map(item => item.targetColumn));
         if ("code" in upstreamColumns) {
             return { query, targetColumns: [...targetColumns] };
         }
-        const placement = this.resolveTargetPlacement(upstream.query, upstreamColumns);
+        const placement = this.resolveTargetPlacement(contextRoot, upstream.query, upstreamColumns);
         if ("code" in placement) {
             return { query, targetColumns: [...targetColumns] };
         }
@@ -710,9 +790,9 @@ export class StaticPredicatePlacementOptimizer {
             };
         }
         const bindings = this.getSourceBindings(query.fromClause);
-        const namespace = normalizeIdentifier(column.getNamespace());
+        const namespace = column.getNamespace();
         if (namespace) {
-            const matches = bindings.filter(binding => normalizeIdentifier(binding.alias) === namespace);
+            const matches = bindings.filter(binding => identifiersEqual(binding.alias, namespace));
             return matches.length === 1
                 ? null
                 : {
@@ -743,7 +823,7 @@ export class StaticPredicatePlacementOptimizer {
         if (sameColumnReference(left, right)) {
             return true;
         }
-        if (normalizeIdentifier(left.column.name) !== normalizeIdentifier(right.column.name)) {
+        if (!identifiersEqual(left.column.name, right.column.name)) {
             return false;
         }
         const leftSource = this.resolveColumnSourceAlias(query, left);
@@ -755,12 +835,12 @@ export class StaticPredicatePlacementOptimizer {
             return null;
         }
         const bindings = this.getSourceBindings(query.fromClause);
-        const namespace = normalizeIdentifier(column.getNamespace());
+        const namespace = column.getNamespace();
         if (namespace) {
-            const matches = bindings.filter(binding => normalizeIdentifier(binding.alias) === namespace);
-            return matches.length === 1 ? normalizeIdentifier(matches[0].alias) : null;
+            const matches = bindings.filter(binding => identifiersEqual(binding.alias, namespace));
+            return matches.length === 1 ? matches[0].alias : null;
         }
-        return bindings.length === 1 ? normalizeIdentifier(bindings[0].alias) : null;
+        return bindings.length === 1 ? bindings[0].alias : null;
     }
     rebasePredicate(expression, targetColumns, options) {
         const cloned = cloneValueComponent(expression, options);
@@ -897,6 +977,14 @@ export class StaticPredicatePlacementOptimizer {
         }
         return bindings;
     }
+    isBaseTableBinding(root, binding) {
+        const source = binding.source.datasource;
+        return source instanceof TableSource && !this.findCte(root, source.table.name);
+    }
+    isInnerJoin(join) {
+        const joinType = join.joinType.value.trim().toLowerCase();
+        return joinType === "join" || joinType === "inner join";
+    }
     findNullableSideBoundary(fromClause, binding) {
         var _a;
         const joins = (_a = fromClause.joins) !== null && _a !== void 0 ? _a : [];
@@ -964,12 +1052,12 @@ export class StaticPredicatePlacementOptimizer {
             if ("code" in branches) {
                 return 0;
             }
-            return this.collectSelectOutputs(root, branches[0]).filter(item => normalizeIdentifier(item.name) === normalizeIdentifier(columnName)).length;
+            return this.collectDirectOutputMatches(root, branches[0], columnName).length;
         }
         if (!(target instanceof SimpleSelectQuery)) {
             return 0;
         }
-        return this.collectSelectOutputs(root, target).filter(item => normalizeIdentifier(item.name) === normalizeIdentifier(columnName)).length;
+        return this.collectDirectOutputMatches(root, target, columnName).length;
     }
     collectUnionBranches(query) {
         const branches = [];
@@ -1000,7 +1088,7 @@ export class StaticPredicatePlacementOptimizer {
     resolveUnionOutputIndex(root, firstBranch, outputColumnName) {
         const matches = [];
         this.collectSelectOutputs(root, firstBranch).forEach((item, index) => {
-            if (normalizeIdentifier(item.name) === normalizeIdentifier(outputColumnName)) {
+            if (identifiersEqual(item.name, outputColumnName)) {
                 matches.push(index);
             }
         });
@@ -1022,6 +1110,15 @@ export class StaticPredicatePlacementOptimizer {
                 reason: `UNION branch does not expose column '${sourceColumn.column.name}' at output position ${outputIndex + 1}.`
             };
         }
+        else if (identifiersEqual(output.name, sourceColumn.column.name)) {
+            const matches = this.collectDirectOutputMatches(root, query, sourceColumn.column.name);
+            if (matches.length > 1) {
+                return {
+                    code: "AMBIGUOUS_TARGET_COLUMN",
+                    reason: `UNION branch exposes multiple '${sourceColumn.column.name}' columns.`
+                };
+            }
+        }
         if (!(output.value instanceof ColumnReference)) {
             return {
                 code: "EXPRESSION_OUTPUT_UNSUPPORTED",
@@ -1046,6 +1143,96 @@ export class StaticPredicatePlacementOptimizer {
         const collector = new SelectOutputCollector(null, commonTables.length > 0 ? commonTables : null);
         return collector.collect(query);
     }
+    collectDirectOutputMatches(root, query, columnName) {
+        const collectedMatches = this.collectSelectOutputs(root, query).filter(item => identifiersEqual(item.name, columnName));
+        if (collectedMatches.length > 0) {
+            return this.hasExplicitOutputMatch(query, columnName)
+                ? [...collectedMatches, ...this.inferWildcardOutputMatches(root, query, columnName, true)]
+                : collectedMatches;
+        }
+        return this.inferWildcardOutputMatches(root, query, columnName, false);
+    }
+    hasExplicitOutputMatch(query, columnName) {
+        return query.selectClause.items.some(item => {
+            if (item.identifier) {
+                return identifiersEqual(item.identifier.name, columnName);
+            }
+            return item.value instanceof ColumnReference
+                && item.value.column.name !== "*"
+                && identifiersEqual(item.value.column.name, columnName);
+        });
+    }
+    inferWildcardOutputMatches(root, query, columnName, includeUnprovenPotential) {
+        const matches = [];
+        query.selectClause.items.forEach((item, outputIndex) => {
+            if (item.identifier || !(item.value instanceof ColumnReference) || item.value.column.name !== "*") {
+                return;
+            }
+            const targetColumn = this.inferWildcardTargetColumn(root, query, item.value, columnName, includeUnprovenPotential);
+            if (!targetColumn) {
+                return;
+            }
+            if (targetColumn === "ambiguous") {
+                matches.push(this.createInferredOutputColumn(columnName, new ColumnReference(null, columnName), outputIndex), this.createInferredOutputColumn(columnName, new ColumnReference(null, columnName), outputIndex));
+                return;
+            }
+            matches.push(this.createInferredOutputColumn(columnName, targetColumn, outputIndex));
+        });
+        return matches;
+    }
+    inferWildcardTargetColumn(root, query, wildcard, columnName, includeUnprovenPotential) {
+        if (!query.fromClause) {
+            return null;
+        }
+        const bindings = this.getSourceBindings(query.fromClause);
+        if (wildcard.namespaces === null) {
+            if (bindings.length !== 1) {
+                return "ambiguous";
+            }
+            return this.resolveWildcardColumnFromBinding(root, query, bindings[0], columnName, includeUnprovenPotential);
+        }
+        const namespace = wildcard.getNamespace();
+        const matches = bindings.filter(binding => identifiersEqual(binding.alias, namespace));
+        if (matches.length === 0) {
+            return null;
+        }
+        return matches.length === 1
+            ? this.resolveWildcardColumnFromBinding(root, query, matches[0], columnName, includeUnprovenPotential)
+            : "ambiguous";
+    }
+    resolveWildcardColumnFromBinding(root, query, binding, columnName, includeUnprovenPotential) {
+        const matches = this.collectSourceOutputMatches(root, query, binding.source, columnName);
+        if (matches.length > 1) {
+            return "ambiguous";
+        }
+        if (matches.length === 1) {
+            const value = matches[0].value;
+            return value instanceof ColumnReference ? value : null;
+        }
+        return includeUnprovenPotential ? this.createColumnForBinding(binding, columnName) : null;
+    }
+    collectSourceOutputMatches(root, query, source, columnName) {
+        var _a, _b, _c, _d;
+        const commonTables = [
+            ...((_b = (_a = query.withClause) === null || _a === void 0 ? void 0 : _a.tables) !== null && _b !== void 0 ? _b : []),
+            ...((_d = (_c = root.withClause) === null || _c === void 0 ? void 0 : _c.tables) !== null && _d !== void 0 ? _d : [])
+        ];
+        const collector = new SelectOutputCollector(null, commonTables.length > 0 ? commonTables : null);
+        return collector.collect(source).filter(item => identifiersEqual(item.name, columnName));
+    }
+    createColumnForBinding(binding, columnName) {
+        return new ColumnReference(binding.alias ? [binding.alias] : null, columnName);
+    }
+    createInferredOutputColumn(name, value, outputIndex) {
+        return {
+            name,
+            value,
+            outputIndex,
+            sourceAlias: value.getNamespace() || null,
+            sourceName: null,
+            sourceColumnName: name
+        };
+    }
     resolveSourceQueryForColumns(root, source) {
         var _a;
         if (source.datasource instanceof SubQuerySource) {
@@ -1404,8 +1591,8 @@ export class StaticPredicatePlacementOptimizer {
         visit(expression);
         return names;
     }
-    makeSkipped(expression, draft, options) {
-        return Object.assign({ predicateSql: formatSqlComponent(expression, options), scopeId: "scope:root" }, draft);
+    makeSkipped(expression, scopeId, draft, options) {
+        return Object.assign({ predicateSql: formatSqlComponent(expression, options), scopeId }, draft);
     }
     buildResult(params) {
         return {