Merge pull request #1526 from someones/fix_es_get_query_mappings

[ElasticSearch] Fix for #1521
getredash · Jan 16, 2017 · 8d1b5b4 · 8d1b5b4
2 parents e586f99 + 9d36d39
commit 8d1b5b4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/redash/query_runner/elasticsearch.py b/redash/query_runner/elasticsearch.py
@@ -119,12 +119,13 @@ def _get_mappings(self, url):
         return mappings, error
 
     def _get_query_mappings(self, url):
-        mappings, error = self._get_mappings(url)
+        mappings_data, error = self._get_mappings(url)
         if error:
-            return mappings, error
+            return mappings_data, error
 
-        for index_name in mappings:
-            index_mappings = mappings[index_name]
+        mappings = {}
+        for index_name in mappings_data:
+            index_mappings = mappings_data[index_name]
             for m in index_mappings.get("mappings", {}):
                 for property_name in index_mappings["mappings"][m]["properties"]:
                     property_data = index_mappings["mappings"][m]["properties"][property_name]