@quillsql/react 2.13.43 → 2.13.44

package/dist/esm/utils/astFilterProcessing.js

@@ -6597,8 +6597,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()));
                         }
@@ -7152,6 +7154,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: [
                 {
@@ -8147,7 +8344,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 {
@@ -8166,7 +8363,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: {
                                     expr: {
                                         type: 'default',
@@ -8198,7 +8395,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: field,
                             }
                             : {
@@ -8224,7 +8421,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: field,
                             }
                             : {
@@ -8252,7 +8449,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: field,
                             }
                             : {
@@ -8280,7 +8477,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 db: null,
                                 schema: null,
                                 column: field,
@@ -8313,7 +8510,7 @@ function fieldColumnToLowerCaseAst(field, db, isColumnRef) {
                         isColumnRef
                             ? {
                                 type: 'column_ref',
-                                table: null,
+                                table: table ?? null,
                                 column: {
                                     expr: {
                                         type: 'default',
@@ -8364,6 +8561,9 @@ function lowerFunctionToField(lower, db) {
  * Function that extracts a field value
  */
 export function getFieldFromExpression(expr, databaseType) {
+    if (typeof expr === 'string') {
+        return expr;
+    }
     return (expr.column?.expr?.value ||
         expr.column ||
         expr.args?.value?.[1]?.expr?.column ||
@@ -8386,6 +8586,31 @@ export function getFieldFromExpression(expr, databaseType) {
         expr.args?.source?.column ||
         expr.value);
 }
+/**
+ * Function that extracts a table
+ */
+export 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
@@ -8499,50 +8724,18 @@ export 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);
@@ -8611,7 +8804,7 @@ export const astToFilter = (ast, db, columns) => {
     }
     // If columns are provided, look for the field in columns and assign the correct type
     if (columns && fieldType !== 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 (isDateType(column.fieldType)) {
                 fieldType = FieldType.Date;
@@ -8707,6 +8900,7 @@ export const astToFilter = (ast, db, columns) => {
                 fieldType: FieldType.String,
                 operator: mappedOperator,
                 value: (lowerFunctionToField(right, db) ?? '').replaceAll('%', ''),
+                table,
             };
         case InternalFilterType.StringInFilter:
             return {
@@ -8715,6 +8909,7 @@ export const astToFilter = (ast, db, columns) => {
                 fieldType: FieldType.String,
                 operator: mappedOperator,
                 value: right.value.map((v) => (lowerFunctionToField(v, db) ?? '').replaceAll('%', '')),
+                table,
             };
         case InternalFilterType.NumericFilter:
             return {
@@ -8723,6 +8918,7 @@ export const astToFilter = (ast, db, columns) => {
                 fieldType: FieldType.Number,
                 operator: mappedOperator,
                 value: Number(right.value),
+                table,
             };
         case InternalFilterType.NullFilter:
             return {
@@ -8731,6 +8927,7 @@ export const astToFilter = (ast, db, columns) => {
                 fieldType: FieldType.Null,
                 operator: mappedOperator,
                 value: null,
+                table,
             };
         case InternalFilterType.DateCustomFilter: {
             const rightExprList = right;
@@ -8745,6 +8942,7 @@ export const astToFilter = (ast, db, columns) => {
                 fieldType: FieldType.Date,
                 operator: DateOperator.Custom,
                 value: values,
+                table,
             };
         }
         case InternalFilterType.DateComparisonFilter: {
@@ -8763,6 +8961,7 @@ export const astToFilter = (ast, db, columns) => {
                             fieldType: FieldType.Date,
                             operator: DateOperator.Custom,
                             value: { startDate: right.value, endDate: right.value },
+                            table,
                         };
                     }
                     return {
@@ -8771,6 +8970,7 @@ export const astToFilter = (ast, db, columns) => {
                         fieldType: FieldType.Date,
                         operator: numericDateComparison,
                         value: right.value,
+                        table,
                     };
                 }
             }
@@ -8788,6 +8988,7 @@ export const astToFilter = (ast, db, columns) => {
                     fieldType: FieldType.Date,
                     operator: dateOperator,
                     value,
+                    table,
                 };
             }
             else {
@@ -8797,6 +8998,7 @@ export const astToFilter = (ast, db, columns) => {
                     fieldType: FieldType.Date,
                     operator: DateOperator.Custom,
                     value: value.value,
+                    table,
                 };
             }
         }
@@ -8814,6 +9016,7 @@ export const astToFilter = (ast, db, columns) => {
                 fieldType: FieldType.Boolean,
                 operator: mappedOperator,
                 value: value,
+                table,
             };
         }
     }
@@ -8859,7 +9062,7 @@ export const filterTreeToAst = (filterTree, db) => {
  * Deterministic function that converts Filter objects to a leaf node ast
  */
 export 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) {
@@ -8873,7 +9076,7 @@ export 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) => {
@@ -8889,7 +9092,7 @@ export 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':
@@ -8899,7 +9102,7 @@ export 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:
@@ -8909,7 +9112,7 @@ export 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),
                     };
             }
@@ -8919,7 +9122,7 @@ export 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) },
                     };
             }
@@ -8931,7 +9134,7 @@ export const filterToAst = (filter, db) => {
                         operator: mappedOperator,
                         left: {
                             type: 'column_ref',
-                            table: null,
+                            table: table ?? null,
                             column: field,
                         },
                         right: {
@@ -8960,7 +9163,7 @@ export const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: {
                                                 expr: {
                                                     type: 'default',
@@ -9019,7 +9222,7 @@ export const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: field,
                                         },
                                         right: {
@@ -9059,7 +9262,7 @@ export const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: field,
                                         },
                                         right: {
@@ -9124,7 +9327,7 @@ export const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: field,
                                         },
                                         right: {
@@ -9158,7 +9361,7 @@ export const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: {
                                                 expr: {
                                                     type: 'default',
@@ -9199,7 +9402,7 @@ export const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             column: {
                                                 expr: {
                                                     type: 'default',
@@ -9241,7 +9444,7 @@ export const filterToAst = (filter, db) => {
                                         operator: '>=',
                                         left: {
                                             type: 'column_ref',
-                                            table: null,
+                                            table: table ?? null,
                                             db: null,
                                             schema: null,
                                             column: field,
@@ -9308,7 +9511,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -9356,7 +9559,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -9437,7 +9640,7 @@ export const filterToAst = (filter, db) => {
                                                     },
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: field,
                                                     },
                                                 ],
@@ -9498,7 +9701,7 @@ export const filterToAst = (filter, db) => {
                                                 value: [
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: field,
                                                     },
                                                     {
@@ -9569,7 +9772,7 @@ export const filterToAst = (filter, db) => {
                                                         value: [
                                                             {
                                                                 type: 'column_ref',
-                                                                table: null,
+                                                                table: table ?? null,
                                                                 column: field,
                                                             },
                                                         ],
@@ -9628,7 +9831,7 @@ export const filterToAst = (filter, db) => {
                                                         value: [
                                                             {
                                                                 type: 'column_ref',
-                                                                table: null,
+                                                                table: table ?? null,
                                                                 column: field,
                                                             },
                                                         ],
@@ -9717,7 +9920,7 @@ export const filterToAst = (filter, db) => {
                                                 value: [
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: {
                                                             expr: {
                                                                 type: 'default',
@@ -9793,7 +9996,7 @@ export const filterToAst = (filter, db) => {
                                                     },
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: {
                                                             expr: {
                                                                 type: 'default',
@@ -9863,7 +10066,7 @@ export const filterToAst = (filter, db) => {
                                                         },
                                                         {
                                                             type: 'column_ref',
-                                                            table: null,
+                                                            table: table ?? null,
                                                             column: {
                                                                 expr: {
                                                                     type: 'default',
@@ -9933,7 +10136,7 @@ export const filterToAst = (filter, db) => {
                                                     },
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         column: {
                                                             expr: {
                                                                 type: 'default',
@@ -10007,7 +10210,7 @@ export const filterToAst = (filter, db) => {
                                                     },
                                                     {
                                                         type: 'column_ref',
-                                                        table: null,
+                                                        table: table ?? null,
                                                         db: null,
                                                         schema: null,
                                                         column: field,
@@ -10074,7 +10277,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10132,7 +10335,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10196,7 +10399,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10235,7 +10438,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10280,7 +10483,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10347,7 +10550,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10420,7 +10623,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10459,7 +10662,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: field,
                                             },
                                             right: {
@@ -10504,7 +10707,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10544,7 +10747,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10590,7 +10793,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10631,7 +10834,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 column: {
                                                     expr: {
                                                         type: 'default',
@@ -10678,7 +10881,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '>=',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 db: null,
                                                 schema: null,
                                                 column: field,
@@ -10735,7 +10938,7 @@ export const filterToAst = (filter, db) => {
                                             operator: '<',
                                             left: {
                                                 type: 'column_ref',
-                                                table: null,
+                                                table: table ?? null,
                                                 db: null,
                                                 schema: null,
                                                 column: field,
@@ -10802,7 +11005,7 @@ export const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '=',
@@ -10813,7 +11016,7 @@ export const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '>',
@@ -10824,7 +11027,7 @@ export const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '>=',
@@ -10835,7 +11038,7 @@ export const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '<',
@@ -10846,7 +11049,7 @@ export const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '<=',
@@ -10857,7 +11060,7 @@ export const filterToAst = (filter, db) => {
                             return {
                                 left: {
                                     column: field,
-                                    table: null,
+                                    table: table ?? null,
                                     type: 'column_ref',
                                 },
                                 operator: '<>',
@@ -10873,7 +11076,7 @@ export 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 FieldType.Boolean:
@@ -10882,7 +11085,7 @@ export const filterToAst = (filter, db) => {
                 operator: mappedOperator,
                 left: {
                     type: 'column_ref',
-                    table: null,
+                    table: table ?? null,
                     column: field,
                 },
                 right: {