Skip to content

Commit

Permalink
Updates based on review comments
Browse files Browse the repository at this point in the history
1. Disabled warning message
2. Extended reserved keyword list
3. Fixed bugs
  • Loading branch information
Kunal Khatua committed Jan 12, 2018
1 parent 8c396d6 commit a76002b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
1 change: 1 addition & 0 deletions exec/java-exec/src/main/resources/rest/profile/profile.ftl
Expand Up @@ -426,6 +426,7 @@ table.sortable thead .sorting_desc { background-image: url("/static/img/black-de
editor.getSession().setTabSize(4);
editor.getSession().setUseSoftTabs(true);
editor.setTheme("ace/theme/sqlserver");
editor.$blockScrolling = "Infinity";
//CSS Formatting
document.getElementById('query-editor').style.fontSize='13px';
document.getElementById('query-editor').style.fontFamily='courier';
Expand Down
1 change: 1 addition & 0 deletions exec/java-exec/src/main/resources/rest/query/query.ftl
Expand Up @@ -91,6 +91,7 @@
editor.getSession().setTabSize(4);
editor.getSession().setUseSoftTabs(true);
editor.setTheme("ace/theme/sqlserver");
editor.$blockScrolling = "Infinity";
//CSS Formatting
document.getElementById('query-editor-format').style.fontSize='13px';
document.getElementById('query-editor-format').style.fontFamily='courier';
Expand Down
Expand Up @@ -11,15 +11,21 @@ var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
var SqlHighlightRules = function() {

//TODO: https://drill.apache.org/docs/reserved-keywords/
//e.g. Cubing operators like ROLLUP are not listed
//e.g. Cubing operators like ROLLUP are not listed
//Covered: https://drill.apache.org/docs/supported-sql-commands/
var keywords = (
"select|insert|update|delete|from|where|and|or|group|by|order|limit|offset|having|as|case|" +
"when|else|end|type|left|right|join|on|outer|desc|asc|union|create|table|key|if|" +
"not|default|null|inner|database|drop|" +
"flatten|kvgen|columns"
"flatten|kvgen|columns|" +
"set|reset|alter|session|system|" +
"temporary|function|using|jar|between|distinct" +
"partition|view|schema|files|" +
"explain|plan|with|without|implementation|" +
"show|describe|use"
);
//Confirmed to be UnSupported as of Drill-1.12.0
/* cross|natural|primary|foreign|references|grant */
//Confirmed to be UnSupported as of Drill-1.12.0
/* cross|natural|primary|foreign|references|grant */

var builtinConstants = (
"true|false"
Expand Down
Expand Up @@ -8,15 +8,15 @@ ace.define("ace/snippets/sql",["require","exports","module"], function(require,
exports.snippetText = "snippet info\n\
select * from INFORMATION_SCHEMA.${1:<tableName>};\n\
snippet sysmem\n\
select * from sys.mem;\n\
select * from sys.memory;\n\
snippet sysopt\n\
select * from sys.opt;\n\
select * from sys.options;\n\
snippet sysbit\n\
select * from sys.bit;\n\
select * from sys.drillbits;\n\
snippet sysconn\n\
select * from sys.conn;\n\
select * from sys.connections;\n\
snippet sysprof\n\
select * from sys.prof;\n\
select * from sys.profiles;\n\
snippet cview\n\
create view ${1:[workspace]}.${2:<viewName>} ( ${3:<columnName>} ) as \n\
${4:<query>};\n\
Expand All @@ -26,6 +26,8 @@ snippet ctas\n\
snippet ctemp\n\
create temporary table ${1:<tableName>} ( ${2:<columnName>} ) as \n\
${3:<query>};\n\
snippet cfnjar\n\
create function using jar '${1:<jarName>}.jar;\n\
snippet alt\n\
alter session set `${1:<parameter>}` = ${2:<value>};\n\
snippet reset\n\
Expand Down

0 comments on commit a76002b

Please sign in to comment.