From 611dd7a8f63bc4105fd0b5c10c6a8efd6eae6fca Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Thu, 16 Jul 2020 10:34:50 +0300
Subject: [PATCH] fix: make __time an ok column name in SQL Lab (#10336)

---
 superset-frontend/spec/javascripts/sqllab/fixtures.ts    | 5 +++++
 .../src/SqlLab/components/ExploreResultsButton.jsx       | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/fixtures.ts b/superset-frontend/spec/javascripts/sqllab/fixtures.ts
index 0cdcb09cdd..d1cedf1aac 100644
--- a/superset-frontend/spec/javascripts/sqllab/fixtures.ts
+++ b/superset-frontend/spec/javascripts/sqllab/fixtures.ts
@@ -321,6 +321,11 @@ export const queryWithBadColumns = {
         name: '_TIMESTAMP',
         type: 'TIMESTAMP',
       },
+      {
+        is_date: true,
+        name: '__TIME',
+        type: 'TIMESTAMP',
+      },
       {
         is_date: true,
         name: '__TIMESTAMP',
diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
index 9fba23868c..8ecec6fa56 100644
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
@@ -104,7 +104,7 @@ class ExploreResultsButton extends React.PureComponent {
   getInvalidColumns() {
     const re1 = /^[A-Za-z_]\w*$/; // starts with char or _, then only alphanum
     const re2 = /__\d+$/; // does not finish with __ and then a number which screams dup col name
-    const re3 = /^__/; // is not a reserved column name e.g. __timestamp
+    const re3 = /^__timestamp/i; // is not a reserved temporal column alias
 
     return this.props.query.results.selected_columns
       .map(col => col.name)
@@ -199,9 +199,10 @@ class ExploreResultsButton extends React.PureComponent {
           <strong>AS my_alias</strong>
         </code>
         ){' '}
-        {t(`limited to alphanumeric characters and underscores. Column aliases starting
-          with double underscores or ending with double underscores followed by a
-          numeric value are not allowed for reasons discussed in Github issue #5739.
+        {t(`limited to alphanumeric characters and underscores. The alias "__timestamp"
+          used as for the temporal expression and column aliases ending with
+          double underscores followed by a numeric value are not allowed for reasons
+          discussed in Github issue #5739.
           `)}
       </div>
     );