@quillsql/react 2.13.43 → 2.13.45

package/dist/cjs/utils/astFilterProcessing.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterToAst = exports.filterTreeToAst = exports.astToFilter = exports.astToFilterTree = void 0;
 exports.getFieldFromExpression = getFieldFromExpression;
+exports.getTableFromExpression = getTableFromExpression;
 const Filter_1 = require("../models/Filter");
 const date_fns_1 = require("date-fns");
 const columnProcessing_1 = require("./columnProcessing");
@@ -6601,8 +6602,10 @@ const queryPatterns = [
                         }
                         else {
                             const unitLeft = astWhere.left?.right?.args?.value[0]?.column?.toLowerCase() ??
+                                astWhere.left?.right?.args?.value[0]?.value?.toLowerCase() ??
                                 null;
                             const unitRight = astWhere.right?.right?.args?.value[0]?.column?.toLowerCase() ??
+                                astWhere.right?.right?.args?.value[0]?.value?.toLowerCase() ??
                                 null;
                             return parseStartEndDate(operatorLeft, operatorRight, valueLeft, valueRight, stripTimeS(unitLeft.toLowerCase()), stripTimeS(unitRight.toLowerCase()));
                         }
@@ -7156,6 +7159,201 @@ const queryPatterns = [
                         _limit: null,
                     },
                 },
