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

improve sqlwall

Browse Source
This commit is contained in:
kiki
2014-02-21 15:11:39 +08:00
parent 80ac7841ec
commit d9d6b2a29f
15 changed files with 105 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java
+7
View File
@@ -35,6 +35,13 @@ public class SQLOrderBy extends SQLObjectImpl {
this.items.add(item);
}
public void addItem(SQLSelectOrderByItem item) {
if (item != null) {
item.setParent(this);
}
this.items.add(item);
}
public List<SQLSelectOrderByItem> getItems() {
return this.items;
}
src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectGroupByClause.java
+7
View File
@@ -51,4 +51,11 @@ public class SQLSelectGroupByClause extends SQLObjectImpl {
public List<SQLExpr> getItems() {
return this.items;
}
public void addItem(SQLExpr sqlExpr) {
if (sqlExpr != null) {
sqlExpr.setParent(this);
this.items.add(sqlExpr);
}
}
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java
+6
View File
@@ -281,6 +281,9 @@ public class MySqlSelectQueryBlock extends SQLSelectQueryBlock implements MySqlO
}
public void setRowCount(SQLExpr rowCount) {
if (rowCount != null) {
rowCount.setParent(this);
}
this.rowCount = rowCount;
}
@@ -289,6 +292,9 @@ public class MySqlSelectQueryBlock extends SQLSelectQueryBlock implements MySqlO
}
public void setOffset(SQLExpr offset) {
if (offset != null) {
offset.setParent(this);
}
this.offset = offset;
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java
+4 -2
View File
@@ -235,7 +235,7 @@ public class MySqlSelectParser extends SQLSelectParser {
accept(Token.BY);
while (true) {
groupBy.getItems().add(this.exprParser.expr());
groupBy.addItem(this.exprParser.expr());
if (!(lexer.token() == (Token.COMMA))) {
break;
}
@@ -247,7 +247,9 @@ public class MySqlSelectParser extends SQLSelectParser {
acceptIdentifier("ROLLUP");
MySqlSelectGroupBy mySqlGroupBy = new MySqlSelectGroupBy();
mySqlGroupBy.getItems().addAll(groupBy.getItems());
for (SQLExpr sqlExpr : groupBy.getItems()) {
mySqlGroupBy.addItem(sqlExpr);
}
mySqlGroupBy.setRollUp(true);
groupBy = mySqlGroupBy;
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
+4 -2
View File
@@ -86,6 +86,8 @@ public class OracleExprParser extends SQLExprParser {
public boolean allowStringAdditive = false;
/**
@@ -729,11 +731,11 @@ public class OracleExprParser extends SQLExprParser {
accept(Token.BY);
orderBy.getItems().add(parseSelectOrderByItem());
orderBy.addItem(parseSelectOrderByItem());
while (lexer.token() == (Token.COMMA)) {
lexer.nextToken();
orderBy.getItems().add(parseSelectOrderByItem());
orderBy.addItem(parseSelectOrderByItem());
}
return orderBy;
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java
+5 -5
View File
@@ -244,7 +244,7 @@ public class OracleSelectParser extends SQLSelectParser {
OracleSelectQueryBlock queryBlock = new OracleSelectQueryBlock();
if (lexer.token() == Token.SELECT) {
lexer.nextToken();
if (lexer.token() == Token.COMMENT) {
lexer.nextToken();
}
@@ -575,9 +575,9 @@ public class OracleSelectParser extends SQLSelectParser {
accept(Token.LPAREN);
exprParser.exprList(groupingSet.getParameters());
accept(Token.RPAREN);
groupBy.getItems().add(groupingSet);
groupBy.addItem(groupingSet);
} else {
groupBy.getItems().add(this.exprParser.expr());
groupBy.addItem(this.exprParser.expr());
}
if (!(lexer.token() == (Token.COMMA))) {
@@ -612,9 +612,9 @@ public class OracleSelectParser extends SQLSelectParser {
accept(Token.LPAREN);
exprParser.exprList(groupingSet.getParameters());
accept(Token.RPAREN);
groupBy.getItems().add(groupingSet);
groupBy.addItem(groupingSet);
} else {
groupBy.getItems().add(this.exprParser.expr());
groupBy.addItem(this.exprParser.expr());
}
if (!(lexer.token() == (Token.COMMA))) {
src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java
+2 -2
View File
@@ -50,11 +50,11 @@ public class PGExprParser extends SQLExprParser {
accept(Token.BY);
orderBy.getItems().add(parseSelectOrderByItem());
orderBy.addItem(parseSelectOrderByItem());
while (lexer.token() == (Token.COMMA)) {
lexer.nextToken();
orderBy.getItems().add(parseSelectOrderByItem());
orderBy.addItem(parseSelectOrderByItem());
}
return orderBy;
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+2 -2
View File
@@ -907,11 +907,11 @@ public class SQLExprParser extends SQLParser {
accept(Token.BY);
orderBy.getItems().add(parseSelectOrderByItem());
orderBy.addItem(parseSelectOrderByItem());
while (lexer.token() == Token.COMMA) {
lexer.nextToken();
orderBy.getItems().add(parseSelectOrderByItem());
orderBy.addItem(parseSelectOrderByItem());
}
return orderBy;
src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
+2 -2
View File
@@ -243,7 +243,7 @@ public class SQLSelectParser extends SQLParser {
SQLSelectGroupByClause groupBy = new SQLSelectGroupByClause();
while (true) {
groupBy.getItems().add(expr());
groupBy.addItem(expr());
if (lexer.token() != Token.COMMA) {
break;
}
@@ -272,7 +272,7 @@ public class SQLSelectParser extends SQLParser {
for (;;) {
final SQLSelectItem selectItem = parseSelectItem();
selectList.add(selectItem);
if (lexer.token() != Token.COMMA) {
break;
}