diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java index a2a154e2e..3422f0c98 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java @@ -15,6 +15,7 @@ package com.mysema.query.sql; import java.sql.Types; +import com.google.common.collect.ImmutableSet; import com.mysema.query.types.Ops; /** @@ -27,6 +28,51 @@ import com.mysema.query.types.Ops; */ public class MySQLTemplates extends SQLTemplates { + protected static final ImmutableSet MYSQL_RESERVED_WORDS + = ImmutableSet.of( + "ACCESSIBLE", "ADD", "ALL", "ALTER", "ANALYZE", "AND", "AS", + "ASC", "ASENSITIVE", "BEFORE", "BETWEEN", "BIGINT", "BINARY", + "BLOB", "BOTH", "BY", "CALL", "CASCADE", "CASE", "CHANGE", + "CHAR", "CHARACTER", "CHECK", "COLLATE", "COLUMN", + "CONDITION", "CONSTRAINT", "CONTINUE", "CONVERT", "CREATE", + "CROSS", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", + "CURRENT_USER", "CURSOR", "DATABASE", "DATABASES", "DAY_HOUR", + "DAY_MICROSECOND", "DAY_MINUTE", "DAY_SECOND", "DEC", + "DECIMAL", "DECLARE", "DEFAULT", "DELAYED", "DELETE", + "DESC", "DESCRIBE", "DETERMINISTIC", "DISTINCT", + "DISTINCTROW", "DIV", "DOUBLE", "DROP", "DUAL", "EACH", + "ELSE", "ELSEIF", "ENCLOSED", "ESCAPED", "EXISTS", "EXIT", + "EXPLAIN", "FALSE", "FETCH", "FLOAT", "FLOAT4", "FLOAT8", + "FOR", "FORCE", "FOREIGN", "FROM", "FULLTEXT", "GRANT", + "GROUP", "HAVING", "HIGH_PRIORITY", "HOUR_MICROSECOND", + "HOUR_MINUTE", "HOUR_SECOND", "IF", "IGNORE", "IN", "INDEX", + "INFILE", "INNER", "INOUT", "INSENSITIVE", "INSERT", "INT", + "INT1", "INT2", "INT3", "INT4", "INT8", "INTEGER", "INTERVAL", + "INTO", "IS", "ITERATE", "JOIN", "KEY", "KEYS", "KILL", + "LEADING", "LEAVE", "LEFT", "LIKE", "LIMIT", "LINEAR", + "LINES", "LOAD", "LOCALTIME", "LOCALTIMESTAMP", "LOCK", + "LONG", "LONGBLOB", "LONGTEXT", "LOOP", "LOW_PRIORITY", + "MASTER_SSL_VERIFY_SERVER_CERT", "MATCH", "MAXVALUE", + "MEDIUMBLOB", "MEDIUMINT", "MEDIUMTEXT", "MIDDLEINT", + "MINUTE_MICROSECOND", "MINUTE_SECOND", "MOD", "MODIFIES", + "NATURAL", "NOT", "NO_WRITE_TO_BINLOG", "NULL", "NUMERIC", + "ON", "OPTIMIZE", "OPTION", "OPTIONALLY", "OR", "ORDER", + "OUT", "OUTER", "OUTFILE", "PRECISION", "PRIMARY", "PROCEDURE", + "PURGE", "RANGE", "READ", "READS", "READ_WRITE", "REAL", + "REFERENCES", "REGEXP", "RELEASE", "RENAME", "REPEAT", "REPLACE", + "REQUIRE", "RESIGNAL", "RESTRICT", "RETURN", "REVOKE", "RIGHT", + "RLIKE", "SCHEMA", "SCHEMAS", "SECOND_MICROSECOND", "SELECT", + "SENSITIVE", "SEPARATOR", "SET", "SHOW", "SIGNAL", "SMALLINT", + "SPATIAL", "SPECIFIC", "SQL", "SQLEXCEPTION", "SQLSTATE", + "SQLWARNING", "SQL_BIG_RESULT", "SQL_CALC_FOUND_ROWS", + "SQL_SMALL_RESULT", "SSL", "STARTING", "STRAIGHT_JOIN", "TABLE", + "TERMINATED", "THEN", "TINYBLOB", "TINYINT", "TINYTEXT", "TO", + "TRAILING", "TRIGGER", "TRUE", "UNDO", "UNION", "UNIQUE", + "UNLOCK", "UNSIGNED", "UPDATE", "USAGE", "USE", "USING", + "UTC_DATE", "UTC_TIME", "UTC_TIMESTAMP", "VALUES", "VARBINARY", + "VARCHAR", "VARCHARACTER", "VARYING", "WHEN", "WHERE", "WHILE", + "WITH", "WRITE", "XOR", "YEAR_MONTH", "ZEROFILL"); + public static Builder builder() { return new Builder() { @Override @@ -45,7 +91,7 @@ public class MySQLTemplates extends SQLTemplates { } public MySQLTemplates(char escape, boolean quote) { - super("`", escape, quote); + super(MYSQL_RESERVED_WORDS, "`", escape, quote); setParameterMetadataAvailable(false); setLimitRequired(true); setNullsFirst(null);