#352 SQL keyword

Former-commit-id: cd539aea

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLConstants.java

@@ -327,101 +327,59 @@ public class SQLConstants {
         "DESC",
 
         // Not actually standard but widely used
-        "LIMIT"
-    };
-
-    public static final String[] SQL2003_FUNCTIONS = {
-        "ABS",
-        "AVG",
-        "CHAR_LENGTH",
-        "CHARACTER_LENGTH",
-        "COUNT",
-        "CURRENT_DATE",
-        "CURRENT_DEFAULT_TRANSFORM_GROUP",
-        "CURRENT_PATH",
-        "CURRENT_ROLE",
-        "CURRENT_TIME",
-        "CURRENT_TIMESTAMP",
-        "CURRENT_TRANSFORM_GROUP_FOR_TYPE",
-        "CURRENT_USER",
-        "FLOOR",
-        "LEADING",
-        "LOWER",
-        "MAX",
-        "MIN",
-        "OCTET_LENGTH",
-        "PERCENT_RANK",
-        "PERCENTILE_CONT",
-        "PERCENTILE_DISC",
-        "POWER",
-        "REGR_AVGX",
-        "REGR_AVGY",
-        "REGR_COUNT",
-        "REGR_INTERCEPT",
-        "REGR_R2",
-        "REGR_SLOPE",
-        "REGR_SXX",
-        "REGR_SXY",
-        "REGR_SYY",
-        "SQRT",
-        "SUBSTRING",
-        "SUM",
-        "TRIM",
-        "UESCAPE",
-        "UPPER",
-    };
+        "LIMIT",
 
