diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java index 2a96af1254..bf424bf6a9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java @@ -66,7 +66,8 @@ public class OracleExprParser extends SQLExprParser { } public OracleExprParser(String text){ - super(text); + super(new OracleLexer(text)); + this.lexer.nextToken(); } public boolean isAggreateFunction(String word) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SqlServerExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SqlServerExprParser.java new file mode 100644 index 0000000000..c7892969e8 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SqlServerExprParser.java @@ -0,0 +1,17 @@ +package com.alibaba.druid.sql.dialect.sqlserver.parser; + +import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.ParserException; +import com.alibaba.druid.sql.parser.SQLExprParser; + +public class SqlServerExprParser extends SQLExprParser { + + public SqlServerExprParser(Lexer lexer){ + super(lexer); + } + + public SqlServerExprParser(String sql) throws ParserException{ + super(sql); + } + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SqlServerLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SqlServerLexer.java new file mode 100644 index 0000000000..9cc562470a --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SqlServerLexer.java @@ -0,0 +1,28 @@ +package com.alibaba.druid.sql.dialect.sqlserver.parser; + +import java.util.HashMap; +import java.util.Map; + +import com.alibaba.druid.sql.parser.Keywords; +import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.Token; + +public class SqlServerLexer extends Lexer { + + public final static Keywords DEFAULT_SQL_SERVER_KEYWORDS; + + static { + Map map = new HashMap(); + DEFAULT_SQL_SERVER_KEYWORDS = new Keywords(map); + } + + public SqlServerLexer(char[] input, int inputLength, boolean skipComment){ + super(input, inputLength, skipComment); + super.keywods = DEFAULT_SQL_SERVER_KEYWORDS; + } + + public SqlServerLexer(String input){ + super(input); + super.keywods = DEFAULT_SQL_SERVER_KEYWORDS; + } +}