refactor sql parser. sqlite support limit clause. #1556

This commit is contained in:
wenshao
2016-12-26 20:11:49 +08:00
parent 74b456d659
commit 77bfab01f5
32 changed files with 396 additions and 270 deletions
@@ -35,8 +35,6 @@ public class MySqlSelectQueryBlock extends SQLSelectQueryBlock implements MySqlO
private Boolean cache;
private boolean calcFoundRows;
private SQLLimit limit;
private SQLName procedureName;
private List<SQLExpr> procedureArgumentList;
@@ -150,17 +148,6 @@ public class MySqlSelectQueryBlock extends SQLSelectQueryBlock implements MySqlO
this.calcFoundRows = calcFoundRows;
}
public SQLLimit getLimit() {
return limit;
}
public void setLimit(SQLLimit limit) {
if (limit != null) {
limit.setParent(this);
}
this.limit = limit;
}
@Override
public int hashCode() {
final int prime = 31;
@@ -728,30 +728,6 @@ public class MySqlExprParser extends SQLExprParser {
return super.nameRest(name);
}
public SQLLimit parseLimit() {
if (lexer.token() == Token.LIMIT) {
lexer.nextToken();
SQLLimit limit = new SQLLimit();
SQLExpr temp = this.expr();
if (lexer.token() == (Token.COMMA)) {
limit.setOffset(temp);
lexer.nextToken();
limit.setRowCount(this.expr());
} else if (identifierEquals("OFFSET")) {
limit.setRowCount(temp);
lexer.nextToken();
limit.setOffset(this.expr());
} else {
limit.setRowCount(temp);
}
return limit;
}
return null;
}
@Override
public MySqlPrimaryKey parsePrimaryKey() {
accept(Token.PRIMARY);
@@ -157,7 +157,7 @@ public class MySqlSelectIntoParser extends SQLSelectParser {
queryBlock.setOrderBy(this.exprParser.parseOrderBy());
if (lexer.token() == Token.LIMIT) {
queryBlock.setLimit(parseLimit());
queryBlock.setLimit(this.exprParser.parseLimit());
}
if (lexer.token() == Token.PROCEDURE) {
@@ -344,14 +344,10 @@ public class MySqlSelectIntoParser extends SQLSelectParser {
public SQLUnionQuery unionRest(SQLUnionQuery union) {
if (lexer.token() == Token.LIMIT) {
MySqlUnionQuery mysqlUnionQuery = (MySqlUnionQuery) union;
mysqlUnionQuery.setLimit(parseLimit());
mysqlUnionQuery.setLimit(this.exprParser.parseLimit());
}
return super.unionRest(union);
}
public SQLLimit parseLimit() {
return ((MySqlExprParser) this.exprParser).parseLimit();
}
public MySqlExprParser getExprParser() {
return (MySqlExprParser) exprParser;
@@ -163,7 +163,7 @@ public class MySqlSelectParser extends SQLSelectParser {
queryBlock.setOrderBy(this.exprParser.parseOrderBy());
if (lexer.token() == Token.LIMIT) {
queryBlock.setLimit(parseLimit());
queryBlock.setLimit(this.exprParser.parseLimit());
}
if (lexer.token() == Token.PROCEDURE) {
@@ -304,7 +304,7 @@ public class MySqlSelectParser extends SQLSelectParser {
}
update.setOrderBy(this.exprParser.parseOrderBy());
update.setLimit(parseLimit());
update.setLimit(this.exprParser.parseLimit());
return update;
}
@@ -445,15 +445,11 @@ public class MySqlSelectParser extends SQLSelectParser {
public SQLUnionQuery unionRest(SQLUnionQuery union) {
if (lexer.token() == Token.LIMIT) {
MySqlUnionQuery mysqlUnionQuery = (MySqlUnionQuery) union;
mysqlUnionQuery.setLimit(parseLimit());
mysqlUnionQuery.setLimit(this.exprParser.parseLimit());
}
return super.unionRest(union);
}
public SQLLimit parseLimit() {
return ((MySqlExprParser) this.exprParser).parseLimit();
}
public MySqlExprParser getExprParser() {
return (MySqlExprParser) exprParser;
}
@@ -324,7 +324,7 @@ public class MySqlStatementParser extends SQLStatementParser {
deleteStatement.setOrderBy(orderBy);
}
deleteStatement.setLimit(parseLimit());
deleteStatement.setLimit(this.exprParser.parseLimit());
return deleteStatement;
}
@@ -865,7 +865,7 @@ public class MySqlStatementParser extends SQLStatementParser {
lexer.nextToken();
MySqlShowErrorsStatement stmt = new MySqlShowErrorsStatement();
stmt.setLimit(parseLimit());
stmt.setLimit(this.exprParser.parseLimit());
return stmt;
}
@@ -998,7 +998,7 @@ public class MySqlStatementParser extends SQLStatementParser {
stmt.setFrom(this.exprParser.expr());
}
stmt.setLimit(parseLimit());
stmt.setLimit(this.exprParser.parseLimit());
return stmt;
}
@@ -1341,7 +1341,7 @@ public class MySqlStatementParser extends SQLStatementParser {
stmt.setForQuery(this.exprParser.primary());
}
stmt.setLimit(this.parseLimit());
stmt.setLimit(this.exprParser.parseLimit());
return stmt;
}
@@ -1361,7 +1361,7 @@ public class MySqlStatementParser extends SQLStatementParser {
stmt.setFrom(this.exprParser.primary());
}
stmt.setLimit(this.parseLimit());
stmt.setLimit(this.exprParser.parseLimit());
return stmt;
}
@@ -1381,7 +1381,7 @@ public class MySqlStatementParser extends SQLStatementParser {
stmt.setFrom(this.exprParser.primary());
}
stmt.setLimit(this.parseLimit());
stmt.setLimit(this.exprParser.parseLimit());
return stmt;
}
@@ -1488,7 +1488,7 @@ public class MySqlStatementParser extends SQLStatementParser {
private MySqlShowWarningsStatement parseShowWarnings() {
MySqlShowWarningsStatement stmt = new MySqlShowWarningsStatement();
stmt.setLimit(parseLimit());
stmt.setLimit(this.exprParser.parseLimit());
return stmt;
}
@@ -2322,10 +2322,6 @@ public class MySqlStatementParser extends SQLStatementParser {
}
}
public SQLLimit parseLimit() {
return ((MySqlExprParser) this.exprParser).parseLimit();
}
public SQLStatement parseAlter() {
accept(Token.ALTER);