QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[explore flow] handling duplicated column aliases (#5778)

Browse Source 
* [explore flow] handling duplicated column aliases

closes #5739

* lint
This commit is contained in:
Maxime Beauchemin
2018-09-18 23:17:38 -07:00
committed by GitHub
parent 7448d07e54
commit 75bc501146
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
superset/assets/src/SqlLab/components/ExploreResultsButton.jsx
View File

@@ -58,7 +58,7 @@ class ExploreResultsButton extends React.PureComponent {
title: t('Explore'),
body: msg,
actions: [
Dialog.DefaultAction('Ok', () => {}, 'btn-danger'),
Dialog.DefaultAction('Ok', () => {}, 'btn-primary'),
],
bsSize: 'large',
bsStyle: 'warning',
@@ -81,8 +81,11 @@ class ExploreResultsButton extends React.PureComponent {
return moment.duration(this.props.query.endDttm - this.props.query.startDttm).asSeconds();
}
getInvalidColumns() {
const re = /^[A-Za-z_]\w*$/;
return this.props.query.results.columns.map(col => col.name).filter(col => !re.test(col));
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
return this.props.query.results.columns.map(col => col.name)
.filter(col => !re1.test(col) || re2.test(col));
}
datasourceName() {
const { query } = this.props;
@@ -155,7 +158,9 @@ class ExploreResultsButton extends React.PureComponent {
<code>SELECT count(*)
<strong>AS my_alias</strong>
</code>){' '}
{t('limited to alphanumeric characters and underscores')}
{t('limited to alphanumeric characters and underscores. Column aliases ending with ' +
'double underscores followed by a numeric value are not allowed for reasons ' +
'discussed in Github issue #5739.')}
</div>);
}
render() {