mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
improved sql parsre.
This commit is contained in:
+10
@@ -1025,4 +1025,14 @@ public class OracleToMySqlOutputVisitor extends MySqlOutputVisitor implements Or
|
||||
public void endVisit(OraclePipeRowStatement x) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visit(OracleIsOfTypeExpr x) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void endVisit(OracleIsOfTypeExpr x) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
package com.alibaba.druid.sql.dialect.oracle.ast;
|
||||
|
||||
import com.alibaba.druid.sql.SQLUtils;
|
||||
import com.alibaba.druid.sql.ast.SQLDataType;
|
||||
import com.alibaba.druid.sql.ast.SQLExpr;
|
||||
import com.alibaba.druid.sql.ast.SQLObjectImpl;
|
||||
@@ -41,4 +42,8 @@ public abstract class OracleSQLObjectImpl extends SQLObjectImpl implements Oracl
|
||||
public SQLDataType computeDataType() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return SQLUtils.toOracleString(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,10 +19,14 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.alibaba.druid.sql.ast.SQLExpr;
|
||||
import com.alibaba.druid.sql.ast.SQLExprImpl;
|
||||
import com.alibaba.druid.sql.ast.SQLObject;
|
||||
import com.alibaba.druid.sql.ast.SQLOrderBy;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLSelect;
|
||||
import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl;
|
||||
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExpr;
|
||||
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
|
||||
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
|
||||
|
||||
public class ModelClause extends OracleSQLObjectImpl {
|
||||
|
||||
@@ -391,7 +395,7 @@ public class ModelClause extends OracleSQLObjectImpl {
|
||||
|
||||
}
|
||||
|
||||
public static class CellAssignment extends OracleSQLObjectImpl {
|
||||
public static class CellAssignment extends SQLExprImpl implements OracleExpr {
|
||||
|
||||
private SQLExpr measureColumn;
|
||||
private final List<SQLExpr> conditions = new ArrayList<SQLExpr>();
|
||||
@@ -404,8 +408,11 @@ public class ModelClause extends OracleSQLObjectImpl {
|
||||
return measureColumn;
|
||||
}
|
||||
|
||||
public void setMeasureColumn(SQLExpr measureColumn) {
|
||||
this.measureColumn = measureColumn;
|
||||
public void setMeasureColumn(SQLExpr e) {
|
||||
if (e != null) {
|
||||
e.setParent(this);
|
||||
}
|
||||
this.measureColumn = e;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -417,6 +424,46 @@ public class ModelClause extends OracleSQLObjectImpl {
|
||||
visitor.endVisit(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
|
||||
CellAssignment that = (CellAssignment) o;
|
||||
|
||||
if (measureColumn != null ? !measureColumn.equals(that.measureColumn) : that.measureColumn != null)
|
||||
return false;
|
||||
return conditions != null ? conditions.equals(that.conditions) : that.conditions == null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int result = measureColumn != null ? measureColumn.hashCode() : 0;
|
||||
result = 31 * result + (conditions != null ? conditions.hashCode() : 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void accept0(SQLASTVisitor visitor) {
|
||||
accept0((OracleASTVisitor) visitor);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SQLExpr clone() {
|
||||
CellAssignment x = new CellAssignment();
|
||||
if (measureColumn != null) {
|
||||
x.setMeasureColumn(measureColumn.clone());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SQLObject> getChildren() {
|
||||
List children = new ArrayList();
|
||||
children.add(measureColumn);
|
||||
children.addAll(conditions);
|
||||
return children;
|
||||
}
|
||||
}
|
||||
|
||||
public ModelClause clone() {
|
||||
|
||||
+17
-6
@@ -18,6 +18,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr;
|
||||
import com.alibaba.druid.sql.ast.SQLExpr;
|
||||
import com.alibaba.druid.sql.ast.SQLExprImpl;
|
||||
import com.alibaba.druid.sql.ast.SQLObject;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
|
||||
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
|
||||
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
|
||||
@@ -29,10 +30,10 @@ public class OracleIntervalExpr extends SQLExprImpl implements SQLLiteralExpr, O
|
||||
|
||||
private SQLExpr value;
|
||||
private OracleIntervalType type;
|
||||
private Integer precision;
|
||||
private SQLExpr precision;
|
||||
private Integer factionalSecondsPrecision;
|
||||
private OracleIntervalType toType;
|
||||
private Integer toFactionalSecondsPrecision;
|
||||
private SQLExpr toFactionalSecondsPrecision;
|
||||
|
||||
public OracleIntervalExpr(){
|
||||
|
||||
@@ -72,11 +73,18 @@ public class OracleIntervalExpr extends SQLExprImpl implements SQLLiteralExpr, O
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public Integer getPrecision() {
|
||||
public SQLExpr getPrecision() {
|
||||
return this.precision;
|
||||
}
|
||||
|
||||
public void setPrecision(Integer precision) {
|
||||
this.setPrecision(new SQLIntegerExpr(precision));
|
||||
}
|
||||
|
||||
public void setPrecision(SQLExpr precision) {
|
||||
if (precision != null) {
|
||||
precision.setParent(this);
|
||||
}
|
||||
this.precision = precision;
|
||||
}
|
||||
|
||||
@@ -96,12 +104,15 @@ public class OracleIntervalExpr extends SQLExprImpl implements SQLLiteralExpr, O
|
||||
this.toType = toType;
|
||||
}
|
||||
|
||||
public Integer getToFactionalSecondsPrecision() {
|
||||
public SQLExpr getToFactionalSecondsPrecision() {
|
||||
return this.toFactionalSecondsPrecision;
|
||||
}
|
||||
|
||||
public void setToFactionalSecondsPrecision(Integer toFactionalSecondsPrecision) {
|
||||
this.toFactionalSecondsPrecision = toFactionalSecondsPrecision;
|
||||
public void setToFactionalSecondsPrecision(SQLExpr x) {
|
||||
if (x != null) {
|
||||
x.setParent(this);
|
||||
}
|
||||
this.toFactionalSecondsPrecision = x;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
/*
|
||||
* Copyright 1999-2017 Alibaba Group Holding Ltd.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.alibaba.druid.sql.dialect.oracle.ast.expr;
|
||||
|
||||
import com.alibaba.druid.sql.ast.SQLExpr;
|
||||
import com.alibaba.druid.sql.ast.SQLExprImpl;
|
||||
import com.alibaba.druid.sql.ast.SQLName;
|
||||
import com.alibaba.druid.sql.ast.SQLObject;
|
||||
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
|
||||
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class OracleIsOfTypeExpr extends SQLExprImpl implements OracleExpr {
|
||||
private SQLExpr expr;
|
||||
private List<SQLExpr> types = new ArrayList<SQLExpr>();
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
|
||||
OracleIsOfTypeExpr that = (OracleIsOfTypeExpr) o;
|
||||
|
||||
if (expr != null ? !expr.equals(that.expr) : that.expr != null) return false;
|
||||
return types != null ? types.equals(that.types) : that.types == null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int result = expr != null ? expr.hashCode() : 0;
|
||||
result = 31 * result + (types != null ? types.hashCode() : 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void accept0(SQLASTVisitor visitor) {
|
||||
accept0((OracleASTVisitor) visitor);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept0(OracleASTVisitor visitor) {
|
||||
if (visitor.visit(this)) {
|
||||
acceptChild(visitor, expr);
|
||||
acceptChild(visitor, types);
|
||||
}
|
||||
visitor.endVisit(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SQLExpr clone() {
|
||||
OracleIsOfTypeExpr x = new OracleIsOfTypeExpr();
|
||||
if (expr != null) {
|
||||
x.setExpr(expr);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SQLObject> getChildren() {
|
||||
List children = new ArrayList<SQLExpr>();
|
||||
if (expr != null) {
|
||||
children.add(expr);
|
||||
}
|
||||
children.addAll(types);
|
||||
return children;
|
||||
}
|
||||
|
||||
public SQLExpr getExpr() {
|
||||
return expr;
|
||||
}
|
||||
|
||||
public void setExpr(SQLExpr expr) {
|
||||
if (expr != null) {
|
||||
expr.setParent(this);
|
||||
}
|
||||
this.expr = expr;
|
||||
}
|
||||
|
||||
public List<SQLExpr> getTypes() {
|
||||
return types;
|
||||
}
|
||||
}
|
||||
@@ -92,6 +92,9 @@ public class OracleSelectPivot extends OracleSelectPivotBase {
|
||||
}
|
||||
|
||||
public void setExpr(SQLExpr expr) {
|
||||
if (expr != null) {
|
||||
expr.setParent(this);
|
||||
}
|
||||
this.expr = expr;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,21 +20,7 @@ import java.util.Arrays;
|
||||
|
||||
import com.alibaba.druid.sql.ast.*;
|
||||
import com.alibaba.druid.sql.ast.SQLKeep.DenseRank;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLAggregateOption;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLSequenceExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLUnaryOperator;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.*;
|
||||
import com.alibaba.druid.sql.ast.statement.*;
|
||||
import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeIntervalDay;
|
||||
import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeIntervalYear;
|
||||
@@ -592,6 +578,17 @@ public class OracleExprParser extends SQLExprParser {
|
||||
|
||||
expr = dblink;
|
||||
}
|
||||
|
||||
if (lexer.token() == Token.LBRACKET) {
|
||||
SQLArrayExpr arrayExpr = new SQLArrayExpr();
|
||||
arrayExpr.setExpr(expr);
|
||||
lexer.nextToken();
|
||||
this.exprList(arrayExpr.getValues(), arrayExpr);
|
||||
accept(Token.RBRACKET);
|
||||
expr = arrayExpr;
|
||||
|
||||
expr = primaryRest(expr);
|
||||
}
|
||||
|
||||
if (lexer.identifierEquals("DAY") || lexer.identifierEquals("YEAR")) {
|
||||
Lexer.SavePoint savePoint = lexer.mark();
|
||||
@@ -743,6 +740,10 @@ public class OracleExprParser extends SQLExprParser {
|
||||
lexer.nextToken();
|
||||
acceptIdentifier("NULLS");
|
||||
aggregateExpr.setIgnoreNulls(true);
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.RESPECT)) {
|
||||
lexer.nextToken();
|
||||
acceptIdentifier("NULLS");
|
||||
aggregateExpr.setIgnoreNulls(false);
|
||||
}
|
||||
|
||||
accept(Token.RPAREN);
|
||||
@@ -873,10 +874,15 @@ public class OracleExprParser extends SQLExprParser {
|
||||
accept(Token.INTERVAL);
|
||||
|
||||
OracleIntervalExpr interval = new OracleIntervalExpr();
|
||||
if (lexer.token() != Token.LITERAL_CHARS) {
|
||||
|
||||
if (lexer.token() == Token.LITERAL_CHARS) {
|
||||
interval.setValue(new SQLCharExpr(lexer.stringVal()));
|
||||
} else if (lexer.token() == Token.VARIANT) {
|
||||
interval.setValue(new SQLVariantRefExpr(lexer.stringVal()));
|
||||
} else {
|
||||
return new SQLIdentifierExpr("INTERVAL");
|
||||
}
|
||||
interval.setValue(new SQLCharExpr(lexer.stringVal()));
|
||||
|
||||
lexer.nextToken();
|
||||
|
||||
OracleIntervalType type;
|
||||
@@ -906,12 +912,11 @@ public class OracleExprParser extends SQLExprParser {
|
||||
|
||||
if (lexer.token() == Token.LPAREN) {
|
||||
lexer.nextToken();
|
||||
if (lexer.token() != Token.LITERAL_INT) {
|
||||
if (lexer.token() != Token.LITERAL_INT && lexer.token() != Token.VARIANT) {
|
||||
throw new ParserException("syntax error. " + lexer.info());
|
||||
}
|
||||
interval.setPrecision(lexer.integerValue().intValue());
|
||||
lexer.nextToken();
|
||||
|
||||
interval.setPrecision(this.primary());
|
||||
|
||||
if (lexer.token() == Token.COMMA) {
|
||||
lexer.nextToken();
|
||||
if (lexer.token() != Token.LITERAL_INT) {
|
||||
@@ -930,11 +935,10 @@ public class OracleExprParser extends SQLExprParser {
|
||||
interval.setToType(OracleIntervalType.SECOND);
|
||||
if (lexer.token() == Token.LPAREN) {
|
||||
lexer.nextToken();
|
||||
if (lexer.token() != Token.LITERAL_INT) {
|
||||
if (lexer.token() != Token.LITERAL_INT && lexer.token() != Token.VARIANT) {
|
||||
throw new ParserException("syntax error. " + lexer.info());
|
||||
}
|
||||
interval.setToFactionalSecondsPrecision(lexer.integerValue().intValue());
|
||||
lexer.nextToken();
|
||||
interval.setToFactionalSecondsPrecision(primary());
|
||||
accept(Token.RPAREN);
|
||||
}
|
||||
} else {
|
||||
@@ -958,6 +962,41 @@ public class OracleExprParser extends SQLExprParser {
|
||||
lexer.nextToken();
|
||||
accept(Token.SET);
|
||||
expr = new OracleIsSetExpr(expr);
|
||||
} else if (lexer.token() == Token.OF) {
|
||||
lexer.nextToken();
|
||||
|
||||
if (lexer.identifierEquals(FnvHash.Constants.TYPE)) {
|
||||
lexer.nextToken();
|
||||
}
|
||||
|
||||
OracleIsOfTypeExpr isOf = new OracleIsOfTypeExpr();
|
||||
isOf.setExpr(expr);
|
||||
accept(Token.LPAREN);
|
||||
|
||||
for (;;) {
|
||||
boolean only = lexer.identifierEquals(FnvHash.Constants.ONLY);
|
||||
if (only) {
|
||||
lexer.nextToken();
|
||||
}
|
||||
|
||||
SQLExpr type = this.name();
|
||||
if (only) {
|
||||
type.putAttribute("ONLY", true);
|
||||
}
|
||||
|
||||
type.setParent(isOf);
|
||||
isOf.getTypes().add(type);
|
||||
|
||||
if (lexer.token() == Token.COMMA) {
|
||||
lexer.nextToken();
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
accept(Token.RPAREN);
|
||||
|
||||
expr = isOf;
|
||||
} else {
|
||||
SQLExpr rightExpr = primary();
|
||||
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Is, rightExpr, getDbType());
|
||||
|
||||
@@ -144,7 +144,8 @@ public class OracleLexer extends Lexer {
|
||||
}
|
||||
|
||||
public void scanVariable() {
|
||||
if (ch != ':' && ch != '#' && ch != '$') {
|
||||
final char c0 = ch;
|
||||
if (c0 != ':' && c0 != '#' && c0 != '$') {
|
||||
throw new ParserException("illegal variable. " + info());
|
||||
}
|
||||
|
||||
@@ -154,25 +155,46 @@ public class OracleLexer extends Lexer {
|
||||
|
||||
boolean quoteFlag = false;
|
||||
boolean mybatisFlag = false;
|
||||
if (charAt(pos + 1) == '"') {
|
||||
|
||||
char c1 = charAt(pos + 1);
|
||||
if (c0 == ':' && c1 == ' ') {
|
||||
pos++;
|
||||
bufPos = 2;
|
||||
c1 = charAt(pos + 1);
|
||||
}
|
||||
|
||||
if (c1 == '"') {
|
||||
pos++;
|
||||
bufPos++;
|
||||
quoteFlag = true;
|
||||
} else if (charAt(pos + 1) == '{') {
|
||||
} else if (c1 == '{') {
|
||||
pos++;
|
||||
bufPos++;
|
||||
mybatisFlag = true;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
ch = charAt(++pos);
|
||||
if (c0 == ':' && c1 >= '0' && c1 <= '9') {
|
||||
for (; ; ) {
|
||||
ch = charAt(++pos);
|
||||
|
||||
if (!isIdentifierChar(ch)) {
|
||||
break;
|
||||
if (ch < '0' || ch > '9') {
|
||||
break;
|
||||
}
|
||||
|
||||
bufPos++;
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
for (; ; ) {
|
||||
ch = charAt(++pos);
|
||||
|
||||
bufPos++;
|
||||
continue;
|
||||
if (!isIdentifierChar(ch)) {
|
||||
break;
|
||||
}
|
||||
|
||||
bufPos++;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (quoteFlag) {
|
||||
|
||||
@@ -48,6 +48,7 @@ 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.*;
|
||||
import com.alibaba.druid.util.FnvHash;
|
||||
|
||||
public class OracleSelectParser extends SQLSelectParser {
|
||||
|
||||
@@ -204,8 +205,16 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
throw new ParserException("syntax erorr : " + lexer.token());
|
||||
}
|
||||
|
||||
searchClause.setType(SearchClause.Type.valueOf(lexer.stringVal()));
|
||||
lexer.nextToken();
|
||||
if (lexer.identifierEquals(FnvHash.Constants.DEPTH)) {
|
||||
lexer.nextToken();
|
||||
searchClause.setType(SearchClause.Type.DEPTH);
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.BREADTH)) {
|
||||
lexer.nextToken();
|
||||
searchClause.setType(SearchClause.Type.BREADTH);
|
||||
} else {
|
||||
searchClause.setType(SearchClause.Type.valueOf(lexer.stringVal().toUpperCase()));
|
||||
lexer.nextToken();
|
||||
}
|
||||
|
||||
acceptIdentifier("FIRST");
|
||||
accept(Token.BY);
|
||||
@@ -522,9 +531,16 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
item.setCellAssignment(parseCellAssignment());
|
||||
item.setOrderBy(this.parseOrderBy());
|
||||
accept(Token.EQ);
|
||||
item.setExpr(expr());
|
||||
|
||||
SQLExpr expr = this.expr();
|
||||
item.setExpr(expr);
|
||||
|
||||
modelRulesClause.getCellAssignmentItems().add(item);
|
||||
|
||||
if (lexer.token() == Token.COMMA) {
|
||||
lexer.nextToken();
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
mainModel.setModelRulesClause(modelRulesClause);
|
||||
@@ -533,7 +549,7 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
private CellAssignment parseCellAssignment() {
|
||||
CellAssignment cellAssignment = new CellAssignment();
|
||||
|
||||
cellAssignment.setMeasureColumn(expr());
|
||||
cellAssignment.setMeasureColumn(this.exprParser.name());
|
||||
accept(Token.LBRACKET);
|
||||
this.exprParser.exprList(cellAssignment.getConditions(), cellAssignment);
|
||||
accept(Token.RBRACKET);
|
||||
@@ -609,6 +625,7 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
} else if (lexer.token() == Token.IDENTIFIER) {
|
||||
SQLTableSource identTable = parseTableSource();
|
||||
accept(Token.RPAREN);
|
||||
parsePivot((OracleSelectTableSource) identTable);
|
||||
return identTable;
|
||||
} else {
|
||||
throw new ParserException("TODO :" + lexer.info());
|
||||
@@ -688,6 +705,11 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
lexer.nextToken();
|
||||
partition.setPartition(exprParser.name());
|
||||
accept(Token.RPAREN);
|
||||
} else if (lexer.token() == Token.BY) {
|
||||
lexer.nextToken();
|
||||
accept(Token.LPAREN);
|
||||
partition.setPartition(exprParser.name());
|
||||
accept(Token.RPAREN);
|
||||
} else {
|
||||
accept(Token.FOR);
|
||||
accept(Token.LPAREN);
|
||||
@@ -861,6 +883,14 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
if (lexer.token() == Token.ON) {
|
||||
lexer.nextToken();
|
||||
join.setCondition(this.exprParser.expr());
|
||||
|
||||
if (lexer.token() == Token.ON
|
||||
&& tableSource instanceof SQLJoinTableSource
|
||||
&& ((SQLJoinTableSource) tableSource).getCondition() == null) {
|
||||
lexer.nextToken();
|
||||
SQLExpr leftCondidition = this.exprParser.expr();
|
||||
((SQLJoinTableSource) tableSource).setCondition(leftCondidition);
|
||||
}
|
||||
} else if (lexer.token() == Token.USING) {
|
||||
lexer.nextToken();
|
||||
accept(Token.LPAREN);
|
||||
@@ -868,6 +898,8 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
accept(Token.RPAREN);
|
||||
}
|
||||
|
||||
parsePivot(join);
|
||||
|
||||
return parseTableSourceRest(join);
|
||||
}
|
||||
|
||||
@@ -921,25 +953,28 @@ public class OracleSelectParser extends SQLSelectParser {
|
||||
|
||||
accept(Token.IN);
|
||||
accept(Token.LPAREN);
|
||||
if (lexer.token() == (Token.LPAREN)) {
|
||||
throw new ParserException("TODO. " + lexer.info());
|
||||
}
|
||||
// if (lexer.token() == (Token.LPAREN)) {
|
||||
// throw new ParserException("TODO. " + lexer.info());
|
||||
// }
|
||||
|
||||
if (lexer.token() == (Token.SELECT)) {
|
||||
throw new ParserException("TODO. " + lexer.info());
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
SQLExpr expr = this.exprParser.expr();
|
||||
item = new OracleSelectPivot.Item();
|
||||
item.setExpr(this.exprParser.expr());
|
||||
item.setAlias(as());
|
||||
item.setExpr(expr);
|
||||
pivot.getPivotIn().add(item);
|
||||
} else {
|
||||
for (; ; ) {
|
||||
item = new OracleSelectPivot.Item();
|
||||
item.setExpr(this.exprParser.expr());
|
||||
item.setAlias(as());
|
||||
pivot.getPivotIn().add(item);
|
||||
|
||||
if (lexer.token() != Token.COMMA) {
|
||||
break;
|
||||
if (lexer.token() != Token.COMMA) {
|
||||
break;
|
||||
}
|
||||
|
||||
lexer.nextToken();
|
||||
}
|
||||
|
||||
lexer.nextToken();
|
||||
}
|
||||
|
||||
accept(Token.RPAREN);
|
||||
|
||||
+4
-1
@@ -1381,7 +1381,10 @@ public class OracleStatementParser extends SQLStatementParser {
|
||||
stmt.addItem(item);
|
||||
|
||||
accept(Token.RPAREN);
|
||||
} else if (lexer.token() == Token.CONSTRAINT) {
|
||||
} else if (lexer.token() == Token.CONSTRAINT
|
||||
|| lexer.token() == Token.FOREIGN
|
||||
|| lexer.token() == Token.PRIMARY
|
||||
|| lexer.token() == Token.UNIQUE) {
|
||||
OracleConstraint constraint = ((OracleExprParser) this.exprParser).parseConstaint();
|
||||
SQLAlterTableAddConstraint item = new SQLAlterTableAddConstraint();
|
||||
constraint.setParent(item);
|
||||
|
||||
@@ -437,4 +437,8 @@ public interface OracleASTVisitor extends SQLASTVisitor {
|
||||
boolean visit(OraclePipeRowStatement x);
|
||||
|
||||
void endVisit(OraclePipeRowStatement x);
|
||||
|
||||
boolean visit(OracleIsOfTypeExpr x);
|
||||
|
||||
void endVisit(OracleIsOfTypeExpr x);
|
||||
}
|
||||
|
||||
+10
@@ -1083,4 +1083,14 @@ public class OracleASTVisitorAdapter extends SQLASTVisitorAdapter implements Ora
|
||||
public void endVisit(OraclePipeRowStatement x) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visit(OracleIsOfTypeExpr x) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void endVisit(OracleIsOfTypeExpr x) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+37
-4
@@ -187,7 +187,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
|
||||
|
||||
if (x.getPrecision() != null) {
|
||||
print('(');
|
||||
print(x.getPrecision().intValue());
|
||||
printExpr(x.getPrecision());
|
||||
if (x.getFactionalSecondsPrecision() != null) {
|
||||
print0(", ");
|
||||
print(x.getFactionalSecondsPrecision().intValue());
|
||||
@@ -200,7 +200,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
|
||||
print0(x.getToType().name());
|
||||
if (x.getToFactionalSecondsPrecision() != null) {
|
||||
print('(');
|
||||
print(x.getToFactionalSecondsPrecision().intValue());
|
||||
printExpr(x.getToFactionalSecondsPrecision());
|
||||
print(')');
|
||||
}
|
||||
}
|
||||
@@ -297,6 +297,12 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
|
||||
printFlashback(x.getFlashback());
|
||||
}
|
||||
|
||||
OracleSelectPivotBase pivot = x.getPivot();
|
||||
if (pivot != null) {
|
||||
println();
|
||||
pivot.accept(this);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -471,9 +477,10 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
|
||||
println();
|
||||
print(')');
|
||||
|
||||
if (x.getPivot() != null) {
|
||||
OracleSelectPivotBase pivot = x.getPivot();
|
||||
if (pivot != null) {
|
||||
println();
|
||||
x.getPivot().accept(this);
|
||||
pivot.accept(this);
|
||||
}
|
||||
|
||||
printFlashback(x.getFlashback());
|
||||
@@ -3341,4 +3348,30 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
|
||||
public void endVisit(OraclePipeRowStatement x) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visit(OracleIsOfTypeExpr x) {
|
||||
printExpr(x.getExpr());
|
||||
print0(ucase ? " IS OF TYPE (" : " is of type (");
|
||||
|
||||
List<SQLExpr> types = x.getTypes();
|
||||
for (int i = 0, size = types.size(); i < size; ++i) {
|
||||
if (i != 0) {
|
||||
print0(", ");
|
||||
}
|
||||
SQLExpr type = types.get(i);
|
||||
if (Boolean.TRUE == type.getAttribute("ONLY")) {
|
||||
print0(ucase ? "ONLY " : "only ");
|
||||
}
|
||||
type.accept(this);
|
||||
}
|
||||
|
||||
print(')');
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void endVisit(OracleIsOfTypeExpr x) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+10
@@ -1375,4 +1375,14 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements Oracle
|
||||
public void endVisit(OraclePipeRowStatement x) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visit(OracleIsOfTypeExpr x) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void endVisit(OracleIsOfTypeExpr x) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,7 +33,12 @@ public class PGTypeCastExpr extends SQLCastExpr implements PGExpr {
|
||||
|
||||
@Override
|
||||
protected void accept0(SQLASTVisitor visitor) {
|
||||
accept0((PGASTVisitor) visitor);
|
||||
if (visitor instanceof PGASTVisitor) {
|
||||
accept0((PGASTVisitor) visitor);
|
||||
return;
|
||||
}
|
||||
|
||||
super.accept0(visitor);
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
|
||||
+6
-1
@@ -38,7 +38,12 @@ public class PGUpdateStatement extends SQLUpdateStatement implements PGSQLStatem
|
||||
}
|
||||
|
||||
protected void accept0(SQLASTVisitor visitor) {
|
||||
accept0((PGASTVisitor) visitor);
|
||||
if (visitor instanceof PGASTVisitor) {
|
||||
accept0((PGASTVisitor) visitor);
|
||||
return;
|
||||
}
|
||||
|
||||
super.accept0(visitor);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+74
@@ -31,6 +31,8 @@ import com.alibaba.druid.sql.parser.Lexer;
|
||||
import com.alibaba.druid.sql.parser.ParserException;
|
||||
import com.alibaba.druid.sql.parser.SQLStatementParser;
|
||||
import com.alibaba.druid.sql.parser.Token;
|
||||
import com.alibaba.druid.util.FnvHash;
|
||||
import com.alibaba.druid.util.JdbcConstants;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -393,5 +395,77 @@ public class PGSQLStatementParser extends SQLStatementParser {
|
||||
return stmt;
|
||||
}
|
||||
|
||||
public SQLCreateSequenceStatement parseCreateSequence(boolean acceptCreate) {
|
||||
if (acceptCreate) {
|
||||
accept(Token.CREATE);
|
||||
}
|
||||
|
||||
accept(Token.SEQUENCE);
|
||||
|
||||
SQLCreateSequenceStatement stmt = new SQLCreateSequenceStatement();
|
||||
stmt.setDbType(dbType);
|
||||
stmt.setName(this.exprParser.name());
|
||||
|
||||
for (;;) {
|
||||
if (lexer.token() == Token.START) {
|
||||
lexer.nextToken();
|
||||
accept(Token.WITH);
|
||||
stmt.setStartWith(this.exprParser.expr());
|
||||
continue;
|
||||
} else if (lexer.identifierEquals("INCREMENT")) {
|
||||
lexer.nextToken();
|
||||
accept(Token.BY);
|
||||
stmt.setIncrementBy(this.exprParser.expr());
|
||||
continue;
|
||||
} else if (lexer.token() == Token.CACHE || lexer.identifierEquals(FnvHash.Constants.CACHE)) {
|
||||
lexer.nextToken();
|
||||
stmt.setCache(Boolean.TRUE);
|
||||
|
||||
if (lexer.token() == Token.LITERAL_INT) {
|
||||
stmt.setCacheValue(this.exprParser.primary());
|
||||
}
|
||||
continue;
|
||||
} else if (lexer.token() == Token.NOCACHE) {
|
||||
lexer.nextToken();
|
||||
stmt.setCache(Boolean.FALSE);
|
||||
continue;
|
||||
} else if (lexer.token() == Token.ORDER) {
|
||||
lexer.nextToken();
|
||||
stmt.setOrder(Boolean.TRUE);
|
||||
continue;
|
||||
} else if (lexer.identifierEquals("NOORDER")) {
|
||||
lexer.nextToken();
|
||||
stmt.setOrder(Boolean.FALSE);
|
||||
continue;
|
||||
} else if (lexer.identifierEquals("CYCLE")) {
|
||||
lexer.nextToken();
|
||||
stmt.setCycle(Boolean.TRUE);
|
||||
continue;
|
||||
} else if (lexer.identifierEquals("NOCYCLE")) {
|
||||
lexer.nextToken();
|
||||
stmt.setCycle(Boolean.FALSE);
|
||||
continue;
|
||||
} else if (lexer.identifierEquals("MINVALUE")) {
|
||||
lexer.nextToken();
|
||||
stmt.setMinValue(this.exprParser.expr());
|
||||
continue;
|
||||
} else if (lexer.identifierEquals("MAXVALUE")) {
|
||||
lexer.nextToken();
|
||||
stmt.setMaxValue(this.exprParser.expr());
|
||||
continue;
|
||||
} else if (lexer.identifierEquals("NOMAXVALUE")) {
|
||||
lexer.nextToken();
|
||||
stmt.setNoMaxValue(true);
|
||||
continue;
|
||||
} else if (lexer.identifierEquals("NOMINVALUE")) {
|
||||
lexer.nextToken();
|
||||
stmt.setNoMinValue(true);
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return stmt;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+27
-2
@@ -1082,7 +1082,7 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor
|
||||
|
||||
if (x.getPrecision() != null) {
|
||||
print('(');
|
||||
print(x.getPrecision().intValue());
|
||||
printExpr(x.getPrecision());
|
||||
if (x.getFactionalSecondsPrecision() != null) {
|
||||
print0(", ");
|
||||
print(x.getFactionalSecondsPrecision().intValue());
|
||||
@@ -1095,7 +1095,7 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor
|
||||
print0(x.getToType().name());
|
||||
if (x.getToFactionalSecondsPrecision() != null) {
|
||||
print('(');
|
||||
print(x.getToFactionalSecondsPrecision().intValue());
|
||||
printExpr(x.getToFactionalSecondsPrecision());
|
||||
print(')');
|
||||
}
|
||||
}
|
||||
@@ -2770,4 +2770,29 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor
|
||||
x.getExpr().accept(this);
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visit(OracleIsOfTypeExpr x) {
|
||||
printExpr(x.getExpr());
|
||||
print0(ucase ? " IS OF TYPE (" : " is of type (");
|
||||
|
||||
List<SQLExpr> types = x.getTypes();
|
||||
for (int i = 0, size = types.size(); i < size; ++i) {
|
||||
if (i != 0) {
|
||||
print0(", ");
|
||||
}
|
||||
SQLExpr type = types.get(i);
|
||||
if (Boolean.TRUE == type.getAttribute("ONLY")) {
|
||||
print0(ucase ? "ONLY " : "only ");
|
||||
}
|
||||
type.accept(this);
|
||||
}
|
||||
|
||||
print(')');
|
||||
return false;
|
||||
}
|
||||
|
||||
public void endVisit(OracleIsOfTypeExpr x) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user