rawsql-ts 0.27.0 → 0.29.0

package/dist/esm/transformers/ParameterConditionPlacementOptimizer.js

@@ -1,13 +1,22 @@
-import { DistinctOn, SubQuerySource, TableSource, WhereClause } from "../models/Clause";
+import { DistinctOn, JoinOnClause, SubQuerySource, TableSource, WhereClause } 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 { SelectQueryParser } from "../parsers/SelectQueryParser";
 import { ValueParser } from "../parsers/ValueParser";
 import { formatSqlComponent, hasSqlComponentFormatOverride } from "./SqlComponentFormatter";
 import { SelectOutputCollector } from "./SelectOutputCollector";
+import { dedupeTopLevelAndConditions, dedupeWhereTopLevelAndConditions } from "./TopLevelAndConditionDeduper";
 const SUPPORTED_OPERATORS = new Set(["=", "<>", "!=", "<", "<=", ">", ">=", "like", "ilike", "in"]);
 const VOLATILE_OR_UNSUPPORTED_FUNCTION_REASON = "Condition contains a function call; volatile and expression predicates are not moved in the safe-only implementation.";
 const normalizeIdentifier = (value) => value.trim().toLowerCase();
+const isCaseSensitiveIdentifier = (value) => /[A-Z]/.test(value.trim());
+const identifiersEqual = (left, right) => {
+    const trimmedLeft = left.trim();
+    const trimmedRight = right.trim();
+    return isCaseSensitiveIdentifier(trimmedLeft) || isCaseSensitiveIdentifier(trimmedRight)
+        ? trimmedLeft === trimmedRight
+        : trimmedLeft.toLowerCase() === trimmedRight.toLowerCase();
+};
 const unwrapParens = (expression) => {
     let candidate = expression;
     while (candidate instanceof ParenExpression) {
@@ -59,8 +68,8 @@ const columnReferenceText = (reference) => {
     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());
+    return identifiersEqual(left.column.name, right.column.name)
+        && identifiersEqual(left.getNamespace(), right.getNamespace());
 };
 const appendUnique = (items, value) => {
     if (!items.includes(value)) {
@@ -120,7 +129,11 @@ export class ParameterConditionPlacementOptimizer {
                 continue;
             }
             let appliedReason = "";
-            if (target.kind === "simple") {
+            if (target.kind === "join_on") {
+                this.appendJoinOnCondition(target.join, candidate.expression, options);
+                appliedReason = target.reason;
+            }
+            else if (target.kind === "simple") {
                 const targetColumns = this.resolveTargetColumns(query, target.query, candidate.references);
                 if ("code" in targetColumns) {
                     skipped.push(this.makeSkipped(term, targetColumns, options));
@@ -133,6 +146,7 @@ export class ParameterConditionPlacementOptimizer {
                 }
                 const movedCondition = this.rebaseCondition(candidate.expression, targetColumns, options);
                 target.query.appendWhere(movedCondition);
+                dedupeWhereTopLevelAndConditions(target.query, options);
                 appliedReason = placement.reason;
             }
             else {
@@ -153,6 +167,7 @@ export class ParameterConditionPlacementOptimizer {
                 for (const branch of target.branches) {
                     const movedCondition = this.rebaseCondition(candidate.expression, branch.targetColumns, options);
                     branch.query.appendWhere(movedCondition);
+                    dedupeWhereTopLevelAndConditions(branch.query, options);
                 }
                 appliedReason = placements.some(item => /group by/i.test(item.reason))
                     ? "Condition is distributed to every UNION branch by output column position; grouped branches only receive GROUP BY-key predicates."
@@ -351,9 +366,15 @@ export class ParameterConditionPlacementOptimizer {
                 }
                 return null;
             }
+            if (candidate instanceof UnaryExpression) {
+                const operator = candidate.operator.value.trim().toLowerCase();
+                if (operator === "not") {
+                    return visit(candidate.expression);
+                }
+            }
             return {
                 code: "UNSUPPORTED_PARAMETER_CONDITION",
-                reason: "Only simple binary, BETWEEN, and whole OR/AND parameter predicates are moved in the safe-only implementation."
+                reason: "Only simple binary, BETWEEN, and whole OR/AND/NOT parameter predicates are moved in the safe-only implementation."
             };
         };
         return visit(expression);
@@ -374,6 +395,7 @@ export class ParameterConditionPlacementOptimizer {
             && right.values.every(value => unwrapParens(value) instanceof ParameterExpression);
     }
     resolveTarget(root, candidate) {
+        var _a;
         const boundary = this.findRootQueryBoundary(root);
         if (boundary) {
             return boundary;
@@ -401,12 +423,25 @@ export class ParameterConditionPlacementOptimizer {
             };
         }
         const binding = bindings[0];
+        if ((_a = binding.join) === null || _a === void 0 ? void 0 : _a.lateral) {
+            return {
+                code: "LATERAL_JOIN_BOUNDARY",
+                reason: "Condition crosses a LATERAL JOIN boundary; moving it may change semantics."
+            };
+        }
         const nullableSide = this.findNullableSideBoundary(root.fromClause, binding);
         if (nullableSide) {
             return nullableSide;
         }
         const upstream = this.resolveUpstreamQuery(root, binding, candidate.references);
         if ("code" in upstream) {
+            if (upstream.code === "NO_SAFE_UPSTREAM_QUERY") {
+                const joinOnTarget = this.resolveBaseTableJoinOnTarget(root, binding);
+                if (!("code" in joinOnTarget)) {
+                    return joinOnTarget;
+                }
+                return joinOnTarget;
+            }
             return upstream;
         }
         return upstream;
@@ -488,10 +523,10 @@ export class ParameterConditionPlacementOptimizer {
             };
         }
         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",
@@ -499,6 +534,9 @@ export class ParameterConditionPlacementOptimizer {
                 };
             }
             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",
@@ -627,7 +665,7 @@ export class ParameterConditionPlacementOptimizer {
     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",
@@ -654,6 +692,57 @@ export class ParameterConditionPlacementOptimizer {
         }
         return resolved;
     }
+    resolveBaseTableJoinOnTarget(root, binding) {
+        var _a, _b, _c;
+        if (!root.fromClause || !this.isBaseTableBinding(root, 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(root.fromClause)) {
+            return {
+                code: "OUTER_JOIN_BOUNDARY",
+                reason: "Condition crosses an OUTER JOIN boundary; moving it into JOIN ON may change semantics."
+            };
+        }
+        const join = binding.isPrimary
+            ? (_b = (_a = root.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: "Condition 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 conditions 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 conditions 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
+                ? "Condition references the primary source of an INNER JOIN; it is moved into the first JOIN ON clause."
+                : "Condition references the joined source of an INNER JOIN; it is moved into that JOIN ON clause."
+        };
+    }
+    appendJoinOnCondition(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);
+    }
     resolveTargetColumnByOutputIndex(root, query, outputIndex, sourceColumn) {
         const output = this.collectSelectOutputs(root, query)[outputIndex];
         if (!output) {
@@ -662,6 +751,15 @@ export class ParameterConditionPlacementOptimizer {
                 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",
@@ -704,7 +802,10 @@ export class ParameterConditionPlacementOptimizer {
             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));
@@ -729,9 +830,9 @@ export class ParameterConditionPlacementOptimizer {
             };
         }
         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
                 : {
@@ -762,7 +863,7 @@ export class ParameterConditionPlacementOptimizer {
         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);
@@ -774,12 +875,12 @@ export class ParameterConditionPlacementOptimizer {
             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;
     }
     rebaseCondition(expression, targetColumns, options) {
         const cloned = cloneValueComponent(expression, options);
@@ -797,33 +898,45 @@ export class ParameterConditionPlacementOptimizer {
                 source: fromClause.source,
                 alias: (_a = fromClause.source.getAliasName()) !== null && _a !== void 0 ? _a : "",
                 join: null,
+                joinIndex: -1,
                 isPrimary: true
             }];
-        for (const join of (_b = fromClause.joins) !== null && _b !== void 0 ? _b : []) {
+        for (let index = 0; index < ((_b = fromClause.joins) !== null && _b !== void 0 ? _b : []).length; index += 1) {
+            const join = fromClause.joins[index];
             bindings.push({
                 source: join.source,
                 alias: (_c = join.source.getAliasName()) !== null && _c !== void 0 ? _c : "",
                 join,
+                joinIndex: index,
                 isPrimary: false
             });
         }
         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;
-        if (!binding.join) {
-            const rightOrFull = ((_a = fromClause.joins) !== null && _a !== void 0 ? _a : []).some(join => {
-                const joinType = join.joinType.value.toLowerCase();
-                return joinType.includes("right") || joinType.includes("full");
-            });
-            return rightOrFull
+        const joins = (_a = fromClause.joins) !== null && _a !== void 0 ? _a : [];
+        if (binding.isPrimary) {
+            return this.hasLaterJoinThatNullsPriorSources(joins, -1)
                 ? {
                     code: "OUTER_JOIN_NULLABLE_SIDE",
                     reason: "Condition crosses OUTER JOIN nullable side; moving it may change semantics."
                 }
                 : null;
         }
-        const joinType = binding.join.joinType.value.toLowerCase();
+        const join = binding.join;
+        if (!join) {
+            return null;
+        }
+        const joinType = join.joinType.value.toLowerCase();
         if (joinType.includes("left")) {
             return {
                 code: "OUTER_JOIN_NULLABLE_SIDE",
@@ -836,8 +949,22 @@ export class ParameterConditionPlacementOptimizer {
                 reason: "Condition crosses FULL JOIN nullable side; moving it may change semantics."
             };
         }
+        if (this.hasLaterJoinThatNullsPriorSources(joins, binding.joinIndex)) {
+            return {
+                code: "OUTER_JOIN_NULLABLE_SIDE",
+                reason: "Condition crosses later RIGHT/FULL JOIN nullable side; moving it may change semantics."
+            };
+        }
         return null;
     }
+    hasLaterJoinThatNullsPriorSources(joins, sourceJoinIndex) {
+        return joins
+            .slice(sourceJoinIndex + 1)
+            .some(join => {
+            const joinType = join.joinType.value.toLowerCase();
+            return joinType.includes("right") || joinType.includes("full");
+        });
+    }
     hasOuterJoin(fromClause) {
         var _a;
         return ((_a = fromClause.joins) !== null && _a !== void 0 ? _a : []).some(join => {
@@ -861,12 +988,12 @@ export class ParameterConditionPlacementOptimizer {
             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, true).length;
     }
     collectUnionBranches(query) {
         const branches = [];
@@ -897,7 +1024,7 @@ export class ParameterConditionPlacementOptimizer {
     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);
             }
         });
@@ -920,6 +1047,98 @@ export class ParameterConditionPlacementOptimizer {
         const collector = new SelectOutputCollector(null, commonTables.length > 0 ? commonTables : null);
         return collector.collect(query);
     }
+    collectDirectOutputMatches(root, query, columnName, includeUnprovenPotential = false) {
+        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, includeUnprovenPotential);
+    }
+    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 && binding.source.datasource instanceof TableSource
+            ? 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) {