diff --git a/packages/cubejs-testing/test/__snapshots__/smoke-cubesql.test.ts.snap b/packages/cubejs-testing/test/__snapshots__/smoke-cubesql.test.ts.snap
index 2705de899b213..f3cfa3b8f5d26 100644
--- a/packages/cubejs-testing/test/__snapshots__/smoke-cubesql.test.ts.snap
+++ b/packages/cubejs-testing/test/__snapshots__/smoke-cubesql.test.ts.snap
@@ -42,23 +42,23 @@ Object {
     "sql": Object {
       "query_type": "pushdown",
       "sql": Array [
-        "SELECT \\"t\\".\\"avg_t_total_\\" \\"avg_t_total_\\"
+        "SELECT \\"t\\".\\"avg_t_total_\\" \\"avg_t_total_\\" 
 FROM (
-  SELECT AVG(\\"t\\".\\"total\\") \\"avg_t_total_\\"
+  SELECT AVG(\\"t\\".\\"total\\") \\"avg_t_total_\\" 
   FROM (
     SELECT
           \\"orders\\".status \\"status\\", sum(\\"orders\\".amount) \\"total\\"
         FROM
           (
-      select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at
+      select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at, '2025-01-01'::timestamptz updated_at
       UNION ALL
-      select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at
+      select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at, '2025-01-02'::timestamptz updated_at
       UNION ALL
-      select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at
+      select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at, '2025-01-03'::timestamptz updated_at
       UNION ALL
-      select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at
+      select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at, '2025-01-04'::timestamptz updated_at
       UNION ALL
-      select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at
+      select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at, '2025-01-05'::timestamptz updated_at
       ) AS \\"orders\\"  GROUP BY 1
   ) AS \\"t\\"
 ) AS \\"t\\"",
@@ -76,7 +76,7 @@ FROM (
         "keep-alive",
       ],
       "content-length": Array [
-        "878",
+        "1068",
       ],
       "content-type": Array [
         "application/json; charset=utf-8",
@@ -104,15 +104,15 @@ Object {
       sum(\\"orders\\".amount) \\"total\\"
     FROM
       (
-  select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at
+  select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at, '2025-01-01'::timestamptz updated_at
   UNION ALL
-  select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at
+  select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at, '2025-01-02'::timestamptz updated_at
   UNION ALL
-  select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at
+  select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at, '2025-01-03'::timestamptz updated_at
   UNION ALL
-  select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at
+  select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at, '2025-01-04'::timestamptz updated_at
   UNION ALL
-  select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at
+  select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at, '2025-01-05'::timestamptz updated_at
   ) AS \\"orders\\" ",
         Array [],
       ],
@@ -128,7 +128,7 @@ Object {
         "keep-alive",
       ],
       "content-length": Array [
-        "638",
+        "828",
       ],
       "content-type": Array [
         "application/json; charset=utf-8",
@@ -149,8 +149,8 @@ Object {
 exports[`SQL API Cube SQL over HTTP sql4sql regular query with missing column 1`] = `
 Object {
   "body": Object {
-    "error": "Error: SQLCompilationError: Internal: Initial planning error: Error during planning: Invalid identifier '#foobar' for schema fields:[Orders.count, Orders.orderCount, Orders.netCollectionCompleted, Orders.arpu, Orders.refundRate, Orders.refundOrdersCount, Orders.overallOrders, Orders.totalAmount, Orders.toRemove, Orders.numberTotal, Orders.amountRank, Orders.amountReducedByStatus, Orders.statusPercentageOfTotal, Orders.amountRankView, Orders.amountRankDateMax, Orders.amountRankDate, Orders.countAndTotalAmount, Orders.createdAtMax, Orders.createdAtMaxProxy, Orders.id, Orders.status, Orders.createdAt, Orders.__user, Orders.__cubeJoinField], metadata:{}",
-    "stack": "Error: SQLCompilationError: Internal: Initial planning error: Error during planning: Invalid identifier '#foobar' for schema fields:[Orders.count, Orders.orderCount, Orders.netCollectionCompleted, Orders.arpu, Orders.refundRate, Orders.refundOrdersCount, Orders.overallOrders, Orders.totalAmount, Orders.toRemove, Orders.numberTotal, Orders.amountRank, Orders.amountReducedByStatus, Orders.statusPercentageOfTotal, Orders.amountRankView, Orders.amountRankDateMax, Orders.amountRankDate, Orders.countAndTotalAmount, Orders.createdAtMax, Orders.createdAtMaxProxy, Orders.id, Orders.status, Orders.createdAt, Orders.__user, Orders.__cubeJoinField], metadata:{}",
+    "error": "Error: SQLCompilationError: Internal: Initial planning error: Error during planning: Invalid identifier '#foobar' for schema fields:[Orders.count, Orders.orderCount, Orders.netCollectionCompleted, Orders.arpu, Orders.refundRate, Orders.refundOrdersCount, Orders.overallOrders, Orders.totalAmount, Orders.toRemove, Orders.numberTotal, Orders.amountRank, Orders.amountReducedByStatus, Orders.statusPercentageOfTotal, Orders.amountRankView, Orders.amountRankDateMax, Orders.amountRankDate, Orders.countAndTotalAmount, Orders.createdAtMax, Orders.createdAtMaxProxy, Orders.id, Orders.status, Orders.createdAt, Orders.updatedAt, Orders.__user, Orders.__cubeJoinField], metadata:{}",
+    "stack": "Error: SQLCompilationError: Internal: Initial planning error: Error during planning: Invalid identifier '#foobar' for schema fields:[Orders.count, Orders.orderCount, Orders.netCollectionCompleted, Orders.arpu, Orders.refundRate, Orders.refundOrdersCount, Orders.overallOrders, Orders.totalAmount, Orders.toRemove, Orders.numberTotal, Orders.amountRank, Orders.amountReducedByStatus, Orders.statusPercentageOfTotal, Orders.amountRankView, Orders.amountRankDateMax, Orders.amountRankDate, Orders.countAndTotalAmount, Orders.createdAtMax, Orders.createdAtMaxProxy, Orders.id, Orders.status, Orders.createdAt, Orders.updatedAt, Orders.__user, Orders.__cubeJoinField], metadata:{}",
   },
   "headers": Headers {
     Symbol(map): Object {
@@ -161,7 +161,7 @@ Object {
         "keep-alive",
       ],
       "content-length": Array [
-        "1395",
+        "1431",
       ],
       "content-type": Array [
         "application/json; charset=utf-8",
@@ -189,15 +189,15 @@ Object {
       sum(\\"orders\\".amount) \\"total\\"
     FROM
       (
-  select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at
+  select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at, '2025-01-01'::timestamptz updated_at
   UNION ALL
-  select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at
+  select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at, '2025-01-02'::timestamptz updated_at
   UNION ALL
-  select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at
+  select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at, '2025-01-03'::timestamptz updated_at
   UNION ALL
-  select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at
+  select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at, '2025-01-04'::timestamptz updated_at
   UNION ALL
-  select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at
+  select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at, '2025-01-05'::timestamptz updated_at
   ) AS \\"orders\\"  WHERE (\\"orders\\".status = $1)",
         Array [
           "foo",
@@ -215,7 +215,7 @@ Object {
         "keep-alive",
       ],
       "content-length": Array [
-        "674",
+        "864",
       ],
       "content-type": Array [
         "application/json; charset=utf-8",
@@ -344,21 +344,21 @@ Object {
     "sql": Object {
       "query_type": "pushdown",
       "sql": Array [
-        "SELECT \\"Orders\\".\\"sum_orders_total\\" \\"total\\"
+        "SELECT \\"Orders\\".\\"sum_orders_total\\" \\"total\\" 
 FROM (
   SELECT
         sum(\\"orders\\".amount) \\"sum_orders_total\\"
       FROM
         (
-    select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at
+    select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at, '2025-01-01'::timestamptz updated_at
     UNION ALL
-    select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at
+    select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at, '2025-01-02'::timestamptz updated_at
     UNION ALL
-    select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at
+    select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at, '2025-01-03'::timestamptz updated_at
     UNION ALL
-    select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at
+    select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at, '2025-01-04'::timestamptz updated_at
     UNION ALL
-    select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at
+    select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at, '2025-01-05'::timestamptz updated_at
     ) AS \\"orders\\"  WHERE ((LOWER(\\"orders\\".status) = UPPER(\\"orders\\".status)))
 ) AS \\"Orders\\"",
         Array [],
@@ -375,7 +375,7 @@ FROM (
         "keep-alive",
       ],
       "content-length": Array [
-        "816",
+        "1006",
       ],
       "content-type": Array [
         "application/json; charset=utf-8",
@@ -399,21 +399,21 @@ Object {
     "sql": Object {
       "query_type": "pushdown",
       "sql": Array [
-        "SELECT \\"Orders\\".\\"sum_orders_total\\" \\"total\\"
+        "SELECT \\"Orders\\".\\"sum_orders_total\\" \\"total\\" 
 FROM (
   SELECT
         sum(\\"orders\\".amount) \\"sum_orders_total\\"
       FROM
         (
-    select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at
+    select 1 as id, 100 as amount, 'new' status, '2024-01-01'::timestamptz created_at, '2025-01-01'::timestamptz updated_at
     UNION ALL
-    select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at
+    select 2 as id, 200 as amount, 'new' status, '2024-01-02'::timestamptz created_at, '2025-01-02'::timestamptz updated_at
     UNION ALL
-    select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at
+    select 3 as id, 300 as amount, 'processed' status, '2024-01-03'::timestamptz created_at, '2025-01-03'::timestamptz updated_at
     UNION ALL
-    select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at
+    select 4 as id, 500 as amount, 'processed' status, '2024-01-04'::timestamptz created_at, '2025-01-04'::timestamptz updated_at
     UNION ALL
-    select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at
+    select 5 as id, 600 as amount, 'shipped' status, '2024-01-05'::timestamptz created_at, '2025-01-05'::timestamptz updated_at
     ) AS \\"orders\\"  WHERE ((LOWER(\\"orders\\".status) = $1))
 ) AS \\"Orders\\"",
         Array [
@@ -432,7 +432,7 @@ FROM (
         "keep-alive",
       ],
       "content-length": Array [
-        "799",
+        "989",
       ],
       "content-type": Array [
         "application/json; charset=utf-8",