imporved sql parser. improved h2 support. for issue #1941 #1942

This commit is contained in:
wenshao
2017-09-10 16:11:19 +08:00
parent 61794c4c19
commit 19501d678d
52 changed files with 922 additions and 370 deletions
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.ast;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLKeep extends SQLObjectImpl {
public final class SQLKeep extends SQLObjectImpl {
protected DenseRank denseRank;
@@ -23,7 +23,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
/**
* Created by wenshao on 16/9/25.
*/
public class SQLLimit extends SQLObjectImpl {
public final class SQLLimit extends SQLObjectImpl {
public SQLLimit() {
@@ -21,7 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import java.util.ArrayList;
import java.util.List;
public class SQLOrderBy extends SQLObjectImpl {
public final class SQLOrderBy extends SQLObjectImpl {
protected final List<SQLSelectOrderByItem> items = new ArrayList<SQLSelectOrderByItem>();
@@ -20,7 +20,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import java.util.ArrayList;
import java.util.List;
public class SQLParameter extends SQLObjectImpl implements SQLObjectWithDataType {
public final class SQLParameter extends SQLObjectImpl implements SQLObjectWithDataType {
private SQLName name;
private SQLDataType dataType;
@@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.statement.SQLTableSource;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLAllColumnExpr extends SQLExprImpl {
public final class SQLAllColumnExpr extends SQLExprImpl {
private transient SQLTableSource resolvedTableSource;
public SQLAllColumnExpr(){
@@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLAllExpr extends SQLExprImpl {
public final class SQLAllExpr extends SQLExprImpl {
public SQLSelect subQuery;
@@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLBooleanExpr extends SQLExprImpl implements SQLExpr, SQLLiteralExpr, SQLValuableExpr {
public final class SQLBooleanExpr extends SQLExprImpl implements SQLExpr, SQLLiteralExpr, SQLValuableExpr {
public static final SQLDataType DEFAULT_DATA_TYPE = new SQLCharacterDataType("boolean");
private boolean value;
@@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLExistsExpr extends SQLExprImpl implements Serializable {
public final class SQLExistsExpr extends SQLExprImpl implements Serializable {
private static final long serialVersionUID = 1L;
public boolean not = false;
@@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.statement.*;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.FnvHash;
public class SQLIdentifierExpr extends SQLExprImpl implements SQLName {
public final class SQLIdentifierExpr extends SQLExprImpl implements SQLName {
protected String name;
private long hashCode64;
@@ -24,7 +24,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLInListExpr extends SQLExprImpl implements Serializable {
public final class SQLInListExpr extends SQLExprImpl implements Serializable {
private static final long serialVersionUID = 1L;
private boolean not = false;
@@ -22,7 +22,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLNotExpr extends SQLExprImpl implements Serializable {
public final class SQLNotExpr extends SQLExprImpl implements Serializable {
private static final long serialVersionUID = 1L;
public SQLExpr expr;
@@ -20,7 +20,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE_NULL;
public class SQLNullExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValuableExpr {
public final class SQLNullExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValuableExpr {
public SQLNullExpr(){
@@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.statement.*;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.FnvHash;
public class SQLPropertyExpr extends SQLExprImpl implements SQLName {
public final class SQLPropertyExpr extends SQLExprImpl implements SQLName {
private SQLExpr owner;
private String name;
@@ -24,7 +24,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import java.util.List;
public class SQLSomeExpr extends SQLExprImpl {
public final class SQLSomeExpr extends SQLExprImpl {
public SQLSelect subQuery;
@@ -36,7 +36,7 @@ public class SQLCreateTriggerStatement extends SQLStatementImpl implements SQLCr
private boolean delete;
private boolean insert;
private SQLName on;
private SQLExprTableSource on;
private boolean forEachRow = false;
@@ -64,11 +64,18 @@ public class SQLCreateTriggerStatement extends SQLStatementImpl implements SQLCr
visitor.endVisit(this);
}
public SQLName getOn() {
public SQLExprTableSource getOn() {
return on;
}
public void setOn(SQLName on) {
this.setOn(new SQLExprTableSource(on));
}
public void setOn(SQLExprTableSource on) {
if (on != null) {
on.setParent(this);
}
this.on = on;
}
@@ -0,0 +1,97 @@
package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import java.util.ArrayList;
import java.util.List;
public class SQLReplaceStatement extends SQLStatementImpl {
protected boolean lowPriority = false;
protected boolean delayed = false;
protected SQLExprTableSource tableSource;
protected final List<SQLExpr> columns = new ArrayList<SQLExpr>();
protected List<SQLInsertStatement.ValuesClause> valuesList = new ArrayList<SQLInsertStatement.ValuesClause>();
protected SQLQueryExpr query;
public SQLName getTableName() {
if (tableSource == null) {
return null;
}
return (SQLName) tableSource.getExpr();
}
public void setTableName(SQLName tableName) {
this.setTableSource(new SQLExprTableSource(tableName));
}
public SQLExprTableSource getTableSource() {
return tableSource;
}
public void setTableSource(SQLExprTableSource tableSource) {
if (tableSource != null) {
tableSource.setParent(this);
}
this.tableSource = tableSource;
}
public List<SQLExpr> getColumns() {
return columns;
}
public void addColumn(SQLExpr column) {
if (column != null) {
column.setParent(this);
}
this.columns.add(column);
}
public boolean isLowPriority() {
return lowPriority;
}
public void setLowPriority(boolean lowPriority) {
this.lowPriority = lowPriority;
}
public boolean isDelayed() {
return delayed;
}
public void setDelayed(boolean delayed) {
this.delayed = delayed;
}
public SQLQueryExpr getQuery() {
return query;
}
public void setQuery(SQLQueryExpr query) {
if (query != null) {
query.setParent(this);
}
this.query = query;
}
public List<SQLInsertStatement.ValuesClause> getValuesList() {
return valuesList;
}
@Override
protected void accept0(SQLASTVisitor visitor) {
if (visitor.visit(this)) {
acceptChild(visitor, tableSource);
acceptChild(visitor, columns);
acceptChild(visitor, valuesList);
acceptChild(visitor, query);
}
visitor.endVisit(this);
}
}
@@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.SQLOrderingSpecification;
import com.alibaba.druid.sql.ast.SQLReplaceable;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLSelectOrderByItem extends SQLObjectImpl implements SQLReplaceable {
public final class SQLSelectOrderByItem extends SQLObjectImpl implements SQLReplaceable {
protected SQLExpr expr;
protected String collate;