From 244cb7977444e17d36e9aeb2d5b9cd0990c24df2 Mon Sep 17 00:00:00 2001
From: Nybkox <nybkox@gmail.com>
Date: Tue, 11 Feb 2025 09:10:48 +0100
Subject: [PATCH] fix: conditionally remove table aliases from column
 expressions

---
 packages/datalib/src/GridDisplay.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts
index 317d9151c..d6eb21e46 100644
--- a/packages/datalib/src/GridDisplay.ts
+++ b/packages/datalib/src/GridDisplay.ts
@@ -253,7 +253,12 @@ export abstract class GridDisplay {
             orCondition.conditions.push(
               _.cloneDeepWith(condition, (expr: Expression) => {
                 if (expr.exprType == 'placeholder') {
-                  return this.createColumnExpression(column, {}, undefined, 'filter');
+                  return this.createColumnExpression(
+                    column,
+                    !this.dialect.omitTableAliases ? { alias: 'basetbl' } : undefined,
+                    undefined,
+                    'filter'
+                  );
                 }
               })
             );
@@ -599,7 +604,14 @@ export abstract class GridDisplay {
         name: _.pick(name, ['schemaName', 'pureName']),
         ...(!this.dialect.omitTableAliases && { alias: 'basetbl' }),
       },
-      columns: columns.map(col => this.createColumnExpression(col, {}, undefined, 'view')),
+      columns: columns.map(col =>
+        this.createColumnExpression(
+          col,
+          !this.dialect.omitTableAliases ? { alias: 'basetbl' } : undefined,
+          undefined,
+          'view'
+        )
+      ),
       orderBy: this.driver?.requiresDefaultSortCriteria
         ? [
             {