support "select union all"'s batch insert fix #71

apache · May 13, 2016 · 228a2b6 · 228a2b6
1 parent f63eaa0
commit 228a2b6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/...va/com/dangdang/ddframe/rdb/sharding/parser/visitor/basic/mysql/AbstractMySQLVisitor.java b/...va/com/dangdang/ddframe/rdb/sharding/parser/visitor/basic/mysql/AbstractMySQLVisitor.java
@@ -108,6 +108,9 @@ public final boolean visit(final SQLVariantRefExpr x) {
 
     @Override
     public final boolean visit(final SQLExprTableSource x) {
+        if ("dual".equalsIgnoreCase(SQLUtil.getExactlyValue(x.getExpr().toString()))) {
+            return super.visit(x);
+        }
         return visit(x, getParseContext().addTable(x));
     }
 

diff --git a/...java/com/dangdang/ddframe/rdb/sharding/parser/visitor/basic/mysql/MySQLInsertVisitor.java b/...java/com/dangdang/ddframe/rdb/sharding/parser/visitor/basic/mysql/MySQLInsertVisitor.java
@@ -32,6 +32,9 @@ public class MySQLInsertVisitor extends AbstractMySQLVisitor {
     @Override
     public boolean visit(final MySqlInsertStatement x) {
         getParseContext().setCurrentTable(x.getTableName().toString(), Optional.fromNullable(x.getAlias()));
+        if (null == x.getValues()) {
+            return super.visit(x);
+        }
         for (int i = 0; i < x.getColumns().size(); i++) {
             getParseContext().addCondition(x.getColumns().get(i).toString(), x.getTableName().toString(), BinaryOperator.EQUAL, x.getValues().getValues().get(i), getDatabaseType(), getParameters());
         }

diff --git a/...re/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/statement/insert.xml b/...re/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/statement/insert.xml
@@ -47,4 +47,13 @@
             </condition-context>
         </condition-contexts>
     </assert>
+
+    <assert id="assertInsertBatch1" sql="INSERT INTO `order` o ('order_id', 'state') (SELECT 1, 'RUNNING' FROM dual UNION ALL SELECT 2, 'RUNNING' FROM dual )" expected-sql="INSERT INTO [Token(order)] o ('order_id', 'state') SELECT 1, 'RUNNING' FROM dual UNION ALL SELECT 2, 'RUNNING' FROM dual">
+        <tables>
+            <table name="order" alias="o" />
+        </tables>
+        <condition-contexts>
+           <condition-context/>
+        </condition-contexts>
+    </assert>
 </asserts>
diff --git a/sharding-jdbc-doc/content/post/release_notes.md b/sharding-jdbc-doc/content/post/release_notes.md
@@ -15,6 +15,7 @@ weight = 1
 ### 功能提升
 
 1. [ISSUE #66](https://github.com/dangdangdotcom/sharding-jdbc/issues/66) 在JDBC层的Statement增加对get/set MaxFieldSize，MaxRows和QueryTimeout的支持
+1. [ISSUE #71](https://github.com/dangdangdotcom/sharding-jdbc/issues/71) 对于select union all形式的批量插入支持
 
 ### 缺陷修正