From eeac3038c87adf3c636e5ab0312d26c190b5f3c1 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 19 Mar 2018 11:55:17 -0700
Subject: [PATCH 1/2] CRUD hints around SQL expressions

---
 superset/connectors/sqla/views.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/superset/connectors/sqla/views.py b/superset/connectors/sqla/views.py
index 8398cbcbdd135..829a8a7e16034 100644
--- a/superset/connectors/sqla/views.py
+++ b/superset/connectors/sqla/views.py
@@ -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/'
@@ -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)' "

From ecf1b04ba466df7846a35805beb28eeec1513e58 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Wed, 21 Mar 2018 17:01:17 -0700
Subject: [PATCH 2/2] Addressing comment

---
 superset/connectors/sqla/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/connectors/sqla/views.py b/superset/connectors/sqla/views.py
index 829a8a7e16034..b6674750339ca 100644
--- a/superset/connectors/sqla/views.py
+++ b/superset/connectors/sqla/views.py
@@ -57,7 +57,7 @@ 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, non-aggregating SQL expression as supported by the '
+            '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 '