Browse Source

HUE-7259 [autocomplete] Suggest REGEXP instead of REGEX

Johan Ahlen 8 years ago
parent
commit
879c4cf

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/autocomplete/spec/sqlSpecSelect.js

@@ -5269,7 +5269,7 @@
             afterCursor: '',
             afterCursor: '',
             dialect: 'impala',
             dialect: 'impala',
             containsKeywords: ['HAVING'],
             containsKeywords: ['HAVING'],
-            containsColRefKeywords: ['ILIKE', 'LIKE'],
+            containsColRefKeywords: ['ILIKE', 'LIKE', 'REGEXP'],
             expectedResult: {
             expectedResult: {
               lowerCase: false,
               lowerCase: false,
               suggestGroupBys: { prefix: 'GROUP BY', tables: [{ identifierChain: [{ name: 'testTable' }] }] },
               suggestGroupBys: { prefix: 'GROUP BY', tables: [{ identifierChain: [{ name: 'testTable' }] }] },

File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/js/autocomplete/sqlAutocompleteParser.js


+ 2 - 2
desktop/core/src/desktop/static/desktop/js/autocomplete/sqlParseSupport.js

@@ -218,7 +218,7 @@ var SqlParseSupport = (function () {
           suggestColRefKeywords: {
           suggestColRefKeywords: {
             BOOLEAN: ['AND', 'OR'],
             BOOLEAN: ['AND', 'OR'],
             NUMBER: ['+', '-', '*', '/', '%', 'DIV'],
             NUMBER: ['+', '-', '*', '/', '%', 'DIV'],
-            STRING: parser.isImpala() ? ['ILIKE', 'LIKE', 'NOT LIKE', 'REGEX', 'RLIKE'] : ['LIKE', 'NOT LIKE', 'REGEX', 'RLIKE']
+            STRING: parser.isImpala() ? ['ILIKE', 'LIKE', 'NOT LIKE', 'REGEXP', 'RLIKE'] : ['LIKE', 'NOT LIKE', 'REGEXP', 'RLIKE']
           }
           }
         }
         }
       }
       }
@@ -229,7 +229,7 @@ var SqlParseSupport = (function () {
         keywords = keywords.concat(['+', '-', '*', '/', '%', 'DIV']);
         keywords = keywords.concat(['+', '-', '*', '/', '%', 'DIV']);
       }
       }
       if (SqlFunctions.matchesType(parser.yy.activeDialect, ['STRING'], types)) {
       if (SqlFunctions.matchesType(parser.yy.activeDialect, ['STRING'], types)) {
-        keywords = keywords.concat(parser.isImpala() ? ['ILIKE', 'LIKE', 'NOT LIKE', 'REGEX', 'RLIKE'] : ['LIKE', 'NOT LIKE', 'REGEX', 'RLIKE']);
+        keywords = keywords.concat(parser.isImpala() ? ['ILIKE', 'LIKE', 'NOT LIKE', 'REGEXP', 'RLIKE'] : ['LIKE', 'NOT LIKE', 'REGEXP', 'RLIKE']);
 
 
       }
       }
       return {suggestKeywords: keywords};
       return {suggestKeywords: keywords};

File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/js/autocomplete/sqlSyntaxParser.js


Some files were not shown because too many files changed in this diff