Merge pull request #1545 from hgs847825/master

[ElasticSearch] Fix: query fails when properties key is missing
getredash · Jan 26, 2017 · 84aba70 · 84aba70
2 parents a5d7351 + 3b4e306
commit 84aba70
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/redash/query_runner/elasticsearch.py b/redash/query_runner/elasticsearch.py
@@ -127,6 +127,8 @@ def _get_query_mappings(self, url):
         for index_name in mappings_data:
             index_mappings = mappings_data[index_name]
             for m in index_mappings.get("mappings", {}):
+                if "properties" not in index_mappings["mappings"][m]:
+                    continue
                 for property_name in index_mappings["mappings"][m]["properties"]:
                     property_data = index_mappings["mappings"][m]["properties"][property_name]
                     if property_name not in mappings: