fix(chart): non existent time grain no longer breaks the application (#…

…23441) Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com> (cherry picked from commit 07a6328)
apache · May 31, 2023 · 3f13463 · 3f13463
1 parent da157a7
commit 3f13463
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
@@ -630,7 +630,7 @@ def get_time_grain_expressions(cls) -> Dict[Optional[str], str]:
         time_grain_expressions.update(grain_addon_expressions.get(cls.engine, {}))
         denylist: List[str] = current_app.config["TIME_GRAIN_DENYLIST"]
         for key in denylist:
-            time_grain_expressions.pop(key)
+            time_grain_expressions.pop(key, None)
 
         return dict(
             sorted(

diff --git a/tests/integration_tests/db_engine_specs/base_engine_spec_tests.py b/tests/integration_tests/db_engine_specs/base_engine_spec_tests.py
@@ -332,11 +332,12 @@ def is_readonly(sql: str) -> bool:
 
 def test_time_grain_denylist():
     config = app.config.copy()
-    app.config["TIME_GRAIN_DENYLIST"] = ["PT1M"]
+    app.config["TIME_GRAIN_DENYLIST"] = ["PT1M", "SQLITE_NONEXISTENT_GRAIN"]
 
     with app.app_context():
         time_grain_functions = SqliteEngineSpec.get_time_grain_expressions()
         assert not "PT1M" in time_grain_functions
+        assert not "SQLITE_NONEXISTENT_GRAIN" in time_grain_functions
 
     app.config = config