improve: trino/hive/impala/mysql/pgsql keywords and part of non-reser…

…ved (#92) * fix: trino/hive/impala/mysql/pgsql keywords and part of non-reserved keywords which is common * fix: mysql/pgsql unit test * fix: remove some keyword
DTStack · Dec 13, 2023 · 35a5b8b · 35a5b8b
1 parent 6c8a2f2
commit 35a5b8b
Show file tree

Hide file tree

Showing 7 changed files with 217 additions and 286 deletions.
diff --git a/src/hivesql/hivesql.ts b/src/hivesql/hivesql.ts
@@ -40,40 +40,27 @@ export const language = <languages.IMonarchLanguage>{
 		{ open: '(', close: ')', token: TokenClassConsts.DELIMITER_PAREN }
 	],
 	keywords: [
-		'ADD',
-		'AFTER',
 		'ALL',
 		'ALTER',
-		'ANALYZE',
 		'AND',
 		'ANTI',
 		'ANY',
 		'APPLICATION',
-		'ARCHIVE',
 		'ARRAY',
 		'AS',
-		'ASC',
-		'AT',
 		'AUTHORIZATION',
 		'BETWEEN',
 		'BIGINT',
 		'BINARY',
 		'BOOLEAN',
 		'BOTH',
 		'BY',
-		'CACHE',
-		'CASCADE',
 		'CASE',
 		'CAST',
-		'CHANGE',
 		'CHAR',
-		'CHECK',
 		'COLUMN',
-		'COLUMNS',
-		'COMMENT',
 		'COMMIT',
 		'COMPACTIONID',
-		'COMPUTE',
 		'CONF',
 		'CONSTRAINT',
 		'CREATE',
@@ -84,80 +71,45 @@ export const language = <languages.IMonarchLanguage>{
 		'CURRENT_TIMESTAMP',
 		'CURSOR',
 		'DATABASE',
-		'DATABASES',
 		'CONNECTOR',
 		'CONNECTORS',
 		'DATE',
-		'DBPROPERTIES',
-		'DCPROPERTIES',
 		'DDL',
-		'DEBUG',
 		'DEC',
 		'DECIMAL',
 		'NUMERIC',
-		'DEFAULT',
-		'DEFERRED',
-		'DEFINED',
 		'DELETE',
-		'DELIMITED',
-		'DEPENDENCY',
-		'DESC',
 		'DESCRIBE',
-		'DIRECTORIES',
-		'DIRECTORY',
-		'DISABLE',
 		'DISTINCT',
-		'DISTRIBUTE',
-		'DISTRIBUTED',
-		'DO',
 		'DOUBLE',
 		'DROP',
 		'RECOVER',
-		'$ELEM$',
 		'ELSE',
-		'ENABLE',
 		'END',
-		'ESCAPED',
-		'EVERY',
 		'EXCEPT',
 		'EXCHANGE',
-		'EXECUTE',
-		'EXECUTED',
 		'EXISTS',
-		'EXPLAIN',
-		'EXPORT',
 		'EXTENDED',
 		'EXTERNAL',
 		'EXTRACT',
 		'FALSE',
 		'FETCH',
-		'FIELDS',
-		'FILE',
-		'FILEFORMAT',
-		'FIRST',
 		'FLOAT',
 		'FLOOR',
 		'FOLLOWING',
 		'FOR',
 		'FORCE',
 		'FOREIGN',
-		'FORMAT',
-		'FORMATTED',
 		'FROM',
 		'FULL',
 		'FUNCTION',
-		'FUNCTIONS',
 		'GRANT',
 		'GROUP',
 		'GROUPING',
 		'HAVING',
-		'IDXPROPERTIES',
 		'IF',
-		'IGNORE',
 		'IMPORT',
 		'IN',
-		'INDEX',
-		'INDEXES',
 		'INNER',
 		'INSERT',
 		'INT',
@@ -167,42 +119,30 @@ export const language = <languages.IMonarchLanguage>{
 		'INTO',
 		'IS',
 		'JOIN',
-		'KEY',
-		'KEYS',
 		'$KEY$',
 		'LATERAL',
 		'LEADING',
 		'LEFT',
 		'LESS',
 		'LIKE',
-		'LIMIT',
-		'LOAD',
 		'LOCAL',
-		'LOCATION',
 		'MACRO',
 		'MAP',
 		'MERGE',
 		'MINUS',
 		'MORE',
 		'NONE',
 		'NOT',
-		'NOVALIDATE',
 		'NULL',
 		'OF',
-		'OFFLINE',
-		'OFFSET',
 		'ON',
 		'ONLY',
-		'OPTION',
 		'OR',
 		'ORDER',
 		'OUT',
 		'OUTER',
 		'OVER',
-		'OVERWRITE',
 		'PARTITION',
-		'PARTITIONED',
-		'PARTITIONS',
 		'PERCENT',
 		'PKFK_JOIN',
 		'PRECEDING',
@@ -211,46 +151,27 @@ export const language = <languages.IMonarchLanguage>{
 		'PRESERVE',
 		'PRIMARY',
 		'PROCEDURE',
-		'PURGE',
 		'QUALIFY',
-		'QUERY',
 		'RANGE',
-		'READ',
-		'READONLY',
 		'READS',
 		'REAL',
-		'REBUILD',
 		'REDUCE',
 		'REFERENCES',
 		'REGEXP',
-		'RELOAD',
-		'REMOTE',
-		'RENAME',
-		'REPLACE',
 		'REVOKE',
-		'REWRITE',
 		'RIGHT',
 		'RLIKE',
 		'ROLLBACK',
 		'ROLLUP',
 		'ROW',
 		'ROWS',
-		'SCHEMA',
-		'SCHEMAS',
 		'SELECT',
 		'SET',
-		'SETS',
-		'SET_CURRENT_SNAPSHOT',
-		'SHOW',
 		'SMALLINT',
 		'SOME',
-		'SORT',
-		'SORTED',
 		'START',
-		'STRING',
 		'SYNC',
 		'TABLE',
-		'TABLES',
 		'TABLESAMPLE',
 		'THEN',
 		'TIME',
@@ -262,26 +183,63 @@ export const language = <languages.IMonarchLanguage>{
 		'TRIGGER',
 		'TRUE',
 		'TRUNCATE',
-		'UNARCHIVE',
 		'UNBOUNDED',
 		'UNION',
 		'UNIQUE',
 		'UNIQUEJOIN',
 		'UPDATE',
-		'USE',
 		'USER',
 		'USING',
 		'UTC_TMESTAMP',
 		'VALUES',
-		'$VALUE$',
 		'VARCHAR',
-		'VIEW',
-		'VIEWS',
 		'WHEN',
 		'WHERE',
 		'WINDOW',
 		'WITH',
-		'WITHIN'
+		// part of non-reserved keywords which is common
+		'ADD',
+		'ANALYZE',
+		'ASC',
+		'AT',
+		'CASCADE',
+		'CHANGE',
+		'COMMENT',
+		'COMPUTE',
+		'DEFAULT',
+		'DESC',
+		'DISABLE',
+		'EVERY',
+		'EXECUTE',
+		'EXPLAIN',
+		'FILE',
+		'FILEFORMAT',
+		'FORMAT',
+		'FORMATTED',
+		'INDEX',
+		'KEY',
+		'KEYS',
+		'LIMIT',
+		'LOAD',
+		'LOCATION',
+		'OFFSET',
+		'OVERWRITE',
+		'PARTITIONED',
+		'PURGE',
+		'RELOAD',
+		'RENAME',
+		'REPLACE',
+		'REWRITE',
+		'ROLE',
+		'SCHEMA',
+		'SHOW',
+		'SORT',
+		'SORTED',
+		'STRING',
+		'TOUCH',
+		'USE',
+		'UNLOCK',
+		'VIEW'
 	],
 	operators: [
 		// https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF#LanguageManualUDF-Built-inOperators