@query-farm/vgi 0.35.0 → 0.36.1

package/dist/filter-pushdown/evaluate.d.ts

@@ -27,4 +27,10 @@ export declare class PushdownFilters {
     getColumnValues(columnName: string): unknown[] | null;
     toSql(): string;
 }
+/**
+ * Render one predicate, projecting a bare boolean column onto its equality
+ * form first. Predicate positions are the root and the children of `and`/`or`
+ * — the shape that actually turns up is `other = x AND NOT flag`.
+ */
+export declare function predicateToSql(expression: FilterExpression): string;
 export declare function expressionToSql(expression: FilterExpression): string;

package/dist/index.js

@@ -3800,7 +3800,8 @@ function isBooleanExpression(expression) {
   if (["comparison", "and", "or", "not", "is_null", "in", "runtime_filter", "call"].includes(expression.node)) {
     return true;
   }
-  return expression.node === "literal" && isBool(expression.field.type);
+  const type = expressionType(expression);
+  return type !== undefined && isBool(type);
 }
 function requiresSessionContext(expression) {
   switch (expression.node) {
@@ -4245,7 +4246,19 @@ function expressionColumns(expression, output = new Map) {
   }
   return output;
 }
+function booleanColumnLeaf(expression) {
+  const column = (node) => node.node === "column_ref" && node.dataType !== undefined && isBool(node.dataType) ? node.columnName : undefined;
+  if (expression.node === "not") {
+    const name = column(expression.expression);
+    return name === undefined ? undefined : { columnName: name, value: false };
+  }
+  const name = column(expression);
+  return name === undefined ? undefined : { columnName: name, value: true };
+}
 function discreteValues(expression, columnName) {
+  const leaf = booleanColumnLeaf(expression);
+  if (leaf && leaf.columnName === columnName)
+    return [leaf.value];
   if (expression.node === "comparison" && expression.op === "eq" /* EQ */) {
     if (expression.left.node === "column_ref" && expression.left.columnName === columnName && expression.right.node === "literal")
       return [expression.right.value];
@@ -4351,7 +4364,7 @@ class PushdownFilters {
     return null;
   }
   toSql() {
-    return this.predicates.map((predicate) => expressionToSql(predicate.expression)).join(" AND ");
+    return this.predicates.map((predicate) => predicateToSql(predicate.expression)).join(" AND ");
   }
 }
 function quote(value) {
@@ -4365,6 +4378,10 @@ function quote(value) {
     return `[${value.map(quote).join(", ")}]`;
   return String(value);
 }
+function predicateToSql(expression) {
+  const leaf = booleanColumnLeaf(expression);
+  return leaf ? `${leaf.columnName} = ${quote(leaf.value)}` : expressionToSql(expression);
+}
 function expressionToSql(expression) {
   switch (expression.node) {
     case "column_ref":
@@ -4388,7 +4405,7 @@ function expressionToSql(expression) {
     }
     case "and":
     case "or":
-      return `(${expression.children.map(expressionToSql).join(` ${expression.node.toUpperCase()} `)})`;
+      return `(${expression.children.map(predicateToSql).join(` ${expression.node.toUpperCase()} `)})`;
     case "not":
       return `(NOT ${expressionToSql(expression.expression)})`;
     case "is_null":
@@ -13597,4 +13614,4 @@ export {
   utf82 as utf8
 };
 
-//# debugId=D5A17FC8C11AEBC264756E2164756E21
+//# debugId=19F589EDB6611F0964756E2164756E21