+                {
+                    query: `
+            SELECT * FROM transactions 
+            WHERE transaction_date >= TIMESTAMP_SUB(CURRENT_DATE(), INTERVAL 80 DAY)
+            AND transaction_date < TIMESTAMP_SUB(CURRENT_DATE(), INTERVAL 40 DAY)
+          `,
+                    value: function (astWhere) {
+                        if (astWhere.right.operator === 'AND') {
+                            // Avoid AND chains
+                            return -1;
+                        }
+                        const operatorLeft = astWhere.left.operator;
+                        const operatorRight = astWhere.right.operator;
+                        const valueLeft = astWhere.left.right?.args?.value[1]?.expr?.value;
+                        const valueRight = astWhere.right.right?.args?.value[1]?.expr?.value;
+                        if (!valueLeft || !valueRight) {
+                            return null;
+                        }
+                        if (operatorLeft === '>=' &&
+                            operatorRight === '<' &&
+                            valueLeft == valueRight * 2) {
+                            return valueRight;
+                        }
+                        else if (operatorLeft === '<' &&
+                            operatorRight === '>=' &&
+                            valueLeft * 2 == valueRight) {
+                            return valueLeft;
+                        }
+                        else {
+                            const unitLeft = astWhere.left?.right?.args?.value[1]?.unit?.toLowerCase() ??
+                                null;
+                            const unitRight = astWhere.right?.right?.args?.value[1]?.unit?.toLowerCase() ??
+                                null;
+                            return parseStartEndDate(operatorLeft, operatorRight, valueLeft, valueRight, stripTimeS(unitLeft.toLowerCase()), stripTimeS(unitRight.toLowerCase()));
+                        }
+                    },
+                    unit: function (astWhere) {
+                        const unitLeft = astWhere.left?.right?.args?.value[1]?.unit?.toLowerCase() ?? null;
+                        const unitRight = astWhere.right?.right?.args?.value[1]?.unit?.toLowerCase() ??
+                            null;
+                        return stripTimeS(unitLeft.toLowerCase()) ===
+                            stripTimeS(unitRight.toLowerCase())
+                            ? stripTimeS(unitLeft.toLowerCase())
+                            : null;
+                    },
+                    ast: {
+                        type: 'select',
+                        as_struct_val: null,
+                        distinct: null,
+                        columns: [
+                            {
+                                expr: {
+                                    type: 'column_ref',
+                                    table: null,
+                                    column: '*',
+                                },
+                                as: null,
+                            },
+                        ],
+                        from: [
+                            {
+                                db: null,
+                                table: 'transactions',
+                                as: null,
+                                operator: null,
+                            },
+                        ],
+                        for_sys_time_as_of: null,
+                        where: {
+                            type: 'binary_expr',
+                            operator: 'AND',
+                            left: {
+                                type: 'binary_expr',
+                                operator: '>=',
+                                left: {
+                                    type: 'column_ref',
+                                    table: null,
+                                    column: {
+                                        expr: {
+                                            type: 'default',
+                                            value: 'transaction_date',
+                                        },
+                                        offset: [],
+                                    },
+                                    collate: null,
+                                },
+                                right: {
+                                    type: 'function',
+                                    name: {
+                                        name: [],
+                                        schema: {
+                                            type: 'default',
+                                            value: 'TIMESTAMP_SUB',
+                                        },
+                                    },
+                                    args: {
+                                        type: 'expr_list',
+                                        value: [
+                                            {
+                                                type: 'function',
+                                                name: {
+                                                    name: [
+                                                        {
+                                                            type: 'default',
+                                                            value: 'CURRENT_DATE',
+                                                        },
+                                                    ],
+                                                },
+                                                args: {
+                                                    type: 'expr_list',
+                                                    value: [],
+                                                },
+                                                over: null,
+                                            },
+                                            {
+                                                type: 'interval',
+                                                expr: {
+                                                    type: 'number',
+                                                    value: 80,
+                                                },
+                                                unit: 'day',
+                                            },
+                                        ],
+                                    },
+                                    over: null,
+                                },
+                            },
+                            right: {
+                                type: 'binary_expr',
+                                operator: '<',
+                                left: {
+                                    type: 'column_ref',
+                                    table: null,
+                                    column: {
+                                        expr: {
+                                            type: 'default',
+                                            value: 'transaction_date',
+                                        },
+                                        offset: [],
+                                    },
+                                    collate: null,
+                                },
+                                right: {
+                                    type: 'function',
+                                    name: {
+                                        name: [],
+                                        schema: {
+                                            type: 'default',
+                                            value: 'TIMESTAMP_SUB',
+                                        },
+                                    },
+                                    args: {
+                                        type: 'expr_list',
+                                        value: [
+                                            {
+                                                type: 'function',
+                                                name: {
+                                                    name: [
+                                                        {
+                                                            type: 'default',
+                                                            value: 'CURRENT_DATE',
+                                                        },
+                                                    ],
+                                                },
+                                                args: {
+                                                    type: 'expr_list',
+                                                    value: [],
+                                                },
+                                                over: null,
+                                            },
+                                            {
+                                                type: 'interval',
+                                                expr: {
+                                                    type: 'number',
+                                                    value: 40,
+                                                },
+                                                unit: 'day',
+                                            },
+                                        ],
+                                    },
+                                    over: null,
+                                },
+                            },
+                        },
+                        with: null,
+                        groupby: null,
+                        having: null,
+                        qualify: null,
+                        orderby: null,
+                        limit: null,
+                        window: null,
+                        _orderby: null,
+                        _limit: null,
+                    },
+                },
             ],
             mysql: [
                 {
@@ -8151,7 +8349,7 @@ function generateWhereChecker(astWhere) {
  * Function that takes in a field value and generates an ast
  * that wraps it in a LOWER() function
  */
-function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
+function fieldColumnToLowerCaseAst(field, db, isColumnRef, table) {
     switch (db) {
         case 'redshift':
             return {
@@ -8170,7 +8368,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: {
                                     expr: {
                                         type: 'default',
@@ -8202,7 +8400,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: field,
                             }
                             : {
@@ -8228,7 +8426,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: field,
                             }
                             : {
@@ -8256,7 +8454,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: field,
                             }
                             : {
@@ -8284,7 +8482,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 db: null,
                                 schema: null,
                                 column: field,
@@ -8317,7 +8515,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: {
                                     expr: {
                                         type: 'default',
@@ -8368,6 +8566,9 @@ function lowerFunctionToField(lower, db) {
  * Function that extracts a field value
  */
 function getFieldFromExpression(expr, databaseType) {
+    if (typeof expr === 'string') {
+        return expr;
+    }
     return (expr.column?.expr?.value ||
         expr.column ||
         expr.args?.value?.[1]?.expr?.column ||
@@ -8390,6 +8591,31 @@ function getFieldFromExpression(expr, databaseType) {
         expr.args?.source?.column ||
         expr.value);
 }
+/**
+ * Function that extracts a table
+ */
+function getTableFromExpression(expr, databaseType) {
+    return (expr.column?.expr?.table ||
+        expr.args?.value?.[1]?.expr?.table ||
+        (databaseType === 'mssql'
+            ? (expr.args?.value?.[1]?.table ?? expr.args.value?.[0]?.table)
+            : null) ||
+        expr.args?.value?.[1]?.args?.value?.[0]?.column?.expr?.table ||
+        expr.args?.value?.[0]?.value?.expr?.table ||
+        expr.args?.value?.[1]?.column?.expr?.table ||
+        expr.args?.value?.[0]?.column?.expr?.table ||
+        (expr.name?.schema?.value !== 'DATETIME_TRUNC' // BigQuery edge case
+            ? expr.args?.value?.[1]?.table
+            : null) ||
+        (expr.args?.value?.[1]?.type === 'double_quote_string'
+            ? expr.args?.value?.[1]?.table
+            : null) ||
+        expr.args?.value?.[0]?.table ||
+        expr.args?.value?.[0]?.table ||
+        expr.args?.source?.column?.expr?.table ||
+        expr.args?.source?.table ||
+        expr.table);
+}
 /**
  * @param ast
  * @param client
@@ -8504,50 +8730,18 @@ const astToFilter = (ast, db, columns) => {
     if (!left || !operator || !right) {
         return null;
     }
-    let field, leftExpr;
+    let leftExpr;
     // First, determine which column field is being referenced
     // The location of the field in the ast tree varies by database type and filter type
-    switch (db) {
-        case 'redshift':
-        case 'postgresql':
-        case 'clickhouse':
-        case 'mssql':
-            leftExpr = left;
-            while (leftExpr.type === 'binary_expr') {
-                leftExpr = leftExpr.left;
-            }
-            switch (leftExpr.type) {
-                case 'function':
-                    field =
-                        leftExpr.args?.value[1]?.column?.expr?.value ??
-                            leftExpr.args?.value[0]?.column?.expr?.value ??
-                            lowerFunctionToField(leftExpr, db) ??
-                            getFieldFromExpression(leftExpr, db);
-                    break;
-                default:
-                    field = getFieldFromExpression(leftExpr, db);
-                    if (!field) {
-                        console.error('Could not determine field: ', leftExpr);
-                        return null;
-                    }
-            }
-            break;
-        case 'snowflake':
-        case 'bigquery':
-        case 'mysql':
-            leftExpr = left;
-            while (leftExpr.type === 'binary_expr') {
-                leftExpr = leftExpr.left;
-            }
-            field = getFieldFromExpression(leftExpr, db);
-            if (!field) {
-                console.error('Could not determine field: ', leftExpr);
-                return null;
-            }
-            break;
-        default:
-            console.error('Unknown database source: ', db);
-            return null;
+    leftExpr = left;
+    while (leftExpr.type === 'binary_expr') {
+        leftExpr = leftExpr.left;
+    }
+    const field = getFieldFromExpression(leftExpr, db);
+    const table = getTableFromExpression(leftExpr, db);
+    if (!field) {
+        console.error('Could not determine field: ', leftExpr);
+        return null;
     }
     if (!field) {
         console.error('Could not determine field: ', leftExpr);
@@ -8616,7 +8810,7 @@ const astToFilter = (ast, db, columns) => {
     }
     // If columns are provided, look for the field in columns and assign the correct type
     if (columns && fieldType !== Filter_1.FieldType.Null) {
-        const column = columns.find((col) => col.field === field);
+        const column = columns.find((col) => col.field === field && (!col.table || !table || col.table === table));
         if (column) {
             if ((0, columnProcessing_1.isDateType)(column.fieldType)) {
                 fieldType = Filter_1.FieldType.Date;
@@ -8712,6 +8906,7 @@ const astToFilter = (ast, db, columns) => {
                 fieldType: Filter_1.FieldType.String,
                 operator: mappedOperator,
                 value: (lowerFunctionToField(right, db) ?? '').replaceAll('%', ''),
+                table,
             };
         case Filter_1.InternalFilterType.StringInFilter:
             return {
@@ -8720,6 +8915,7 @@ const astToFilter = (ast, db, columns) => {
                 fieldType: Filter_1.FieldType.String,
                 operator: mappedOperator,
                 value: right.value.map((v) => (lowerFunctionToField(v, db) ?? '').replaceAll('%', '')),
+                table,
             };
         case Filter_1.InternalFilterType.NumericFilter:
             return {
@@ -8728,6 +8924,7 @@ const astToFilter = (ast, db, columns) => {
                 fieldType: Filter_1.FieldType.Number,
                 operator: mappedOperator,
                 value: Number(right.value),
+                table,
             };
         case Filter_1.InternalFilterType.NullFilter:
             return {
@@ -8736,6 +8933,7 @@ const astToFilter = (ast, db, columns) => {
                 fieldType: Filter_1.FieldType.Null,
                 operator: mappedOperator,
                 value: null,
+                table,
             };
         case Filter_1.InternalFilterType.DateCustomFilter: {
             const rightExprList = right;
@@ -8750,6 +8948,7 @@ const astToFilter = (ast, db, columns) => {
                 fieldType: Filter_1.FieldType.Date,
                 operator: Filter_1.DateOperator.Custom,
                 value: values,
+                table,
             };
         }
         case Filter_1.InternalFilterType.DateComparisonFilter: {
@@ -8768,6 +8967,7 @@ const astToFilter = (ast, db, columns) => {
                             fieldType: Filter_1.FieldType.Date,
                             operator: Filter_1.DateOperator.Custom,
                             value: { startDate: right.value, endDate: right.value },
+                            table,
                         };
                     }
                     return {
@@ -8776,6 +8976,7 @@ const astToFilter = (ast, db, columns) => {
                         fieldType: Filter_1.FieldType.Date,
                         operator: numericDateComparison,
                         value: right.value,
+                        table,
                     };
                 }
             }
@@ -8793,6 +8994,7 @@ const astToFilter = (ast, db, columns) => {
                     fieldType: Filter_1.FieldType.Date,
                     operator: dateOperator,
                     value,
+                    table,
                 };
             }
             else {
@@ -8802,6 +9004,7 @@ const astToFilter = (ast, db, columns) => {
                     fieldType: Filter_1.FieldType.Date,
                     operator: Filter_1.DateOperator.Custom,
                     value: value.value,
+                    table,
                 };
             }
         }
@@ -8819,6 +9022,7 @@ const astToFilter = (ast, db, columns) => {
                 fieldType: Filter_1.FieldType.Boolean,
                 operator: mappedOperator,
                 value: value,
+                table,
             };
         }
     }
@@ -8866,7 +9070,7 @@ exports.filterTreeToAst = filterTreeToAst;
  * Deterministic function that converts Filter objects to a leaf node ast
  */
 const filterToAst = (filter, db) => {
-    const { field, operator, value } = filter;
+    const { field, operator, value, table } = filter;
     const mappedOperator = operatorMap[operator][0];
     // Generate SQL AST based on the filter type
     switch (filter.fieldType) {
@@ -8880,7 +9084,7 @@ const filterToAst = (filter, db) => {
                     return {
                         type: 'binary_expr',
                         operator: mappedOperator,
-                        left: fieldColumnToLowerCaseAst(`${field.replaceAll('%', '')}`, db, true),
+                        left: fieldColumnToLowerCaseAst(`${field.replaceAll('%', '')}`, db, true, table),
                         right: {
                             type: 'expr_list',
                             value: value.map((v) => {
@@ -8896,7 +9100,7 @@ const filterToAst = (filter, db) => {
                     return {
                         type: 'binary_expr',
                         operator: mappedOperator,
-                        left: fieldColumnToLowerCaseAst(field, db, true),
+                        left: fieldColumnToLowerCaseAst(field, db, true, table),
                         right: fieldColumnToLowerCaseAst(value, db, false),
                     };
                 case 'LIKE':
@@ -8906,7 +9110,7 @@ const filterToAst = (filter, db) => {
                     return {
                         type: 'binary_expr',
                         operator: mappedOperator,
-                        left: fieldColumnToLowerCaseAst(field, db, true),
+                        left: fieldColumnToLowerCaseAst(field, db, true, table),
                         right: fieldColumnToLowerCaseAst(`%${value.replaceAll('%', '')}%`, db, false),
                     };
                 default:
@@ -8916,7 +9120,7 @@ const filterToAst = (filter, db) => {
                     return {
                         type: 'binary_expr',
                         operator: mappedOperator,
-                        left: fieldColumnToLowerCaseAst(field, db, true),
+                        left: fieldColumnToLowerCaseAst(field, db, true, table),
                         right: fieldColumnToLowerCaseAst(value, db, false),
                     };
             }
@@ -8926,7 +9130,7 @@ const filterToAst = (filter, db) => {
                     return {
                         type: 'binary_expr',
                         operator: mappedOperator,
-                        left: { type: 'column_ref', table: null, column: field },
+                        left: { type: 'column_ref', table: table ?? null, column: field },
                         right: { type: 'number', value: Number(value) },
                     };
             }
@@ -8938,7 +9142,7 @@ const filterToAst = (filter, db) => {
                         operator: mappedOperator,
                         left: {
                             type: 'column_ref',
-                            table: null,
+                            table: table ?? null,
                             column: field,
                         },
                         right: {
@@ -8967,7 +9171,7 @@ const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: {
                                                 expr: {
                                                     type: 'default',
@@ -9026,7 +9230,7 @@ const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: field,
                                         },
                                         right: {
@@ -9066,7 +9270,7 @@ const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: field,
                                         },
                                         right: {
@@ -9131,7 +9335,7 @@ const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: field,
                                         },
                                         right: {
@@ -9165,7 +9369,7 @@ const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: {
                                                 expr: {
                                                     type: 'default',
@@ -9206,7 +9410,7 @@ const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: {
                                                 expr: {
                                                     type: 'default',
@@ -9248,7 +9452,7 @@ const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             db: null,
                                             schema: null,
                                             column: field,
@@ -9315,7 +9519,7 @@ const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -9363,7 +9567,7 @@ const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -9444,7 +9648,7 @@ const filterToAst = (filter, db) => {
                                                     },
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: field,
                                                     },
                                                 ],
@@ -9505,7 +9709,7 @@ const filterToAst = (filter, db) => {
                                                 value: [
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: field,
                                                     },
                                                     {
@@ -9576,7 +9780,7 @@ const filterToAst = (filter, db) => {
                                                         value: [
                                                             {
                                                                 type: 'column_ref',
-                                                                table: null,
+                                                                table: table ?? null,
                                                                 column: field,
                                                             },
                                                         ],
@@ -9635,7 +9839,7 @@ const filterToAst = (filter, db) => {
                                                         value: [
                                                             {
                                                                 type: 'column_ref',
-                                                                table: null,
+                                                                table: table ?? null,
                                                                 column: field,
                                                             },
                                                         ],
@@ -9724,7 +9928,7 @@ const filterToAst = (filter, db) => {
                                                 value: [
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: {
                                                             expr: {
                                                                 type: 'default',
@@ -9800,7 +10004,7 @@ const filterToAst = (filter, db) => {
                                                     },
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: {
                                                             expr: {
                                                                 type: 'default',
@@ -9870,7 +10074,7 @@ const filterToAst = (filter, db) => {
                                                         },
                                                         {
                                                             type: 'column_ref',
-                                                            table: null,
+                                                            table: table ?? null,
                                                             column: {
                                                                 expr: {
                                                                     type: 'default',
@@ -9940,7 +10144,7 @@ const filterToAst = (filter, db) => {
                                                     },
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: {
                                                             expr: {
                                                                 type: 'default',
@@ -10014,7 +10218,7 @@ const filterToAst = (filter, db) => {
                                                     },
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         db: null,
                                                         schema: null,
                                                         column: field,
@@ -10081,7 +10285,7 @@ const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10139,7 +10343,7 @@ const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10203,7 +10407,7 @@ const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10242,7 +10446,7 @@ const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10287,7 +10491,7 @@ const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10354,7 +10558,7 @@ const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10427,7 +10631,7 @@ const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10466,7 +10670,7 @@ const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10511,7 +10715,7 @@ const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10551,7 +10755,7 @@ const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10597,7 +10801,7 @@ const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10638,7 +10842,7 @@ const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10685,7 +10889,7 @@ const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 db: null,
                                                 schema: null,
                                                 column: field,
@@ -10742,7 +10946,7 @@ const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 db: null,
                                                 schema: null,
                                                 column: field,
@@ -10809,7 +11013,7 @@ const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '=',
@@ -10820,7 +11024,7 @@ const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '>',
@@ -10831,7 +11035,7 @@ const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '>=',
@@ -10842,7 +11046,7 @@ const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '<',
@@ -10853,7 +11057,7 @@ const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '<=',
@@ -10864,7 +11068,7 @@ const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '<>',
@@ -10880,7 +11084,7 @@ const filterToAst = (filter, db) => {
             return {
                 type: 'binary_expr',
                 operator: mappedOperator,
-                left: { type: 'column_ref', table: null, column: field },
+                left: { type: 'column_ref', table: table ?? null, column: field },
                 right: { type: 'null', value: null },
             };
         case Filter_1.FieldType.Boolean:
@@ -10889,7 +11093,7 @@ const filterToAst = (filter, db) => {
                 operator: mappedOperator,
                 left: {
                     type: 'column_ref',
-                    table: null,
+                    table: table ?? null,
                     column: field,
                 },
                 right: {