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
@@ -0,0 +1,33 @@
package com.alibaba.druid.sql.dialect.h2.ast;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import java.util.ArrayList;
import java.util.List;
public class H2MergeStatement extends SQLStatementImpl {
private SQLExprTableSource table;
private final List<SQLName> keyColumns = new ArrayList<SQLName>();
public SQLExprTableSource getTable() {
return table;
}
public void setTable(SQLName table) {
this.setTable(new SQLExprTableSource(table));
}
public void setTable(SQLExprTableSource table) {
if (table != null) {
table.setParent(this);
}
this.table = table;
}
public List<SQLName> getKeyColumns() {
return keyColumns;
}
}
@@ -0,0 +1,41 @@
package com.alibaba.druid.sql.dialect.h2.parser;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.SQLParserFeature;
import com.alibaba.druid.util.FnvHash;
import java.util.Arrays;
public class H2ExprParser extends SQLExprParser {
private final static String[] AGGREGATE_FUNCTIONS;
private final static long[] AGGREGATE_FUNCTIONS_CODES;
static {
String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER",
"ROWNUMBER" };
AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true);
AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length];
for (String str : strings) {
long hash = FnvHash.fnv1a_64_lower(str);
int index = Arrays.binarySearch(AGGREGATE_FUNCTIONS_CODES, hash);
AGGREGATE_FUNCTIONS[index] = str;
}
}
public H2ExprParser(String sql){
this(new H2Lexer(sql));
this.lexer.nextToken();
}
public H2ExprParser(String sql, SQLParserFeature... features){
this(new H2Lexer(sql, features));
this.lexer.nextToken();
}
public H2ExprParser(Lexer lexer){
super(lexer);
this.aggregateFunctions = AGGREGATE_FUNCTIONS;
this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES;
}
}
@@ -0,0 +1,42 @@
package com.alibaba.druid.sql.dialect.h2.parser;
import com.alibaba.druid.sql.parser.Keywords;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.SQLParserFeature;
import com.alibaba.druid.sql.parser.Token;
import java.util.HashMap;
import java.util.Map;
public class H2Lexer extends Lexer {
public final static Keywords DEFAULT_H2_KEYWORDS;
static {
Map<String, Token> map = new HashMap<String, Token>();
map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords());
map.put("OF", Token.OF);
map.put("CONCAT", Token.CONCAT);
map.put("CONTINUE", Token.CONTINUE);
map.put("MERGE", Token.MERGE);
map.put("USING", Token.USING);
map.put("ROW", Token.ROW);
DEFAULT_H2_KEYWORDS = new Keywords(map);
}
public H2Lexer(String input){
super(input);
super.keywods = DEFAULT_H2_KEYWORDS;
}
public H2Lexer(String input, SQLParserFeature... features){
super(input);
super.keywods = DEFAULT_H2_KEYWORDS;
for (SQLParserFeature feature : features) {
config(feature, true);
}
}
}
@@ -0,0 +1,19 @@
package com.alibaba.druid.sql.dialect.h2.parser;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.SQLSelectParser;
public class H2SelectParser extends SQLSelectParser {
public H2SelectParser(SQLExprParser exprParser){
super(exprParser);
}
public H2SelectParser(String sql){
this(new H2ExprParser(sql));
}
protected SQLExprParser createExprParser() {
return new H2ExprParser(lexer);
}
}
@@ -0,0 +1,61 @@
package com.alibaba.druid.sql.dialect.h2.parser;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
import com.alibaba.druid.sql.ast.statement.SQLReplaceStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.dialect.h2.ast.H2MergeStatement;
import com.alibaba.druid.sql.parser.*;
import com.alibaba.druid.util.FnvHash;
public class H2StatementParser extends SQLStatementParser {
public H2StatementParser(String sql) {
super (new H2ExprParser(sql));
}
public H2StatementParser(String sql, SQLParserFeature... features) {
super (new H2ExprParser(sql, features));
}
public H2StatementParser(Lexer lexer){
super(new H2ExprParser(lexer));
}
public H2SelectParser createSQLSelectParser() {
return new H2SelectParser(this.exprParser);
}
public SQLStatement parseMerge() {
accept(Token.MERGE);
accept(Token.INTO);
SQLReplaceStatement stmt = new SQLReplaceStatement();
SQLName tableName = exprParser.name();
stmt.setTableName(tableName);
if (lexer.token() == Token.KEY) {
lexer.nextToken();
accept(Token.LPAREN);
this.exprParser.exprList(stmt.getColumns(), stmt);
accept(Token.RPAREN);
}
if (lexer.token() == Token.VALUES || lexer.identifierEquals("VALUE")) {
lexer.nextToken();
parseValueClause(stmt.getValuesList(), 0, stmt);
} else if (lexer.token() == Token.SELECT) {
SQLQueryExpr queryExpr = (SQLQueryExpr) this.exprParser.expr();
stmt.setQuery(queryExpr);
} else if (lexer.token() == Token.LPAREN) {
SQLSelect select = this.createSQLSelectParser().select();
SQLQueryExpr queryExpr = new SQLQueryExpr(select);
stmt.setQuery(queryExpr);
}
return stmt;
}
}
@@ -0,0 +1,6 @@
package com.alibaba.druid.sql.dialect.h2.visitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public interface H2ASTVisitor extends SQLASTVisitor {
}
@@ -0,0 +1,6 @@
package com.alibaba.druid.sql.dialect.h2.visitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter;
public class H2ASTVisitorAdapter extends SQLASTVisitorAdapter implements H2ASTVisitor {
}
@@ -0,0 +1,120 @@
package com.alibaba.druid.sql.dialect.h2.visitor;
import com.alibaba.druid.sql.ast.expr.*;
import com.alibaba.druid.sql.visitor.SQLEvalVisitor;
import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils;
import com.alibaba.druid.sql.visitor.functions.Function;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class H2EvalVisitor extends H2ASTVisitorAdapter implements SQLEvalVisitor {
private Map<String, Function> functions = new HashMap<String, Function>();
private List<Object> parameters = new ArrayList<Object>();
private int variantIndex = -1;
private boolean markVariantIndex = true;
public H2EvalVisitor(){
this(new ArrayList<Object>(1));
}
public H2EvalVisitor(List<Object> parameters){
this.parameters = parameters;
}
public List<Object> getParameters() {
return parameters;
}
public void setParameters(List<Object> parameters) {
this.parameters = parameters;
}
public boolean visit(SQLCharExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
public int incrementAndGetVariantIndex() {
return ++variantIndex;
}
public int getVariantIndex() {
return variantIndex;
}
public boolean visit(SQLVariantRefExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
public boolean visit(SQLBinaryOpExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
public boolean visit(SQLUnaryExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
public boolean visit(SQLIntegerExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
public boolean visit(SQLNumberExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
@Override
public boolean visit(SQLCaseExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
@Override
public boolean visit(SQLInListExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
@Override
public boolean visit(SQLNullExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
@Override
public boolean visit(SQLMethodInvokeExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
@Override
public boolean visit(SQLQueryExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
public boolean isMarkVariantIndex() {
return markVariantIndex;
}
public void setMarkVariantIndex(boolean markVariantIndex) {
this.markVariantIndex = markVariantIndex;
}
@Override
public Function getFunction(String funcName) {
return functions.get(funcName);
}
@Override
public void registerFunction(String funcName, Function function) {
functions.put(funcName, function);
}
@Override
public void unregisterFunction(String funcName) {
functions.remove(funcName);
}
public boolean visit(SQLIdentifierExpr x) {
return SQLEvalVisitorUtils.visit(this, x);
}
}
@@ -0,0 +1,67 @@
package com.alibaba.druid.sql.dialect.h2.visitor;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
import com.alibaba.druid.sql.ast.statement.SQLReplaceStatement;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
import java.util.List;
public class H2OutputVisitor extends SQLASTOutputVisitor implements H2ASTVisitor {
public H2OutputVisitor(Appendable appender) {
super(appender);
}
public H2OutputVisitor(Appendable appender, String dbType) {
super(appender, dbType);
}
public H2OutputVisitor(Appendable appender, boolean parameterized) {
super(appender, parameterized);
}
public boolean visit(SQLReplaceStatement x) {
print0(ucase ? "MERGE INTO " : "merge into ");
printTableSourceExpr(x.getTableName());
List<SQLExpr> columns = x.getColumns();
if (columns.size() > 0) {
print0(ucase ? " KEY (" : " key (");
for (int i = 0, size = columns.size(); i < size; ++i) {
if (i != 0) {
print0(", ");
}
SQLExpr columnn = columns.get(i);
printExpr(columnn);
}
print(')');
}
List<SQLInsertStatement.ValuesClause> valuesClauseList = x.getValuesList();
if (valuesClauseList.size() != 0) {
println();
print0(ucase ? "VALUES " : "values ");
int size = valuesClauseList.size();
if (size == 0) {
print0("()");
} else {
for (int i = 0; i < size; ++i) {
if (i != 0) {
print0(", ");
}
visit(valuesClauseList.get(i));
}
}
}
SQLQueryExpr query = x.getQuery();
if (query != null) {
visit(query);
}
return false;
}
}
@@ -0,0 +1,6 @@
package com.alibaba.druid.sql.dialect.h2.visitor;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
public class H2SchemaStatVisitor extends SchemaStatVisitor implements H2ASTVisitor {
}
@@ -1,112 +0,0 @@
/*
* 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.mysql.ast.statement;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
public class MySqlReplaceStatement extends MySqlStatementImpl {
private boolean lowPriority = false;
private boolean delayed = false;
private SQLExprTableSource tableSource;
private final List<SQLExpr> columns = new ArrayList<SQLExpr>();
private List<ValuesClause> valuesList = new ArrayList<ValuesClause>();
private 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<ValuesClause> getValuesList() {
return valuesList;
}
public void accept0(MySqlASTVisitor visitor) {
if (visitor.visit(this)) {
acceptChild(visitor, tableSource);
acceptChild(visitor, columns);
acceptChild(visitor, valuesList);
acceptChild(visitor, query);
}
visitor.endVisit(this);
}
}
@@ -504,7 +504,7 @@ public class MySqlStatementParser extends SQLStatementParser {
}
if (lexer.token() == Token.REPLACE) {
MySqlReplaceStatement stmt = parseReplicate();
SQLReplaceStatement stmt = parseReplace();
statementList.add(stmt);
return true;
}
@@ -1773,8 +1773,8 @@ public class MySqlStatementParser extends SQLStatementParser {
return stmt;
}
public MySqlReplaceStatement parseReplicate() {
MySqlReplaceStatement stmt = new MySqlReplaceStatement();
public SQLReplaceStatement parseReplace() {
SQLReplaceStatement stmt = new SQLReplaceStatement();
accept(Token.REPLACE);
@@ -2262,95 +2262,6 @@ public class MySqlStatementParser extends SQLStatementParser {
return insertStatement;
}
private void parseValueClause(List<ValuesClause> valueClauseList, int columnSize, SQLObject parent) {
for (int i = 0; ; ++i) {
int startPos = lexer.pos() - 1;
if (lexer.token() != Token.LPAREN) {
throw new ParserException("syntax error, expect ')', " + lexer.info());
}
lexer.nextTokenValue();
if (lexer.token() != Token.RPAREN) {
List<SQLExpr> valueExprList;
if (columnSize > 0) {
valueExprList = new ArrayList<SQLExpr>(columnSize);
} else {
valueExprList = new ArrayList<SQLExpr>();
}
for (; ; ) {
SQLExpr expr;
if (lexer.token() == Token.LITERAL_INT) {
expr = new SQLIntegerExpr(lexer.integerValue());
lexer.nextTokenComma();
} else if (lexer.token() == Token.LITERAL_CHARS) {
expr = new SQLCharExpr(lexer.stringVal());
lexer.nextTokenComma();
} else if (lexer.token() == Token.LITERAL_NCHARS) {
expr = new SQLNCharExpr(lexer.stringVal());
lexer.nextTokenComma();
} else {
expr = exprParser.expr();
}
if (lexer.token() == Token.COMMA) {
valueExprList.add(expr);
lexer.nextTokenValue();
continue;
} else if (lexer.token() == Token.RPAREN) {
valueExprList.add(expr);
break;
} else {
expr = this.exprParser.primaryRest(expr);
if (lexer.token() != Token.COMMA && lexer.token() != Token.RPAREN) {
expr = this.exprParser.exprRest(expr);
}
valueExprList.add(expr);
if (lexer.token() == Token.COMMA) {
lexer.nextToken();
continue;
} else {
break;
}
}
}
SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(valueExprList);
values.setParent(parent);
if (lexer.isEnabled(SQLParserFeature.KeepInsertValueClauseOriginalString)) {
int endPos = lexer.pos();
String orginalString = lexer.subString(startPos, endPos - startPos);
values.setOriginalString(orginalString);
}
valueClauseList.add(values);
} else {
SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(new ArrayList<SQLExpr>(0));
valueClauseList.add(values);
}
if (lexer.token() != Token.RPAREN) {
throw new ParserException("syntax error. " + lexer.info());
}
if (!parseCompleteValues && valueClauseList.size() >= parseValuesSize) {
lexer.skipToEOF();
break;
}
lexer.nextTokenComma();
if (lexer.token() == Token.COMMA) {
lexer.nextTokenLParen();
continue;
} else {
break;
}
}
}
public SQLSelectParser createSQLSelectParser() {
return new MySqlSelectParser(this.exprParser);
}
@@ -103,10 +103,6 @@ public interface MySqlASTVisitor extends SQLASTVisitor {
boolean visit(MySqlLoadXmlStatement x);
void endVisit(MySqlReplaceStatement x);
boolean visit(MySqlReplaceStatement x);
void endVisit(MySqlShowColumnsStatement x);
boolean visit(MySqlShowColumnsStatement x);
@@ -186,17 +186,6 @@ public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements MySq
return true;
}
@Override
public void endVisit(MySqlReplaceStatement x) {
}
@Override
public boolean visit(MySqlReplaceStatement x) {
return true;
}
@Override
public void endVisit(MySqlShowColumnsStatement x) {
@@ -803,20 +803,22 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print0(ucase ? "IGNORE " : "ignore ");
}
if (x.getFrom() == null) {
SQLTableSource from = x.getFrom();
if (from == null) {
print0(ucase ? "FROM " : "from ");
x.getTableSource().accept(this);
} else {
x.getTableSource().accept(this);
println();
print0(ucase ? "FROM " : "from ");
x.getFrom().accept(this);
from.accept(this);
}
if (x.getUsing() != null) {
SQLTableSource using = x.getUsing();
if (using != null) {
println();
print0(ucase ? "USING " : "using ");
x.getUsing().accept(this);
using.accept(this);
}
SQLExpr where = x.getWhere();
@@ -894,7 +896,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
SQLExpr column = columns.get(i);
if (column instanceof SQLIdentifierExpr) {
visit((SQLIdentifierExpr) column);
print0(((SQLIdentifierExpr) column).getName());
} else {
printExpr(column);
}
@@ -1053,13 +1055,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
return false;
}
@Override
public void endVisit(MySqlReplaceStatement x) {
}
@Override
public boolean visit(MySqlReplaceStatement x) {
public boolean visit(SQLReplaceStatement x) {
print0(ucase ? "REPLACE " : "replace ");
if (x.isLowPriority()) {
@@ -1574,9 +1570,10 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
@Override
public boolean visit(MySqlUpdateStatement x) {
if (x.getReturning() != null && x.getReturning().size() > 0) {
List<SQLExpr> returning = x.getReturning();
if (returning != null && returning.size() > 0) {
print0(ucase ? "SELECT " : "select ");
printAndAccept(x.getReturning(), ", ");
printAndAccept(returning, ", ");
println();
print0(ucase ? "FROM " : "from ");
}
@@ -1614,11 +1611,12 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
println();
print0(ucase ? "SET " : "set ");
for (int i = 0, size = x.getItems().size(); i < size; ++i) {
List<SQLUpdateSetItem> items = x.getItems();
for (int i = 0, size = items.size(); i < size; ++i) {
if (i != 0) {
print0(", ");
}
SQLUpdateSetItem item = x.getItems().get(i);
SQLUpdateSetItem item = items.get(i);
visit(item);
}
@@ -3007,26 +3005,31 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
@Override
public boolean visit(SQLBlockStatement x) {
if (x.getLabelName() != null && !x.getLabelName().equals("")) {
print0(x.getLabelName());
SQLObject parent = x.getParent();
String labelName = x.getLabelName();
if (labelName != null && !labelName.equals("")) {
print0(labelName);
print0(": ");
}
if (x.getParameters().size() != 0) {
List<SQLParameter> parameters = x.getParameters();
if (parameters.size() != 0) {
this.indentCount++;
if (x.getParent() instanceof SQLCreateProcedureStatement) {
if (parent instanceof SQLCreateProcedureStatement) {
printIndent();
}
if (!(x.getParent() instanceof SQLCreateProcedureStatement)) {
if (!(parent instanceof SQLCreateProcedureStatement)) {
print0(ucase ? "DECLARE" : "declare");
println();
}
for (int i = 0, size = x.getParameters().size(); i < size; ++i) {
for (int i = 0, size = parameters.size(); i < size; ++i) {
if (i != 0) {
println();
}
SQLParameter param = x.getParameters().get(i);
param.accept(this);
SQLParameter param = parameters.get(i);
visit(param);
print(';');
}
@@ -3036,19 +3039,20 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print0(ucase ? "BEGIN" : "begin");
this.indentCount++;
println();
for (int i = 0, size = x.getStatementList().size(); i < size; ++i) {
List<SQLStatement> statementList = x.getStatementList();
for (int i = 0, size = statementList.size(); i < size; ++i) {
if (i != 0) {
println();
}
SQLStatement stmt = x.getStatementList().get(i);
SQLStatement stmt = statementList.get(i);
stmt.accept(this);
}
this.indentCount--;
println();
print0(ucase ? "END" : "end");
if (x.getLabelName() != null && !x.getLabelName().equals("")) {
if (labelName != null && !labelName.equals("")) {
print(' ');
print0(x.getLabelName());
print0(labelName);
}
return false;
}
@@ -3060,8 +3064,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print0(ucase ? " THEN" : " then");
this.indentCount++;
println();
for (int i = 0, size = x.getStatements().size(); i < size; ++i) {
SQLStatement item = x.getStatements().get(i);
List<SQLStatement> statements = x.getStatements();
for (int i = 0, size = statements.size(); i < size; ++i) {
SQLStatement item = statements.get(i);
item.accept(this);
if (i != size - 1) {
println();
@@ -3073,7 +3078,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
iterable_element.accept(this);
}
if (x.getElseItem() != null) x.getElseItem().accept(this);
if (x.getElseItem() != null) {
x.getElseItem().accept(this);
}
print0(ucase ? "END IF" : "end if");
return false;
@@ -259,35 +259,6 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
return true;
}
@Override
public void endVisit(MySqlReplaceStatement x) {
}
@Override
public boolean visit(MySqlReplaceStatement x) {
if (repository != null
&& x.getParent() == null) {
repository.resolve(x);
}
setMode(x, Mode.Replace);
SQLName tableName = x.getTableName();
TableStat stat = getTableStat(tableName);
if (stat != null) {
stat.incrementInsertCount();
}
accept(x.getColumns());
accept(x.getValuesList());
accept(x.getQuery());
return false;
}
@Override
public void endVisit(SQLStartTransactionStatement x) {
@@ -97,19 +97,21 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
space = true;
}
if (x.getOrderBy() != null) {
SQLOrderBy orderBy = x.getOrderBy();
if (orderBy != null) {
if (space) {
print(' ');
}
x.getOrderBy().accept(this);
visit(orderBy);
space = true;
}
if (x.getWindowing() != null) {
OracleAnalyticWindowing windowing = x.getWindowing();
if (windowing != null) {
if (space) {
print(' ');
}
x.getWindowing().accept(this);
visit(windowing);
}
print(')');