Modifying dql and dml

sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/asserts/AssertEngine.java

@@ -113,20 +113,18 @@ public class AssertEngine {
                         throw new DbTestException(path + "  The use case cannot initialize the data");
                     }
                     
-                    if (DatabaseUtil.isSelect(rootsql)) {
+                    try {
                         initTableData(dataSourceMaps, sqls, mapDatasetDefinition);
-                        try {
-                            
-                            doSelectUsePreparedStatement(rootPath, dataSource, anAssert, rootsql);
-                            doSelectUsePreparedStatementToExecuteSelect(rootPath, dataSource, anAssert, rootsql);
-                            
-                            doSelectUseStatement(rootPath, dataSource, anAssert, rootsql);
-                            doSelectUseStatementToExecuteSelect(rootPath, dataSource, anAssert, rootsql);
-                        } finally {
-                            clearTableData(dataSourceMaps, mapDatasetDefinition);
-                        }
                         
+                        doSelectUsePreparedStatement(rootPath, dataSource, anAssert, rootsql);
+                        doSelectUsePreparedStatementToExecuteSelect(rootPath, dataSource, anAssert, rootsql);
+                        
+                        doSelectUseStatement(rootPath, dataSource, anAssert, rootsql);
+                        doSelectUseStatementToExecuteSelect(rootPath, dataSource, anAssert, rootsql);
+                    } finally {
+                        clearTableData(dataSourceMaps, mapDatasetDefinition);
                     }
+                    
                 }
             }
             
@@ -210,7 +208,7 @@ public class AssertEngine {
                 String checksql = anAssert.getExpectedSql();
                 checksql = SQLCasesLoader.getSql(checksql);
                 DatasetDatabase ddPreparedStatement = DatabaseUtil.selectUsePreparedStatement(con, checksql,
-                        anAssert.getParameters());
+                        anAssert.getExpectedParameters());
                 DatabaseUtil.assertDatas(checkDataset, ddPreparedStatement);
             }
         } finally {
@@ -231,7 +229,7 @@ public class AssertEngine {
                 
                 String table = anAssert.getTable();
                 List<ColumnDefinition> columnDefinitions = DatabaseUtil.getColumnDefinitions(con, table);
-                DatabaseUtil.assertConfigs(checkDataset, columnDefinitions,table);
+                DatabaseUtil.assertConfigs(checkDataset, columnDefinitions, table);
             }
         } finally {
             InItCreateSchema.dropTable();
@@ -254,7 +252,7 @@ public class AssertEngine {
                 String checksql = anAssert.getExpectedSql();
                 checksql = SQLCasesLoader.getSql(checksql);
                 DatasetDatabase ddPreparedStatement = DatabaseUtil.selectUsePreparedStatement(con, checksql,
-                        anAssert.getParameters());
+                        anAssert.getExpectedParameters());
                 DatabaseUtil.assertDatas(checkDataset, ddPreparedStatement);
             }
         } finally {
@@ -276,7 +274,7 @@ public class AssertEngine {
                 
                 String table = anAssert.getTable();
                 List<ColumnDefinition> columnDefinitions = DatabaseUtil.getColumnDefinitions(con, table);
-                DatabaseUtil.assertConfigs(checkDataset, columnDefinitions,table);
+                DatabaseUtil.assertConfigs(checkDataset, columnDefinitions, table);
             }
         } finally {
             InItCreateSchema.dropTable();
@@ -299,7 +297,7 @@ public class AssertEngine {
                 String checksql = anAssert.getExpectedSql();
                 checksql = SQLCasesLoader.getSql(checksql);
                 DatasetDatabase ddPreparedStatement = DatabaseUtil.selectUsePreparedStatement(con, checksql,
-                        anAssert.getParameters());
+                        anAssert.getExpectedParameters());
                 DatabaseUtil.assertDatas(checkDataset, ddPreparedStatement);
             }
         } finally {
@@ -320,7 +318,7 @@ public class AssertEngine {
                 
                 String table = anAssert.getTable();
                 List<ColumnDefinition> columnDefinitions = DatabaseUtil.getColumnDefinitions(con, table);
-                DatabaseUtil.assertConfigs(checkDataset, columnDefinitions,table);
+                DatabaseUtil.assertConfigs(checkDataset, columnDefinitions, table);
             }
         } finally {
             InItCreateSchema.dropTable();
@@ -342,7 +340,7 @@ public class AssertEngine {
                 String checksql = anAssert.getExpectedSql();
                 checksql = SQLCasesLoader.getSql(checksql);
                 DatasetDatabase ddPreparedStatement = DatabaseUtil.selectUsePreparedStatement(con, checksql,
-                        anAssert.getParameters());
+                        anAssert.getExpectedParameters());
                 DatabaseUtil.assertDatas(checkDataset, ddPreparedStatement);
                 
             }
