You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/06/15 13:19:27 UTC
[shardingsphere] branch master updated: fix integrate test error in
db rule type mode (#6051)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a318979 fix integrate test error in db rule type mode (#6051)
a318979 is described below
commit a3189792046dc70e24aead6d26a2a28de05825cb
Author: zhaojun <zh...@126.com>
AuthorDate: Mon Jun 15 21:19:03 2020 +0800
fix integrate test error in db rule type mode (#6051)
* fix select_distinct_with_multi_column_without_order_by
* fix select_with_case_expression & enable db rule type
---
...distinct_with_multi_column_without_order_by.xml | 64 +++++++
...istinct_with_single_column_without_order_by.xml | 186 ++++++---------------
.../dql/dataset/db/select_with_case_expression.xml | 2 +-
.../src/test/resources/integrate/env.properties | 2 +-
4 files changed, 119 insertions(+), 135 deletions(-)
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_distinct_with_multi_column_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_distinct_with_multi_column_without_order_by.xml
new file mode 100644
index 0000000..22fc2d9
--- /dev/null
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_distinct_with_multi_column_without_order_by.xml
@@ -0,0 +1,64 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="order_id" />
+ <column name="user_id" />
+ <column name="status" />
+ </metadata>
+ <row values="1000, 10, init" />
+ <row values="1001, 10, init" />
+ <row values="1100, 11, init" />
+ <row values="1101, 11, init" />
+ <row values="1200, 12, init" />
+ <row values="1201, 12, init" />
+ <row values="1300, 13, init" />
+ <row values="1301, 13, init" />
+ <row values="1400, 14, init" />
+ <row values="1401, 14, init" />
+ <row values="1500, 15, init" />
+ <row values="1501, 15, init" />
+ <row values="1600, 16, init" />
+ <row values="1601, 16, init" />
+ <row values="1700, 17, init" />
+ <row values="1701, 17, init" />
+ <row values="1800, 18, init" />
+ <row values="1801, 18, init" />
+ <row values="1900, 19, init" />
+ <row values="1901, 19, init" />
+ <row values="2000, 20, init" />
+ <row values="2001, 20, init" />
+ <row values="2100, 21, init" />
+ <row values="2101, 21, init" />
+ <row values="2200, 22, init" />
+ <row values="2201, 22, init" />
+ <row values="2300, 23, init" />
+ <row values="2301, 23, init" />
+ <row values="2400, 24, init" />
+ <row values="2401, 24, init" />
+ <row values="2500, 25, init" />
+ <row values="2501, 25, init" />
+ <row values="2600, 26, init" />
+ <row values="2601, 26, init" />
+ <row values="2700, 27, init" />
+ <row values="2701, 27, init" />
+ <row values="2800, 28, init" />
+ <row values="2801, 28, init" />
+ <row values="2900, 29, init" />
+ <row values="2901, 29, init" />
+</dataset>
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_distinct_with_single_column_without_order_by.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_distinct_with_single_column_without_order_by.xml
index 2988b23..54c85b8 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_distinct_with_single_column_without_order_by.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_distinct_with_single_column_without_order_by.xml
@@ -19,164 +19,84 @@
<metadata>
<column name="item_id" />
</metadata>
- <row values="140001" />
- <row values="140002" />
- <row values="220002" />
- <row values="220001" />
- <row values="160101" />
- <row values="160102" />
- <row values="240102" />
- <row values="240101" />
- <row values="150001" />
- <row values="150002" />
- <row values="230002" />
- <row values="230001" />
- <row values="170101" />
- <row values="170102" />
- <row values="250102" />
- <row values="250101" />
- <row values="160001" />
- <row values="160002" />
- <row values="240002" />
- <row values="240001" />
+ <row values="100001" />
+ <row values="100002" />
<row values="100101" />
<row values="100102" />
- <row values="180102" />
- <row values="180101" />
- <row values="260102" />
- <row values="260101" />
- <row values="170001" />
- <row values="170002" />
- <row values="250002" />
- <row values="250001" />
+ <row values="110001" />
+ <row values="110002" />
<row values="110101" />
<row values="110102" />
- <row values="190102" />
- <row values="190101" />
- <row values="270102" />
- <row values="270101" />
- <row values="100001" />
- <row values="100002" />
- <row values="180002" />
- <row values="180001" />
+ <row values="120001" />
+ <row values="120002" />
<row values="120101" />
<row values="120102" />
- <row values="200102" />
- <row values="200101" />
- <row values="280102" />
- <row values="260001" />
- <row values="260002" />
- <row values="280101" />
- <row values="110001" />
- <row values="110002" />
- <row values="190002" />
- <row values="190001" />
+ <row values="130001" />
+ <row values="130002" />
<row values="130101" />
<row values="130102" />
- <row values="210102" />
- <row values="210101" />
- <row values="290102" />
- <row values="270001" />
- <row values="270002" />
- <row values="290101" />
- <row values="120001" />
- <row values="120002" />
- <row values="200002" />
- <row values="200001" />
+ <row values="140001" />
+ <row values="140002" />
<row values="140101" />
- <row values="220102" />
<row values="140102" />
- <row values="220101" />
- <row values="280001" />
- <row values="280002" />
- <row values="130001" />
- <row values="130002" />
- <row values="210002" />
- <row values="210001" />
+ <row values="150001" />
+ <row values="150002" />
<row values="150101" />
- <row values="230102" />
<row values="150102" />
- <row values="230101" />
- <row values="290001" />
- <row values="290002" />
- <row values="140001" />
- <row values="140002" />
- <row values="220002" />
- <row values="220001" />
+ <row values="160001" />
+ <row values="160002" />
<row values="160101" />
<row values="160102" />
- <row values="240102" />
- <row values="240101" />
- <row values="150001" />
- <row values="150002" />
- <row values="230002" />
- <row values="230001" />
+ <row values="170001" />
+ <row values="170002" />
<row values="170101" />
<row values="170102" />
- <row values="250102" />
- <row values="250101" />
- <row values="160001" />
- <row values="160002" />
- <row values="240002" />
- <row values="240001" />
- <row values="100101" />
- <row values="100102" />
- <row values="180102" />
+ <row values="180001" />
+ <row values="180002" />
<row values="180101" />
- <row values="260102" />
- <row values="260101" />
- <row values="170001" />
- <row values="170002" />
- <row values="250002" />
- <row values="250001" />
- <row values="110101" />
- <row values="110102" />
- <row values="190102" />
+ <row values="180102" />
+ <row values="190001" />
+ <row values="190002" />
<row values="190101" />
- <row values="270102" />
- <row values="270101" />
- <row values="100001" />
- <row values="100002" />
- <row values="180002" />
- <row values="180001" />
- <row values="120101" />
- <row values="120102" />
- <row values="200102" />
+ <row values="190102" />
+ <row values="200001" />
+ <row values="200002" />
<row values="200101" />
- <row values="280102" />
+ <row values="200102" />
+ <row values="210001" />
+ <row values="210002" />
+ <row values="210101" />
+ <row values="210102" />
+ <row values="220001" />
+ <row values="220002" />
+ <row values="220101" />
+ <row values="220102" />
+ <row values="230001" />
+ <row values="230002" />
+ <row values="230101" />
+ <row values="230102" />
+ <row values="240001" />
+ <row values="240002" />
+ <row values="240101" />
+ <row values="240102" />
+ <row values="250001" />
+ <row values="250002" />
+ <row values="250101" />
+ <row values="250102" />
<row values="260001" />
<row values="260002" />
- <row values="280101" />
- <row values="110001" />
- <row values="110002" />
- <row values="190002" />
- <row values="190001" />
- <row values="130101" />
- <row values="130102" />
- <row values="210102" />
- <row values="210101" />
- <row values="290102" />
+ <row values="260101" />
+ <row values="260102" />
<row values="270001" />
<row values="270002" />
- <row values="290101" />
- <row values="120001" />
- <row values="120002" />
- <row values="200002" />
- <row values="200001" />
- <row values="140101" />
- <row values="220102" />
- <row values="140102" />
- <row values="220101" />
+ <row values="270101" />
+ <row values="270102" />
<row values="280001" />
<row values="280002" />
- <row values="130001" />
- <row values="130002" />
- <row values="210002" />
- <row values="210001" />
- <row values="150101" />
- <row values="230102" />
- <row values="150102" />
- <row values="230101" />
+ <row values="280101" />
+ <row values="280102" />
<row values="290001" />
<row values="290002" />
+ <row values="290101" />
+ <row values="290102" />
</dataset>
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_with_case_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_with_case_expression.xml
index ecee55b..a3c457e 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_with_case_expression.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_with_case_expression.xml
@@ -23,5 +23,5 @@
<column name="itemid" />
<column name="stateName" />
</metadata>
- <row values="1000,10,init,100000,已启用" />
+ <row values="1000,10,init,100001,已启用" />
</dataset>
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env.properties b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env.properties
index 72439c4..75b0942 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env.properties
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env.properties
@@ -17,7 +17,7 @@
run.additional.cases=false
#rule.types=db,tbl,dbtbl_with_masterslave,masterslave,shadow
-rule.types=tbl,dbtbl_with_masterslave,masterslave
+rule.types=db,tbl,dbtbl_with_masterslave,masterslave
#databases=H2,MySQL,Oracle,SQLServer,PostgreSQL
databases=H2