From dc23b4895b6d6ba0760ccac3f34297900fc24119 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <gabe.lyons@airbnb.com>
Date: Fri, 11 May 2018 15:43:52 -0700
Subject: [PATCH] expanding regex for automated columns (#4990)

---
 .../explore/components/MetricsControl_spec.jsx           | 9 +++++++++
 superset/assets/src/explore/constants.js                 | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/superset/assets/spec/javascripts/explore/components/MetricsControl_spec.jsx b/superset/assets/spec/javascripts/explore/components/MetricsControl_spec.jsx
index e52161a89c7fe..5d2e1e3342ace 100644
--- a/superset/assets/spec/javascripts/explore/components/MetricsControl_spec.jsx
+++ b/superset/assets/spec/javascripts/explore/components/MetricsControl_spec.jsx
@@ -257,6 +257,15 @@ describe('MetricsControl', () => {
         },
         'sum',
       )).to.be.false;
+
+      expect(!!wrapper.instance().selectFilterOption(
+        {
+          metric_name: 'sum__value',
+          optionName: 'sum__value',
+          expression: 'SUM("table"."value")',
+        },
+        'sum',
+      )).to.be.false;
     });
 
     it('filters out metrics if the input begins with an aggregate', () => {
diff --git a/superset/assets/src/explore/constants.js b/superset/assets/src/explore/constants.js
index 52395305d7d09..7b57cbaa76f28 100644
--- a/superset/assets/src/explore/constants.js
+++ b/superset/assets/src/explore/constants.js
@@ -32,5 +32,5 @@ export const HAVING_OPERATORS = [
 ];
 export const MULTI_OPERATORS = [OPERATORS.in, OPERATORS['not in']];
 
-export const sqlaAutoGeneratedMetricRegex = /^(LONG|DOUBLE|FLOAT)?(SUM|AVG|MAX|MIN|COUNT)\([A-Z_][A-Z0-9_]*\)$/i;
-export const druidAutoGeneratedMetricRegex = /^(LONG|DOUBLE|FLOAT)?(SUM|MAX|MIN|COUNT)\([A-Z_][A-Z0-9_]*\)$/i;
+export const sqlaAutoGeneratedMetricRegex = /^(LONG|DOUBLE|FLOAT)?(SUM|AVG|MAX|MIN|COUNT)\([A-Z0-9_."]*\)$/i;
+export const druidAutoGeneratedMetricRegex = /^(LONG|DOUBLE|FLOAT)?(SUM|MAX|MIN|COUNT)\([A-Z0-9_."]*\)$/i;