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

Jump to bottom

Sort schema columns alphabetically #4595

Merged
merged 8 commits into from
Feb 9, 2020
Merged

Sort schema columns alphabetically #4595

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f6b6431
Adds logic to sort column names returned by the query runner. If `sor…
susodapop Jan 27, 2020
3d14805
Moves table name sorting from model code into schema handler.
susodapop Jan 27, 2020
8a54dd4
Moves token sorting into the model code.
susodapop Jan 27, 2020
a5fe37f
Replaces single-quotes with double-quotes for consistency.
susodapop Jan 27, 2020
ccc909a
Applies black formatting to changes.
susodapop Jan 28, 2020
9c5dd99
Moves schema sort into separate method. Adds test.
susodapop Jan 28, 2020
a31f901
Fixes output schema variable name. Without this the sorted cache is n…
susodapop Jan 29, 2020
969ba81
Adds test case guaranteeing that the model actually _uses_ the schema…
susodapop Jan 29, 2020
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
12 changes: 11 additions & 1 deletion redash/handlers/data_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def get(self, data_source_id):
response = {}

try:
response["schema"] = data_source.get_schema(refresh)
schema = data_source.get_schema(refresh)
except NotSupported:
response["error"] = {
"code": 1,
Expand All @@ -199,6 +199,16 @@ def get(self, data_source_id):
except Exception:
response["error"] = {"code": 2, "message": "Error retrieving schema."}

try:
sorted_schema = [{"name": i['name'], "columns": sorted(i['columns'])}
for i in sorted(schema, key=lambda x: x['name'])]
response["schema"] = sorted_schema
susodapop marked this conversation as resolved.
Show resolved Hide resolved
except Exception:
logging.exception(
"Error sorting schema columns for data_source {}"\
.format(data_source_id))
response['schema'] = schema

return response


Expand Down
4 changes: 1 addition & 3 deletions redash/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,7 @@ def get_schema(self, refresh=False):

if cache is None:
query_runner = self.query_runner
schema = sorted(
query_runner.get_schema(get_stats=refresh), key=lambda t: t["name"]
)
schema = query_runner.get_schema(get_stats=refresh)
susodapop marked this conversation as resolved.
Show resolved Hide resolved

redis_connection.set(self._schema_key, json_dumps(schema))
else:
Expand Down