Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ElasticSearch] Fix for #1521 #1526

Merged
merged 1 commit into from Jan 16, 2017
Merged

[ElasticSearch] Fix for #1521 #1526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions redash/query_runner/elasticsearch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down