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.

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

CRUD hints around SQL expressions #4645

Merged
merged 2 commits into from
Mar 26, 2018
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions superset/connectors/sqla/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ class TableColumnInlineView(CompactCRUDMixin, SupersetModelView): # noqa
'expression-defined columns in some cases. In most case '
'users should not need to alter this.'),
'expression': utils.markdown(
'a valid SQL expression as supported by the underlying backend. '
'Example: `substr(name, 1, 1)`', True),
'a valid, *non-aggregating* SQL expression as supported by the '
'underlying backend. Example: `substr(name, 1, 1)`', True),
'python_date_format': utils.markdown(Markup(
'The pattern of timestamp format, use '
'<a href="https://docs.python.org/2/library/'
Expand Down Expand Up @@ -114,8 +114,8 @@ class SqlMetricInlineView(CompactCRUDMixin, SupersetModelView): # noqa
'expression', 'table', 'd3format', 'is_restricted', 'warning_text']
description_columns = {
'expression': utils.markdown(
'a valid SQL expression as supported by the underlying backend. '
'Example: `count(DISTINCT userid)`', True),
'a valid, *aggregating* SQL expression as supported by the '
'underlying backend. Example: `count(DISTINCT userid)`', True),
'is_restricted': _('Whether the access to this metric is restricted '
'to certain roles. Only roles with the permission '
"'metric access on XXX (the name of this metric)' "
Expand Down