mirror of
https://github.com/apache/superset.git
synced 2024-09-12 00:29:39 -04:00
fix(sql-lab): relax column name restrictions (#10816)
This commit is contained in:
parent
e6a4808cb7
commit
8a9ae811d0
@ -94,13 +94,7 @@ describe('ExploreResultsButton', () => {
|
||||
});
|
||||
|
||||
const badCols = wrapper.instance().getInvalidColumns();
|
||||
expect(badCols).toEqual([
|
||||
'COUNT(*)',
|
||||
'1',
|
||||
'123',
|
||||
'CASE WHEN 1=1 THEN 1 ELSE 0 END',
|
||||
'__TIMESTAMP',
|
||||
]);
|
||||
expect(badCols).toEqual(['my_dupe_col__2', '__timestamp', '__TIMESTAMP']);
|
||||
|
||||
const msgWrapper = shallow(wrapper.instance().renderInvalidColumnMessage());
|
||||
expect(msgWrapper.find('div')).toHaveLength(1);
|
||||
|
@ -326,6 +326,16 @@ export const queryWithBadColumns = {
|
||||
name: '__TIME',
|
||||
type: 'TIMESTAMP',
|
||||
},
|
||||
{
|
||||
is_date: false,
|
||||
name: 'my_dupe_col__2',
|
||||
type: 'STRING',
|
||||
},
|
||||
{
|
||||
is_date: true,
|
||||
name: '__timestamp',
|
||||
type: 'TIMESTAMP',
|
||||
},
|
||||
{
|
||||
is_date: true,
|
||||
name: '__TIMESTAMP',
|
||||
|
@ -102,13 +102,12 @@ class ExploreResultsButton extends React.PureComponent {
|
||||
.asSeconds();
|
||||
}
|
||||
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 = /^__timestamp/i; // is not a reserved temporal column alias
|
||||
const re1 = /__\d+$/; // duplicate column name pattern
|
||||
const re2 = /^__timestamp/i; // reserved temporal column alias
|
||||
|
||||
return this.props.query.results.selected_columns
|
||||
.map(col => col.name)
|
||||
.filter(col => !re1.test(col) || re2.test(col) || re3.test(col));
|
||||
.filter(col => re1.test(col) || re2.test(col));
|
||||
}
|
||||
datasourceName() {
|
||||
const { query } = this.props;
|
||||
@ -193,17 +192,11 @@ class ExploreResultsButton extends React.PureComponent {
|
||||
<code>
|
||||
<strong>{invalidColumns.join(', ')} </strong>
|
||||
</code>
|
||||
{t('cannot be used as a column name. Please use aliases (as in ')}
|
||||
<code>
|
||||
SELECT count(*)
|
||||
<strong>AS my_alias</strong>
|
||||
</code>
|
||||
){' '}
|
||||
{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.
|
||||
`)}
|
||||
{t(`cannot be used as a column name. The column name/alias "__timestamp"
|
||||
is reserved for the main temporal expression, and column aliases ending with
|
||||
double underscores followed by a numeric value (e.g. "my_col__1") are reserved
|
||||
for deduplicating duplicate column names. Please use aliases to rename the
|
||||
invalid column names.`)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user