Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

sql parser refactor

Browse Source
This commit is contained in:
温少
2012-05-20 13:53:26 +08:00
parent 357dc07a29 952aa6d908
commit 6a4a229cbe
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTableParser.java
+1 -1
View File
@@ -223,7 +223,7 @@ public class OracleCreateTableParser extends SQLCreateTableParser {
if (lexer.token() == Token.AS) {
lexer.nextToken();
OracleSelect select = new OracleSelectParser(lexer).select();
OracleSelect select = new OracleSelectParser(exprParser).select();
stmt.setSelect(select);
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
+1 -1
View File
@@ -633,7 +633,7 @@ public class OracleExprParser extends SQLExprParser {
@Override
public OracleSelectParser createSelectParser() {
return new OracleSelectParser(this.lexer);
return new OracleSelectParser(this);
}
@Override
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java
+4 -5
View File
@@ -63,8 +63,8 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectSubqueryTableSo
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectTableReference;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectTableSource;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectUnPivot;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.ParserException;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.SQLParseException;
import com.alibaba.druid.sql.parser.SQLSelectParser;
import com.alibaba.druid.sql.parser.Token;
@@ -72,12 +72,11 @@ import com.alibaba.druid.sql.parser.Token;
public class OracleSelectParser extends SQLSelectParser {
public OracleSelectParser(String sql){
this(new OracleLexer(sql));
this.lexer.nextToken();
super (new OracleExprParser(sql));
}
public OracleSelectParser(Lexer lexer){
super(lexer);
public OracleSelectParser(SQLExprParser exprParser){
super(exprParser);
}
protected OracleExprParser createExprParser() {
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java
+3 -3
View File
@@ -161,7 +161,7 @@ public class OracleStatementParser extends SQLStatementParser {
}
if (lexer.token() == (Token.SELECT)) {
statementList.add(new SQLSelectStatement(new OracleSelectParser(this.lexer).select()));
statementList.add(new SQLSelectStatement(new OracleSelectParser(this.exprParser).select()));
continue;
}
@@ -197,7 +197,7 @@ public class OracleStatementParser extends SQLStatementParser {
}
if (lexer.token() == Token.WITH) {
statementList.add(new SQLSelectStatement(new OracleSelectParser(this.lexer).select()));
statementList.add(new SQLSelectStatement(new OracleSelectParser(this.exprParser).select()));
continue;
}
@@ -1106,7 +1106,7 @@ public class OracleStatementParser extends SQLStatementParser {
}
public OracleSelectParser createSQLSelectParser() {
return new OracleSelectParser(this.lexer);
return new OracleSelectParser(this.exprParser);
}
public OracleMergeStatement parseMerge() throws ParserException {
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java
+3 -5
View File
@@ -6,7 +6,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelect;
import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
import com.alibaba.druid.sql.dialect.sqlserver.ast.Top;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.ParserException;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.SQLSelectParser;
@@ -15,12 +14,11 @@ import com.alibaba.druid.sql.parser.Token;
public class SQLServerSelectParser extends SQLSelectParser {
public SQLServerSelectParser(String sql){
super(new SQLServerLexer(sql));
this.lexer.nextToken();
super(new SQLServerExprParser(sql));
}
public SQLServerSelectParser(Lexer lexer){
super(lexer);
public SQLServerSelectParser(SQLExprParser exprParser){
super(exprParser);
}
public SQLSelect select() throws ParserException {
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerStatementParser.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class SQLServerStatementParser extends SQLStatementParser {
}
public SQLSelectParser createSQLSelectParser() {
return new SQLServerSelectParser(this.lexer);
return new SQLServerSelectParser(this.exprParser);
}
public SQLServerStatementParser(Lexer lexer){