You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ma...@apache.org on 2018/08/21 20:45:45 UTC
[incubator-superset] branch master updated: Field names in big
query can contain only alphanumeric and underscore (#5641)
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 80e7778 Field names in big query can contain only alphanumeric and underscore (#5641)
80e7778 is described below
commit 80e777823bc4b2f71acec0fd2f0507e82f64dd22
Author: Sumedh Sakdeo <77...@users.noreply.github.com>
AuthorDate: Tue Aug 21 13:45:42 2018 -0700
Field names in big query can contain only alphanumeric and underscore (#5641)
* Field names in big query can contain only alphanumeric and underscore
* bad quote
* better place for mutating labels
* lint
* bug fix thanks to mistercrunch
* lint
* lint again
---
.gitignore | 1 +
superset/db_engine_specs.py | 16 ++++++++++++++++
superset/viz.py | 8 ++++++--
tests/viz_tests.py | 16 +++++++++++++++-
4 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 11929a9..66bdf28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.pyc
+*.swp
yarn-error.log
_modules
superset/assets/coverage/*
diff --git a/superset/db_engine_specs.py b/superset/db_engine_specs.py
index fe408ce..13eb695 100644
--- a/superset/db_engine_specs.py
+++ b/superset/db_engine_specs.py
@@ -426,6 +426,10 @@ class BaseEngineSpec(object):
return df.rename(index=str, columns=rename_cols)
+ @staticmethod
+ def mutate_expression_label(label):
+ return label
+
class PostgresBaseEngineSpec(BaseEngineSpec):
""" Abstract class for Postgres 'like' databases """
@@ -1414,6 +1418,18 @@ class BQEngineSpec(BaseEngineSpec):
data = [r.values() for r in data]
return data
+ @staticmethod
+ def mutate_expression_label(label):
+ mutated_label = re.sub('[^\w]+', '_', label)
+ if not re.match('^[a-zA-Z_]+.*', mutated_label):
+ raise SupersetTemplateException('BigQuery field_name used is invalid {}, '
+ 'should start with a letter or '
+ 'underscore'.format(mutated_label))
+ if len(mutated_label) > 128:
+ raise SupersetTemplateException('BigQuery field_name {}, should be atmost '
+ '128 characters'.format(mutated_label))
+ return mutated_label
+
@classmethod
def _get_fields(cls, cols):
"""
diff --git a/superset/viz.py b/superset/viz.py
index 4c2490c..9113b03 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -108,7 +108,10 @@ class BaseViz(object):
if not isinstance(val, list):
val = [val]
for o in val:
- self.metric_dict[self.get_metric_label(o)] = o
+ label = self.get_metric_label(o)
+ if isinstance(o, dict):
+ o['label'] = label
+ self.metric_dict[label] = o
# Cast to list needed to return serializable object in py3
self.all_metrics = list(self.metric_dict.values())
@@ -118,7 +121,8 @@ class BaseViz(object):
if isinstance(metric, string_types):
return metric
if isinstance(metric, dict):
- return metric.get('label')
+ return self.datasource.database.db_engine_spec.mutate_expression_label(
+ metric.get('label'))
@staticmethod
def handle_js_int_overflow(data):
diff --git a/tests/viz_tests.py b/tests/viz_tests.py
index 3cc2f86..ccca026 100644
--- a/tests/viz_tests.py
+++ b/tests/viz_tests.py
@@ -122,6 +122,20 @@ class BaseVizTestCase(unittest.TestCase):
class TableVizTestCase(unittest.TestCase):
+
+ class DBEngineSpecMock:
+ @staticmethod
+ def mutate_expression_label(label):
+ return label
+
+ class DatabaseMock:
+ def __init__(self):
+ self.db_engine_spec = TableVizTestCase.DBEngineSpecMock()
+
+ class DatasourceMock:
+ def __init__(self):
+ self.database = TableVizTestCase.DatabaseMock()
+
def test_get_data_applies_percentage(self):
form_data = {
'percent_metrics': [{
@@ -137,7 +151,7 @@ class TableVizTestCase(unittest.TestCase):
'column': {'column_name': 'value1', 'type': 'DOUBLE'},
}, 'count', 'avg__C'],
}
- datasource = Mock()
+ datasource = TableVizTestCase.DatasourceMock()
raw = {}
raw['SUM(value1)'] = [15, 20, 25, 40]
raw['avg__B'] = [10, 20, 5, 15]