[superset] branch master updated: fix: missing key when verifying adhoc filters in merge_extra_filters (#12620)

[yj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yjc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new e7def7e  fix: missing key when verifying adhoc filters in merge_extra_filters (#12620)
e7def7e is described below

commit e7def7e0e25caf09fbe33f8019db413686e349bc
Author: bryanck <br...@gmail.com>
AuthorDate: Wed Jan 20 14:22:05 2021 -0800

    fix: missing key when verifying adhoc filters in merge_extra_filters (#12620)
    
    Co-authored-by: Bryan Keller <bk...@netflix.com>
---
 superset/utils/core.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset/utils/core.py b/superset/utils/core.py
index 084b513..9b1590b 100644
--- a/superset/utils/core.py
+++ b/superset/utils/core.py
@@ -1025,8 +1025,8 @@ def merge_extra_filters(  # pylint: disable=too-many-branches
         for existing in adhoc_filters:
             if (
                 existing["expressionType"] == "SIMPLE"
-                and existing["comparator"] is not None
-                and existing["subject"] is not None
+                and existing.get("comparator") is not None
+                and existing.get("subject") is not None
             ):
                 existing_filters[get_filter_key(existing)] = existing["comparator"]