Skip to content

Commit

Permalink
improved sql parser. bug fixed for oracle extract function. issue #1481
Browse files Browse the repository at this point in the history
  • Loading branch information
@wenshao
wenshao committed Nov 25, 2016
1 parent 8b8a3f9 commit 51a9a61
Show file tree
Hide file tree
Showing 13 changed files with 93 additions and 210 deletions.
67 changes: 27 additions & 40 deletions src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java
View file
Expand Up @@ -31,6 +31,8 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements Serializable {
private SQLExpr owner;
private final List<SQLExpr> parameters = new ArrayList<SQLExpr>();

private SQLExpr from;

public SQLMethodInvokeExpr(){

}
Expand Down Expand Up @@ -64,6 +66,14 @@ public void setOwner(SQLExpr owner) {
this.owner = owner;
}

public SQLExpr getFrom() {
return from;
}

public void setFrom(SQLExpr from) {
this.from = from;
}

public List<SQLExpr> getParameters() {
return this.parameters;
}
Expand Down Expand Up @@ -113,48 +123,25 @@ protected void accept0(OracleASTVisitor visitor) {
}

@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((methodName == null) ? 0 : methodName.hashCode());
result = prime * result + ((owner == null) ? 0 : owner.hashCode());
result = prime * result + ((parameters == null) ? 0 : parameters.hashCode());
return result;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;

SQLMethodInvokeExpr that = (SQLMethodInvokeExpr) o;

if (methodName != null ? !methodName.equals(that.methodName) : that.methodName != null) return false;
if (owner != null ? !owner.equals(that.owner) : that.owner != null) return false;
if (parameters != null ? !parameters.equals(that.parameters) : that.parameters != null) return false;
return from != null ? from.equals(that.from) : that.from == null;

}

@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
SQLMethodInvokeExpr other = (SQLMethodInvokeExpr) obj;
if (methodName == null) {
if (other.methodName != null) {
return false;
}
} else if (!methodName.equals(other.methodName)) {
return false;
}
if (owner == null) {
if (other.owner != null) {
return false;
}
} else if (!owner.equals(other.owner)) {
return false;
}
if (parameters == null) {
if (other.parameters != null) {
return false;
}
} else if (!parameters.equals(other.parameters)) {
return false;
}
return true;
public int hashCode() {
int result = methodName != null ? methodName.hashCode() : 0;
result = 31 * result + (owner != null ? owner.hashCode() : 0);
result = 31 * result + (parameters != null ? parameters.hashCode() : 0);
result = 31 * result + (from != null ? from.hashCode() : 0);
return result;
}
}
94 changes: 0 additions & 94 deletions src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java
View file

This file was deleted.

