@@ -655,29 +655,31 @@ protected enum ProcedureType {
655
655
// MySQL reserved words (all versions superset)
656
656
private static final String [] MYSQL_KEYWORDS = new String [] { "ACCESSIBLE" , "ADD" , "ALL" , "ALTER" , "ANALYZE" , "AND" , "AS" , "ASC" , "ASENSITIVE" , "BEFORE" ,
657
657
"BETWEEN" , "BIGINT" , "BINARY" , "BLOB" , "BOTH" , "BY" , "CALL" , "CASCADE" , "CASE" , "CHANGE" , "CHAR" , "CHARACTER" , "CHECK" , "COLLATE" , "COLUMN" ,
658
- "CONDITION" , "CONSTRAINT" , "CONTINUE" , "CONVERT" , "CREATE" , "CROSS" , "CURRENT_DATE" , "CURRENT_TIME" , "CURRENT_TIMESTAMP" , "CURRENT_USER" , "CURSOR" ,
659
- "DATABASE" , "DATABASES" , "DAY_HOUR" , "DAY_MICROSECOND" , "DAY_MINUTE" , "DAY_SECOND" , "DEC" , "DECIMAL" , "DECLARE" , "DEFAULT" , "DELAYED" , "DELETE" ,
660
- "DESC" , "DESCRIBE" , "DETERMINISTIC" , "DISTINCT" , "DISTINCTROW" , "DIV" , "DOUBLE" , "DROP" , "DUAL" , "EACH" , "ELSE" , "ELSEIF" , "ENCLOSED" , "ESCAPED" ,
661
- "EXISTS" , "EXIT" , "EXPLAIN" , "FALSE" , "FETCH" , "FLOAT" , "FLOAT4" , "FLOAT8" , "FOR" , "FORCE" , "FOREIGN" , "FROM" , "FULLTEXT" , "GENERATED" , "GET" ,
662
- "GRANT" , "GROUP" , "HAVING" , "HIGH_PRIORITY" , "HOUR_MICROSECOND" , "HOUR_MINUTE" , "HOUR_SECOND" , "IF" , "IGNORE" , "IN" , "INDEX" , "INFILE" , "INNER" ,
663
- "INOUT" , "INSENSITIVE" , "INSERT" , "INT" , "INT1" , "INT2" , "INT3" , "INT4" , "INT8" , "INTEGER" , "INTERVAL" , "INTO" , "IO_AFTER_GTIDS" , "IO_BEFORE_GTIDS" ,
664
- "IS" , "ITERATE" , "JOIN" , "KEY" , "KEYS" , "KILL" , "LEADING" , "LEAVE" , "LEFT" , "LIKE" , "LIMIT" , "LINEAR" , "LINES" , "LOAD" , "LOCALTIME" ,
665
- "LOCALTIMESTAMP" , "LOCK" , "LONG" , "LONGBLOB" , "LONGTEXT" , "LOOP" , "LOW_PRIORITY" , "MASTER_BIND" , "MASTER_SSL_VERIFY_SERVER_CERT" , "MATCH" ,
666
- "MAXVALUE" , "MEDIUMBLOB" , "MEDIUMINT" , "MEDIUMTEXT" , "MIDDLEINT" , "MINUTE_MICROSECOND" , "MINUTE_SECOND" , "MOD" , "MODIFIES" , "NATURAL" , "NOT" ,
667
- "NO_WRITE_TO_BINLOG" , "NULL" , "NUMERIC" , "ON" , "OPTIMIZE" , "OPTIMIZER_COSTS" , "OPTION" , "OPTIONALLY" , "OR" , "ORDER" , "OUT" , "OUTER" , "OUTFILE" ,
668
- "PARTITION" , "PRECISION" , "PRIMARY" , "PROCEDURE" , "PURGE" , "RANGE" , "READ" , "READS" , "READ_WRITE" , "REAL" , "REFERENCES" , "REGEXP" , "RELEASE" ,
669
- "RENAME" , "REPEAT" , "REPLACE" , "REQUIRE" , "RESIGNAL" , "RESTRICT" , "RETURN" , "REVOKE" , "RIGHT" , "RLIKE" , "SCHEMA" , "SCHEMAS" , "SECOND_MICROSECOND" ,
670
- "SELECT" , "SENSITIVE" , "SEPARATOR" , "SET" , "SHOW" , "SIGNAL" , "SMALLINT" , "SPATIAL" , "SPECIFIC" , "SQL" , "SQLEXCEPTION" , "SQLSTATE" , "SQLWARNING" ,
671
- "SQL_BIG_RESULT" , "SQL_CALC_FOUND_ROWS" , "SQL_SMALL_RESULT" , "SSL" , "STARTING" , "STORED" , "STRAIGHT_JOIN" , "TABLE" , "TERMINATED" , "THEN" ,
658
+ "CONDITION" , "CONSTRAINT" , "CONTINUE" , "CONVERT" , "CREATE" , "CROSS" , "CUBE" , "CUME_DIST" , "CURRENT_DATE" , "CURRENT_TIME" , "CURRENT_TIMESTAMP" ,
659
+ "CURRENT_USER" , "CURSOR" , "DATABASE" , "DATABASES" , "DAY_HOUR" , "DAY_MICROSECOND" , "DAY_MINUTE" , "DAY_SECOND" , "DEC" , "DECIMAL" , "DECLARE" ,
660
+ "DEFAULT" , "DELAYED" , "DELETE" , "DENSE_RANK" , "DESC" , "DESCRIBE" , "DETERMINISTIC" , "DISTINCT" , "DISTINCTROW" , "DIV" , "DOUBLE" , "DROP" , "DUAL" ,
661
+ "EACH" , "ELSE" , "ELSEIF" , "EMPTY" , "ENCLOSED" , "ESCAPED" , "EXCEPT" , "EXISTS" , "EXIT" , "EXPLAIN" , "FALSE" , "FETCH" , "FIRST_VALUE" , "FLOAT" , "FLOAT4" ,
662
+ "FLOAT8" , "FOR" , "FORCE" , "FOREIGN" , "FROM" , "FULLTEXT" , "FUNCTION" , "GENERATED" , "GET" , "GRANT" , "GROUP" , "GROUPING" , "GROUPS" , "HAVING" ,
663
+ "HIGH_PRIORITY" , "HOUR_MICROSECOND" , "HOUR_MINUTE" , "HOUR_SECOND" , "IF" , "IGNORE" , "IN" , "INDEX" , "INFILE" , "INNER" , "INOUT" , "INSENSITIVE" ,
664
+ "INSERT" , "INT" , "INT1" , "INT2" , "INT3" , "INT4" , "INT8" , "INTEGER" , "INTERVAL" , "INTO" , "IO_AFTER_GTIDS" , "IO_BEFORE_GTIDS" , "IS" , "ITERATE" ,
665
+ "JOIN" , "JSON_TABLE" , "KEY" , "KEYS" , "KILL" , "LAG" , "LAST_VALUE" , "LEAD" , "LEADING" , "LEAVE" , "LEFT" , "LIKE" , "LIMIT" , "LINEAR" , "LINES" , "LOAD" ,
666
+ "LOCALTIME" , "LOCALTIMESTAMP" , "LOCK" , "LONG" , "LONGBLOB" , "LONGTEXT" , "LOOP" , "LOW_PRIORITY" , "MASTER_BIND" , "MASTER_SSL_VERIFY_SERVER_CERT" ,
667
+ "MATCH" , "MAXVALUE" , "MEDIUMBLOB" , "MEDIUMINT" , "MEDIUMTEXT" , "MIDDLEINT" , "MINUTE_MICROSECOND" , "MINUTE_SECOND" , "MOD" , "MODIFIES" , "NATURAL" ,
668
+ "NOT" , "NO_WRITE_TO_BINLOG" , "NTH_VALUE" , "NTILE" , "NULL" , "NUMERIC" , "OF" , "ON" , "OPTIMIZE" , "OPTIMIZER_COSTS" , "OPTION" , "OPTIONALLY" , "OR" ,
669
+ "ORDER" , "OUT" , "OUTER" , "OUTFILE" , "OVER" , "PARTITION" , "PERCENT_RANK" , "PERSIST" , "PERSIST_ONLY" , "PRECISION" , "PRIMARY" , "PROCEDURE" , "PURGE" ,
670
+ "RANGE" , "RANK" , "READ" , "READS" , "READ_WRITE" , "REAL" , "RECURSIVE" , "REFERENCES" , "REGEXP" , "RELEASE" , "RENAME" , "REPEAT" , "REPLACE" , "REQUIRE" ,
671
+ "RESIGNAL" , "RESTRICT" , "RETURN" , "REVOKE" , "RIGHT" , "RLIKE" , "ROW" , "ROWS" , "ROW_NUMBER" , "SCHEMA" , "SCHEMAS" , "SECOND_MICROSECOND" , "SELECT" ,
672
+ "SENSITIVE" , "SEPARATOR" , "SET" , "SHOW" , "SIGNAL" , "SMALLINT" , "SPATIAL" , "SPECIFIC" , "SQL" , "SQLEXCEPTION" , "SQLSTATE" , "SQLWARNING" ,
673
+ "SQL_BIG_RESULT" , "SQL_CALC_FOUND_ROWS" , "SQL_SMALL_RESULT" , "SSL" , "STARTING" , "STORED" , "STRAIGHT_JOIN" , "SYSTEM" , "TABLE" , "TERMINATED" , "THEN" ,
672
674
"TINYBLOB" , "TINYINT" , "TINYTEXT" , "TO" , "TRAILING" , "TRIGGER" , "TRUE" , "UNDO" , "UNION" , "UNIQUE" , "UNLOCK" , "UNSIGNED" , "UPDATE" , "USAGE" , "USE" ,
673
675
"USING" , "UTC_DATE" , "UTC_TIME" , "UTC_TIMESTAMP" , "VALUES" , "VARBINARY" , "VARCHAR" , "VARCHARACTER" , "VARYING" , "VIRTUAL" , "WHEN" , "WHERE" , "WHILE" ,
674
- "WITH" , "WRITE" , "XOR" , "YEAR_MONTH" , "ZEROFILL" };
676
+ "WINDOW" , " WITH" , "WRITE" , "XOR" , "YEAR_MONTH" , "ZEROFILL" };
675
677
676
678
// SQL:2003 reserved words from 'ISO/IEC 9075-2:2003 (E), 2003-07-25'
677
- private static final String [] SQL2003_KEYWORDS = new String [] { "ABS" , "ALL" , "ALLOCATE" , "ALTER" , "AND" , "ANY" , "ARE" , "ARRAY" , "AS" , "ASENSITIVE " ,
678
- "ASYMMETRIC" , "AT" , "ATOMIC" , "AUTHORIZATION" , "AVG" , "BEGIN" , "BETWEEN" , "BIGINT" , "BINARY" , "BLOB" , "BOOLEAN" , "BOTH" , "BY" , "CALL" , "CALLED " ,
679
- "CARDINALITY" , "CASCADED" , "CASE" , "CAST" , "CEIL" , "CEILING" , "CHAR" , "CHARACTER" , "CHARACTER_LENGTH" , "CHAR_LENGTH" , "CHECK" , "CLOB" , "CLOSE " ,
680
- "COALESCE" , "COLLATE" , "COLLECT" , "COLUMN" , "COMMIT" , "CONDITION" , "CONNECT" , "CONSTRAINT" , "CONVERT" , "CORR" , "CORRESPONDING" , "COUNT" ,
679
+ /* package private */ static final List < String > SQL2003_KEYWORDS = Arrays . asList ( "ABS" , "ALL" , "ALLOCATE" , "ALTER" , "AND" , "ANY" , "ARE" , "ARRAY" , "AS" ,
680
+ "ASENSITIVE" , " ASYMMETRIC" , "AT" , "ATOMIC" , "AUTHORIZATION" , "AVG" , "BEGIN" , "BETWEEN" , "BIGINT" , "BINARY" , "BLOB" , "BOOLEAN" , "BOTH" , "BY" , "CALL" ,
681
+ "CALLED" , " CARDINALITY" , "CASCADED" , "CASE" , "CAST" , "CEIL" , "CEILING" , "CHAR" , "CHARACTER" , "CHARACTER_LENGTH" , "CHAR_LENGTH" , "CHECK" , "CLOB" ,
682
+ "CLOSE" , " COALESCE" , "COLLATE" , "COLLECT" , "COLUMN" , "COMMIT" , "CONDITION" , "CONNECT" , "CONSTRAINT" , "CONVERT" , "CORR" , "CORRESPONDING" , "COUNT" ,
681
683
"COVAR_POP" , "COVAR_SAMP" , "CREATE" , "CROSS" , "CUBE" , "CUME_DIST" , "CURRENT" , "CURRENT_DATE" , "CURRENT_DEFAULT_TRANSFORM_GROUP" , "CURRENT_PATH" ,
682
684
"CURRENT_ROLE" , "CURRENT_TIME" , "CURRENT_TIMESTAMP" , "CURRENT_TRANSFORM_GROUP_FOR_TYPE" , "CURRENT_USER" , "CURSOR" , "CYCLE" , "DATE" , "DAY" ,
683
685
"DEALLOCATE" , "DEC" , "DECIMAL" , "DECLARE" , "DEFAULT" , "DELETE" , "DENSE_RANK" , "DEREF" , "DESCRIBE" , "DETERMINISTIC" , "DISCONNECT" , "DISTINCT" ,
@@ -696,7 +698,7 @@ protected enum ProcedureType {
696
698
"SYMMETRIC" , "SYSTEM" , "SYSTEM_USER" , "TABLE" , "TABLESAMPLE" , "THEN" , "TIME" , "TIMESTAMP" , "TIMEZONE_HOUR" , "TIMEZONE_MINUTE" , "TO" , "TRAILING" ,
697
699
"TRANSLATE" , "TRANSLATION" , "TREAT" , "TRIGGER" , "TRIM" , "TRUE" , "UESCAPE" , "UNION" , "UNIQUE" , "UNKNOWN" , "UNNEST" , "UPDATE" , "UPPER" , "USER" ,
698
700
"USING" , "VALUE" , "VALUES" , "VARCHAR" , "VARYING" , "VAR_POP" , "VAR_SAMP" , "WHEN" , "WHENEVER" , "WHERE" , "WIDTH_BUCKET" , "WINDOW" , "WITH" , "WITHIN" ,
699
- "WITHOUT" , "YEAR" } ;
701
+ "WITHOUT" , "YEAR" ) ;
700
702
701
703
private static volatile String mysqlKeywords = null ;
702
704
@@ -3424,7 +3426,7 @@ public String getSQLKeywords() throws SQLException {
3424
3426
StringBuilder mysqlKeywordsBuffer = new StringBuilder ();
3425
3427
3426
3428
Collections .addAll (mysqlKeywordSet , MYSQL_KEYWORDS );
3427
- mysqlKeywordSet .removeAll (Arrays . asList ( SQL2003_KEYWORDS ) );
3429
+ mysqlKeywordSet .removeAll (SQL2003_KEYWORDS );
3428
3430
3429
3431
for (String keyword : mysqlKeywordSet ) {
3430
3432
mysqlKeywordsBuffer .append ("," ).append (keyword );
0 commit comments