-    public static final String[] SQL2003_NON_RESERVED_KEYWORDS = {
-        "A",
+        // Extended keywords
+//        "A",
         "ABSOLUTE",
         "ACTION",
-        "ADA",
+//        "ADA",
         "ADD",
-        "ADMIN",
+//        "ADMIN",
         "AFTER",
         "ALWAYS",
-        "ASC",
+//        "ASC",
         "ASSERTION",
         "ASSIGNMENT",
         "ATTRIBUTE",
         "ATTRIBUTES",
         "BEFORE",
-        "BERNOULLI",
-        "BREADTH",
-        "C",
+//        "BERNOULLI",
+//        "BREADTH",
+//        "C",
         "CASCADE",
         "CATALOG",
-        "CATALOG_NAME",
+//        "CATALOG_NAME",
         "CHAIN",
-        "CHARACTER_SET_CATALOG",
-        "CHARACTER_SET_NAME",
-        "CHARACTER_SET_SCHEMA",
+//        "CHARACTER_SET_CATALOG",
+//        "CHARACTER_SET_NAME",
+//        "CHARACTER_SET_SCHEMA",
         "CHARACTERISTICS",
         "CHARACTERS",
-        "CLASS_ORIGIN",
-        "COBOL",
+//        "CLASS_ORIGIN",
+//        "COBOL",
         "COLLATION",
-        "COLLATION_CATALOG",
-        "COLLATION_NAME",
-        "COLLATION_SCHEMA",
-        "COLUMN_NAME",
-        "COMMAND_FUNCTION",
-        "COMMAND_FUNCTION_CODE",
+//        "COLLATION_CATALOG",
+//        "COLLATION_NAME",
+//        "COLLATION_SCHEMA",
+//        "COLUMN_NAME",
+//        "COMMAND_FUNCTION",
+//        "COMMAND_FUNCTION_CODE",
         "COMMITTED",
-        "CONDITION_NUMBER",
+//        "CONDITION_NUMBER",
         "CONNECTION",
-        "CONNECTION_NAME",
-        "CONSTRAINT_CATALOG",
-        "CONSTRAINT_NAME",
-        "CONSTRAINT_SCHEMA",
+//        "CONNECTION_NAME",
+//        "CONSTRAINT_CATALOG",
+//        "CONSTRAINT_NAME",
+//        "CONSTRAINT_SCHEMA",
         "CONSTRAINTS",
         "CONSTRUCTOR",
         "CONTAINS",
         "CONTINUE",
         "CURSOR_NAME",
         "DATA",
-        "DATETIME_INTERVAL_CODE",
-        "DATETIME_INTERVAL_PRECISION",
+//        "DATETIME_INTERVAL_CODE",
+//        "DATETIME_INTERVAL_PRECISION",
         "DEFAULTS",
         "DEFERRABLE",
         "DEFERRED",
@@ -430,22 +388,22 @@ public class SQLConstants {
         "DEGREE",
         "DEPTH",
         "DERIVED",
-        "DESC",
+//        "DESC",
         "DESCRIPTOR",
         "DIAGNOSTICS",
         "DISPATCH",
         "DOMAIN",
-        "DYNAMIC_FUNCTION",
-        "DYNAMIC_FUNCTION_CODE",
+//        "DYNAMIC_FUNCTION",
+//        "DYNAMIC_FUNCTION_CODE",
         "EQUALS",
         "EXCEPTION",
         "EXCLUDE",
         "EXCLUDING",
         "FINAL",
         "FIRST",
-        "FORTRAN",
+//        "FORTRAN",
         "FOUND",
-        "G",
+//        "G",
         "GENERAL",
         "GENERATED",
         "GO",
@@ -462,29 +420,29 @@ public class SQLConstants {
         "INSTANTIABLE",
         "INVOKER",
         "ISOLATION",
-        "K",
-        "KEY_MEMBER",
+//        "K",
+//        "KEY_MEMBER",
         "KEY_TYPE",
         "LAST",
         "LOCATOR",
-        "M",
+//        "M",
         "MAP",
         "MATCHED",
         "MAXVALUE",
-        "MESSAGE_LENGTH",
-        "MESSAGE_OCTET_LENGTH",
-        "MESSAGE_TEXT",
+//        "MESSAGE_LENGTH",
+//        "MESSAGE_OCTET_LENGTH",
+//        "MESSAGE_TEXT",
         "MINVALUE",
         "MORE",
         "MUMPS",
-        "NAME",
-        "NAMES",
+//        "NAME",
+//        "NAMES",
         "NESTING",
         "NEXT",
         "NORMALIZED",
-        "NULLABLE",
-        "NULLS",
-        "NUMBER",
+//        "NULLABLE",
+//        "NULLS",
+//        "NUMBER",
         "OBJECT",
         "OCTETS",
         "OPTION",
@@ -495,83 +453,124 @@ public class SQLConstants {
         "OUTPUT",
         "OVERRIDING",
         "PAD",
-        "PARAMETER_MODE",
-        "PARAMETER_NAME",
-        "PARAMETER_ORDINAL_POSITION",
-        "PARAMETER_SPECIFIC_CATALOG",
-        "PARAMETER_SPECIFIC_NAME",
-        "PARAMETER_SPECIFIC_SCHEMA",
+//        "PARAMETER_MODE",
+//        "PARAMETER_NAME",
+//        "PARAMETER_ORDINAL_POSITION",
+//        "PARAMETER_SPECIFIC_CATALOG",
+//        "PARAMETER_SPECIFIC_NAME",
+//        "PARAMETER_SPECIFIC_SCHEMA",
         "PARTIAL",
-        "PASCAL",
+//        "PASCAL",
         "PATH",
         "PLACING",
-        "PLI",
+//        "PLI",
         "PRESERVE",
         "PRIOR",
         "PRIVILEGES",
-        "PUBLIC",
+//        "PUBLIC",
         "READ",
         "RELATIVE",
         "REPEATABLE",
         "RESTART",
-        "RETURNED_CARDINALITY",
-        "RETURNED_LENGTH",
-        "RETURNED_OCTET_LENGTH",
-        "RETURNED_SQLSTATE",
+//        "RETURNED_CARDINALITY",
+//        "RETURNED_LENGTH",
+//        "RETURNED_OCTET_LENGTH",
+//        "RETURNED_SQLSTATE",
         "ROUTINE",
-        "ROUTINE_CATALOG",
-        "ROUTINE_NAME",
-        "ROUTINE_SCHEMA",
-        "ROW_COUNT",
+//        "ROUTINE_CATALOG",
+//        "ROUTINE_NAME",
+//        "ROUTINE_SCHEMA",
+//        "ROW_COUNT",
         "SCALE",
-        "SCHEMA_NAME",
-        "SCOPE_CATALOG",
-        "SCOPE_NAME",
-        "SCOPE_SCHEMA",
+//        "SCHEMA_NAME",
+//        "SCOPE_CATALOG",
+//        "SCOPE_NAME",
+//        "SCOPE_SCHEMA",
         "SECTION",
         "SECURITY",
         "SELF",
         "SERIALIZABLE",
-        "SERVER_NAME",
+//        "SERVER_NAME",
         "SESSION",
         "SETS",
-        "SIMPLE",
+//        "SIMPLE",
         "SIZE",
         "SOURCE",
         "SPACE",
-        "SPECIFIC_NAME",
+//        "SPECIFIC_NAME",
         "STATE",
         "STATEMENT",
         "STRUCTURE",
         "STYLE",
-        "SUBCLASS_ORIGIN",
-        "TABLE_NAME",
+//        "SUBCLASS_ORIGIN",
+//        "TABLE_NAME",
         "TEMPORARY",
         "TIES",
-        "TOP_LEVEL_COUNT",
+//        "TOP_LEVEL_COUNT",
         "TRANSACTION",
-        "TRANSACTION_ACTIVE",
-        "TRANSACTIONS_COMMITTED",
-        "TRANSACTIONS_ROLLED_BACK",
+//        "TRANSACTION_ACTIVE",
+//        "TRANSACTIONS_COMMITTED",
+//        "TRANSACTIONS_ROLLED_BACK",
         "TRANSFORM",
         "TRANSFORMS",
-        "TRIGGER_CATALOG",
-        "TRIGGER_NAME",
-        "TRIGGER_SCHEMA",
+//        "TRIGGER_CATALOG",
+//        "TRIGGER_NAME",
+//        "TRIGGER_SCHEMA",
         "TYPE",
         "UNCOMMITTED",
         "UNDER",
         "UNNAMED",
         "USAGE",
-        "USER_DEFINED_TYPE_CATALOG",
-        "USER_DEFINED_TYPE_CODE",
-        "USER_DEFINED_TYPE_NAME",
-        "USER_DEFINED_TYPE_SCHEMA",
+//        "USER_DEFINED_TYPE_CATALOG",
+//        "USER_DEFINED_TYPE_CODE",
+//        "USER_DEFINED_TYPE_NAME",
+//        "USER_DEFINED_TYPE_SCHEMA",
         "WORK",
         "WRITE",
         "ZONE"
     };
-    
+
+    public static final String[] SQL2003_FUNCTIONS = {
+        "ABS",
+        "AVG",
+        "CHAR_LENGTH",
+        "CHARACTER_LENGTH",
+        "COUNT",
+        "CURRENT_DATE",
+        "CURRENT_DEFAULT_TRANSFORM_GROUP",
+        "CURRENT_PATH",
+        "CURRENT_ROLE",
+        "CURRENT_TIME",
+        "CURRENT_TIMESTAMP",
+        "CURRENT_TRANSFORM_GROUP_FOR_TYPE",
+        "CURRENT_USER",
+        "FLOOR",
+        "LEADING",
+        "LOWER",
+        "MAX",
+        "MIN",
+        "OCTET_LENGTH",
+        "PERCENT_RANK",
+        "PERCENTILE_CONT",
+        "PERCENTILE_DISC",
+        "POWER",
+        "REGR_AVGX",
+        "REGR_AVGY",
+        "REGR_COUNT",
+        "REGR_INTERCEPT",
+        "REGR_R2",
+        "REGR_SLOPE",
+        "REGR_SXX",
+        "REGR_SXY",
+        "REGR_SYY",
+        "SQRT",
+        "SUBSTRING",
+        "SUM",
+        "TRIM",
+        "UESCAPE",
+        "UPPER",
+    };
+
     public static final String[] SQL_EX_KEYWORDS = {
         "CHANGE",
         "MODIFY",