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

Refactor sql editor autocomplete (#8967)

Browse Source
This commit is contained in:
Erik Ritter
2020-01-15 13:05:56 -08:00
committed by GitHub
parent 123246fca6
commit ff9bc74c86
5 changed files with 122 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
superset/assets/src/SqlLab/components/AceEditorWrapper.jsx
View File

@@ -24,32 +24,15 @@ import 'brace/theme/github';
import 'brace/ext/language_tools';
import ace from 'brace';
import { areArraysShallowEqual } from '../../reduxUtils';
import sqlKeywords from '../utils/sqlKeywords';
import {
SCHEMA_AUTOCOMPLETE_SCORE,
TABLE_AUTOCOMPLETE_SCORE,
COLUMN_AUTOCOMPLETE_SCORE,
} from '../constants';
const langTools = ace.acequire('ace/ext/language_tools');
const SQL_KEYWORD_AUTOCOMPLETE_SCORE = 100;
const SCHEMA_AUTOCOMPLETE_SCORE = 60;
const TABLE_AUTOCOMPLETE_SCORE = 55;
const COLUMN_AUTOCOMPLETE_SCORE = 50;
const keywords =
'SELECT|INSERT|UPDATE|DELETE|FROM|WHERE|AND|OR|GROUP|BY|ORDER|LIMIT|OFFSET|HAVING|AS|CASE|' +
'WHEN|THEN|ELSE|END|TYPE|LEFT|RIGHT|JOIN|ON|OUTER|DESC|ASC|UNION|CREATE|TABLE|PRIMARY|KEY|IF|' +
'FOREIGN|NOT|REFERENCES|DEFAULT|NULL|INNER|CROSS|NATURAL|DATABASE|DROP|GRANT|SUM|MAX|MIN|COUNT|' +
'AVG|DISTINCT';
const dataTypes =
'INT|NUMERIC|DECIMAL|DATE|VARCHAR|CHAR|BIGINT|FLOAT|DOUBLE|BIT|BINARY|TEXT|SET|TIMESTAMP|' +
'MONEY|REAL|NUMBER|INTEGER';
const sqlKeywords = [].concat(keywords.split('|'), dataTypes.split('|'));
export const sqlWords = sqlKeywords.map(s => ({
name: s,
value: s,
score: SQL_KEYWORD_AUTOCOMPLETE_SCORE,
meta: 'sql',
}));
const propTypes = {
actions: PropTypes.object.isRequired,
onBlur: PropTypes.func,
@@ -200,7 +183,7 @@ class AceEditorWrapper extends React.PureComponent {
const words = schemaWords
.concat(tableWords)
.concat(columnWords)
.concat(sqlWords);
.concat(sqlKeywords);
this.setState({ words }, () => {
const completer = {