From 8738db9b9863a68870b65d7105b1b46baa0a6031 Mon Sep 17 00:00:00 2001
From: Jichao Sun <4977515+JichaoS@users.noreply.github.com>
Date: Mon, 18 Mar 2024 21:54:26 -0700
Subject: [PATCH] Use timestampcast on all comparisons

---
 .../cubejs-schema-compiler/src/adapter/BaseQuery.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
index 9355749c6f..b43c9aa38a 100644
--- a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
+++ b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
@@ -1070,27 +1070,27 @@ export class BaseQuery {
   }
 
   timeRangeFilter(dimensionSql, fromTimeStampParam, toTimeStampParam) {
-    return `${dimensionSql} >= ${fromTimeStampParam} AND ${dimensionSql} <= ${toTimeStampParam}`;
+    return `${timeStampCast(dimensionSql)} >= ${fromTimeStampParam} AND ${timeStampCast(dimensionSql)} <= ${toTimeStampParam}`;
   }
 
   timeNotInRangeFilter(dimensionSql, fromTimeStampParam, toTimeStampParam) {
-    return `${dimensionSql} < ${fromTimeStampParam} OR ${dimensionSql} > ${toTimeStampParam}`;
+    return `${timeStampCast(dimensionSql)} < ${fromTimeStampParam} OR ${timeStampCast(dimensionSql)} > ${toTimeStampParam}`;
   }
 
   beforeDateFilter(dimensionSql, timeStampParam) {
-    return `${dimensionSql} < ${timeStampParam}`;
+    return `${timeStampCast(dimensionSql)} < ${timeStampParam}`;
   }
 
   beforeOrOnDateFilter(dimensionSql, timeStampParam) {
-    return `${dimensionSql} <= ${timeStampParam}`;
+    return `${timeStampCast(dimensionSql)} <= ${timeStampParam}`;
   }
 
   afterDateFilter(dimensionSql, timeStampParam) {
-    return `${dimensionSql} > ${timeStampParam}`;
+    return `${timeStampCast(dimensionSql)} > ${timeStampParam}`;
   }
 
   afterOrOnDateFilter(dimensionSql, timeStampParam) {
-    return `${dimensionSql} >= ${timeStampParam}`;
+    return `${timeStampCast(dimensionSql)} >= ${timeStampParam}`;
   }
 
   timeStampCast(value) {