19 changes: 0 additions & 19 deletions src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
View file
Expand Up @@ -59,11 +59,8 @@
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleBinaryDoubleExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleBinaryFloatExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleCursorExpr;
import com.alibaba.druid.sql.ast.expr.SQLDateExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDateTimeUnit;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDatetimeExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDbLinkExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalType;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr;
Expand Down Expand Up @@ -325,22 +322,6 @@ public SQLExpr primary() {
String alias = '"' + lexer.stringVal() + '"';
lexer.nextToken();
return primaryRest(new SQLIdentifierExpr(alias));
case EXTRACT:
lexer.nextToken();
OracleExtractExpr extract = new OracleExtractExpr();

accept(Token.LPAREN);

extract.setUnit(OracleDateTimeUnit.valueOf(lexer.stringVal().toUpperCase()));
lexer.nextToken();

accept(Token.FROM);

extract.setFrom(expr());

accept(Token.RPAREN);

return primaryRest(extract);
case BINARY_FLOAT:
OracleBinaryFloatExpr floatExpr = new OracleBinaryFloatExpr();
floatExpr.setValue(Float.parseFloat(lexer.numberString()));
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java
View file
Expand Up @@ -39,7 +39,6 @@
import com.alibaba.druid.sql.ast.expr.SQLDateExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDatetimeExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDbLinkExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr;
Expand Down Expand Up @@ -114,8 +113,6 @@ public interface OracleASTVisitor extends SQLASTVisitor {

void endVisit(OracleDeleteStatement x);

void endVisit(OracleExtractExpr x);

void endVisit(OracleIntervalExpr x);

void endVisit(OracleOuterExpr x);
Expand Down Expand Up @@ -152,8 +149,6 @@ public interface OracleASTVisitor extends SQLASTVisitor {

boolean visit(OracleDeleteStatement x);

boolean visit(OracleExtractExpr x);

boolean visit(OracleIntervalExpr x);

boolean visit(OracleOuterExpr x);
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitorAdapter.java
View file
Expand Up @@ -46,10 +46,8 @@
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleBinaryDoubleExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleBinaryFloatExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleCursorExpr;
import com.alibaba.druid.sql.ast.expr.SQLDateExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDatetimeExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDbLinkExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr;
Expand Down Expand Up @@ -146,11 +144,6 @@ public void endVisit(OracleDeleteStatement x) {

}

@Override
public void endVisit(OracleExtractExpr x) {

}

@Override
public void endVisit(OracleIntervalExpr x) {

Expand Down Expand Up @@ -241,12 +234,6 @@ public boolean visit(OracleDeleteStatement x) {
return true;
}

@Override
public boolean visit(OracleExtractExpr x) {

return true;
}

@Override
public boolean visit(OracleIntervalExpr x) {

Expand Down
16 changes: 0 additions & 16 deletions src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
View file
Expand Up @@ -57,10 +57,8 @@
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleBinaryDoubleExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleBinaryFloatExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleCursorExpr;
import com.alibaba.druid.sql.ast.expr.SQLDateExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDatetimeExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDbLinkExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr;
Expand Down Expand Up @@ -273,15 +271,6 @@ public boolean visit(OracleDeleteStatement x) {
return false;
}

public boolean visit(OracleExtractExpr x) {
print0(ucase ? "EXTRACT(" : "extract(");
print0(x.getUnit().name());
print0(ucase ? " FROM " : " from ");
x.getFrom().accept(this);
print(')');
return false;
}

public boolean visit(OracleIntervalExpr x) {
if (x.getValue() instanceof SQLLiteralExpr) {
print0(ucase ? "INTERVAL " : "interval ");
Expand Down Expand Up @@ -777,11 +766,6 @@ public void endVisit(OracleDeleteStatement x) {

}

@Override
public void endVisit(OracleExtractExpr x) {

}

@Override
public void endVisit(OracleIntervalExpr x) {

Expand Down
13 changes: 0 additions & 13 deletions src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java
View file
Expand Up @@ -69,10 +69,8 @@
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleBinaryDoubleExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleBinaryFloatExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleCursorExpr;
import com.alibaba.druid.sql.ast.expr.SQLDateExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDatetimeExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDbLinkExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr;
Expand Down Expand Up @@ -365,11 +363,6 @@ public void endVisit(OracleDbLinkExpr x) {

}

@Override
public void endVisit(OracleExtractExpr x) {

}

@Override
public void endVisit(OracleIntervalExpr x) {

Expand Down Expand Up @@ -449,12 +442,6 @@ public boolean visit(OracleDbLinkExpr x) {
return true;
}

@Override
public boolean visit(OracleExtractExpr x) {

return true;
}

@Override
public boolean visit(OracleIntervalExpr x) {

Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
View file
Expand Up @@ -351,6 +351,7 @@ public SQLExpr primary() {
case EXCEPTION:
case FUNCTION:
case IDENTITY:
case EXTRACT:
sqlExpr = new SQLIdentifierExpr(lexer.stringVal());
lexer.nextToken();
break;
Expand Down Expand Up @@ -801,6 +802,12 @@ protected SQLExpr methodRest(SQLExpr expr, boolean acceptLPAREN) {
exprList(methodInvokeExpr.getParameters(), methodInvokeExpr);
}

if (lexer.token() == Token.FROM) {
lexer.nextToken();
SQLExpr from = this.expr();
methodInvokeExpr.setFrom(from);
}

accept(Token.RPAREN);

if (lexer.token() == Token.OVER) {
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
View file
Expand Up @@ -631,6 +631,13 @@ public boolean visit(SQLMethodInvokeExpr x) {
printFunctionName(x.getMethodName());
print('(');
printAndAccept(x.getParameters(), ", ");

SQLExpr from = x.getFrom();
if (from != null) {
print0(ucase ? " FROM " : " from ");
from.accept(this);
}

print(')');
return false;
}
Expand Down

0 comments on commit 51a9a61

Please sign in to comment.