Conflicts:
	src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java
	src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
	src/main/java/com/alibaba/druid/sql/parser/Token.java
This commit is contained in:
温少
2012-05-16 08:39:55 +08:00
parent 2c8f9793e6
commit 10625a760d
4 changed files with 1 additions and 4 deletions
@@ -217,7 +217,6 @@ public class SQLExprParser extends SQLParser {
case REFERENCE:
case KEY:
case DISTINCT:
case ZONE:
case LIMIT:
case SCHEMA:
case COLUMN:
@@ -156,7 +156,6 @@ public enum Token {
SESSION("SESSION"),
PROCEDURE("PROCEDURE"),
LOCAL("LOCAL"),
ZONE("ZONE"),
SYSDATE("SYSDATE"),
DECLARE("DECLARE"),
EXCEPTION("EXCEPTION"),