From 4064687f8933a18fde3c8eb4f98fb1e9f110a0a6 Mon Sep 17 00:00:00 2001
From: Krishna Gopal <kgopal@pinterest.com>
Date: Thu, 9 Mar 2023 14:15:34 -0800
Subject: [PATCH] fix: set correct index to fix time offset error (#19)

* fix: set correct index to fix time offset error
---
 superset/common/query_context_processor.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/superset/common/query_context_processor.py b/superset/common/query_context_processor.py
index 65cadba84fbd6..6df7df218d268 100644
--- a/superset/common/query_context_processor.py
+++ b/superset/common/query_context_processor.py
@@ -489,7 +489,13 @@ def processing_time_offsets(  # pylint: disable=too-many-locals,too-many-stateme
                 offset_metrics_df = offset_metrics_df.rename(columns=metrics_mapping)
 
                 # 3. set time offset for index
-                index = (get_base_axis_labels(query_object.columns) or [DTTM_ALIAS])[0]
+                index = (
+                    [
+                        *get_base_axis_labels(query_object.columns),
+                        query_object.granularity,
+                    ]
+                    or [DTTM_ALIAS]
+                )[0]
                 if not dataframe_utils.is_datetime_series(offset_metrics_df.get(index)):
                     raise QueryObjectValidationError(
                         _(