@@ -363,7 +361,7 @@ public class AssertEngine {
                 
                 String table = anAssert.getTable();
                 List<ColumnDefinition> columnDefinitions = DatabaseUtil.getColumnDefinitions(con, table);
-                DatabaseUtil.assertConfigs(checkDataset, columnDefinitions,table);
+                DatabaseUtil.assertConfigs(checkDataset, columnDefinitions, table);
             }
         } finally {
             InItCreateSchema.dropTable();

sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/common/DatabaseUtil.java

@@ -355,6 +355,7 @@ public class DatabaseUtil {
             ColumnDefinition columnDefinition = new ColumnDefinition();
             columnDefinition.setName(name);
             columnDefinition.setType(type);
+            cols.add(columnDefinition);
         }
         
         Map<String, List<ColumnDefinition>> configs = new HashMap<>();
@@ -465,6 +466,7 @@ public class DatabaseUtil {
             ColumnDefinition columnDefinition = new ColumnDefinition();
             columnDefinition.setName(name);
             columnDefinition.setType(type);
+            cols.add(columnDefinition);
         }
         
         Map<String, List<ColumnDefinition>> configs = new HashMap<>();

sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertsDefinition.java

@@ -17,6 +17,7 @@
 
 package io.shardingjdbc.dbtest.config.bean;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlAttribute;
@@ -35,13 +36,13 @@ public class AssertsDefinition {
     private String path;
 
     @XmlElement(name = "assertDQL")
-    private List<AssertDQLDefinition> assertDQL;
+    private List<AssertDQLDefinition> assertDQL = new ArrayList<>();
     
     @XmlElement(name = "assertDML")
-    private List<AssertDMLDefinition> assertDML;
+    private List<AssertDMLDefinition> assertDML = new ArrayList<>();
     
     @XmlElement(name = "assertDDL")
-    private List<AssertDDLDefinition> assertDDL;
+    private List<AssertDDLDefinition> assertDDL = new ArrayList<>();
 
     public void setPath(String path) {
         this.path = path;

sharding-jdbc-core/src/test/resources/asserts/assert-test-data/assert-test.xml

@@ -12,12 +12,12 @@
             expected-data-file="./asserts/dml/update.xml">
         <parameters>
             <parameter value="update" />
-            <parameter value="10001" type="int"/>
+            <parameter value="1000" type="int"/>
             <parameter value="10" type="int"/>
         </parameters>
         <expected-parameters>
             <parameter value="10" type="int"/>
-            <parameter value="10001" type="int"/>
+            <parameter value="1000" type="int"/>
         </expected-parameters>
     </assertDML>
 </asserts>
\ No newline at end of file

sharding-jdbc-core/src/test/resources/asserts/assert-test-data/asserts/ddl/update.xml

+<init>
+    <metadata>
+        <table name="data">
+            <cloumn name="order_id" type="int" />
+            <cloumn name="user_id" type="int" />
+        </table>
+    </metadata>
+</init>
\ No newline at end of file

sharding-jdbc-core/src/test/resources/asserts/assert-test-data/asserts/dml/update.xml

@@ -6,7 +6,6 @@
         </table>
     </metadata>
     <dataset>
-        <data order_id="10001" user_id="10"  />
-        <data order_id="1101" user_id="11" />
+        <data order_id="1000" user_id="10" status="update"/>
     </dataset>
 </init>
\ No newline at end of file

sharding-jdbc-core/src/test/resources/asserts/assert-test-data/asserts/dql/select.xml

@@ -7,6 +7,5 @@
     </metadata>
     <dataset>
         <data order_id="1000" user_id="10"  />
-        <data order_id="1101" user_id="11" />
     </dataset>
 </init>

sharding-jdbc-core/src/test/resources/asserts/assert-test-data/config/test.yaml

@@ -53,3 +53,5 @@ shardingRule:
     complex:
       shardingColumns: id, order_id
       algorithmClassName: io.shardingjdbc.dbtest.core.yaml.fixture.MultiAlgorithm
+  props:
+      sql.show: true