diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java index 756aed6cf9..f103b5368d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java @@ -28,8 +28,9 @@ public abstract class SQLInsertInto extends SQLObjectImpl { protected SQLExprTableSource tableSource; protected final List columns = new ArrayList(); - protected ValuesClause values; protected SQLSelect query; + + protected List valuesList = new ArrayList(); public SQLInsertInto(){ @@ -86,10 +87,25 @@ public abstract class SQLInsertInto extends SQLObjectImpl { } public ValuesClause getValues() { - return values; + if (valuesList.size() == 0) { + return null; + } + return valuesList.get(0); } public void setValues(ValuesClause values) { - this.values = values; + if (valuesList.size() == 0) { + valuesList.add(values); + } else { + valuesList.set(0, values); + } + } + + public List getValuesList() { + return valuesList; + } + + public void setValuesList(List valuesList) { + this.valuesList = valuesList; } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java index 5c3a8c15e4..8ecad0ffad 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java @@ -35,7 +35,7 @@ public class SQLInsertStatement extends SQLInsertInto implements SQLStatement { if (visitor.visit(this)) { this.acceptChild(visitor, tableSource); this.acceptChild(visitor, columns); - this.acceptChild(visitor, values); + this.acceptChild(visitor, valuesList); this.acceptChild(visitor, query); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlInsertStatement.java index 70ecc09a61..390d6f0e91 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlInsertStatement.java @@ -31,38 +31,13 @@ public class MySqlInsertStatement extends SQLInsertStatement { private boolean highPriority = false; private boolean ignore = false; - private List valuesList = new ArrayList(); - private final List duplicateKeyUpdate = new ArrayList(); public List getDuplicateKeyUpdate() { return duplicateKeyUpdate; } - public ValuesClause getValues() { - if (valuesList.size() == 0) { - return null; - } - return valuesList.get(0); - } - - public void setValues(ValuesClause values) { - if (valuesList.size() == 0) { - valuesList.add(values); - } else { - valuesList.set(0, values); - } - } - - public List getValuesList() { - return valuesList; - } - - public void setValuesList(List valuesList) { - this.valuesList = valuesList; - } - - public boolean isLowPriority() { + public boolean isLowPriority() { return lowPriority; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMultiInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMultiInsertStatement.java index d917287f64..c9c5b963f5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMultiInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMultiInsertStatement.java @@ -190,7 +190,7 @@ public class OracleMultiInsertStatement extends OracleStatementImpl { if (visitor.visit(this)) { this.acceptChild(visitor, tableSource); this.acceptChild(visitor, columns); - this.acceptChild(visitor, values); + this.acceptChild(visitor, valuesList); this.acceptChild(visitor, query); this.acceptChild(visitor, returning); this.acceptChild(visitor, errorLogging); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index 48b6e67b73..07ada5134d 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -1474,11 +1474,20 @@ public class SQLStatementParser extends SQLParser { if (lexer.token() == Token.VALUES) { lexer.nextToken(); - accept(Token.LPAREN); - SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(); - this.exprParser.exprList(values.getValues(), values); - insertStatement.setValues(values); - accept(Token.RPAREN); + for (;;) { + accept(Token.LPAREN); + SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(); + this.exprParser.exprList(values.getValues(), values); + insertStatement.getValuesList().add(values); + accept(Token.RPAREN); + + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } else { + break; + } + } } else if (acceptSubQuery && (lexer.token() == Token.SELECT || lexer.token() == Token.LPAREN)) { SQLQueryExpr queryExpr = (SQLQueryExpr) this.exprParser.expr(); insertStatement.setQuery(queryExpr.getSubQuery()); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 7a229d56f1..1ae550dc21 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -1067,11 +1067,11 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab decrementIndent(); } - if (x.getValues() != null) { + if (!x.getValuesList().isEmpty()) { println(); print0(ucase ? "VALUES" : "values"); println(); - x.getValues().accept(this); + printAndAccept(x.getValuesList(), ", "); } else { if (x.getQuery() != null) { println(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java new file mode 100644 index 0000000000..16e675b79d --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java @@ -0,0 +1,68 @@ +/* + * Copyright 1999-2101 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.bvt.sql.db2; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.DB2Test; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; +import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.stat.TableStat.Column; +import com.alibaba.druid.util.JdbcConstants; + +public class DB2InsertTest_0 extends DB2Test { + + public void test_0() throws Exception { + String sql = "insert into t (id,name) values (?,?), (?,?), (?,?)"; + + DB2StatementParser parser = new DB2StatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + DB2SchemaStatVisitor visitor = new DB2SchemaStatVisitor(); + stmt.accept(visitor); + +// System.out.println("Tables : " + visitor.getTables()); +// System.out.println("fields : " + visitor.getColumns()); +// System.out.println("coditions : " + visitor.getConditions()); +// System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t"))); + + Assert.assertTrue(visitor.getColumns().contains(new Column("t", "id"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("t", "name"))); + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); + + String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); + Assert.assertEquals("INSERT INTO t" + + "\n\t(id, name)" + + "\nVALUES" + + "\n(?, ?), (?, ?), (?, ?)", // + output); + } +}