This is an automated email from the ASF dual-hosted git repository. wuweijie 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 c437b66 Fix jdbc integration test case (#9139) c437b66 is described below commit c437b66c3ecf62b8e8680c2f0e3c5fabc6e380c9 Author: Liang Zhang <terrym...@163.com> AuthorDate: Sat Jan 23 17:00:56 2021 +0800 Fix jdbc integration test case (#9139) * Add unique check for table names when single tables loading * Fix jdbc integration test case * Rename config file * Fix test case error --- .../driver/common/base/AbstractSQLTest.java | 10 ++++++++-- ...stractShardingSphereDataSourceForEncryptTest.java | 2 +- ...bstractShardingSphereDataSourceForShadowTest.java | 2 +- .../core/statement/ShadowPreparedStatementTest.java | 4 ++-- .../jdbc/core/statement/ShadowStatementTest.java | 2 +- .../{encrypt-config.yaml => config-encrypt.yaml} | 0 .../src/test/resources/config-shadow.yaml | 4 ++-- .../src/test/resources/jdbc_encrypt_init.sql | 20 ++++++++++++++++++++ .../src/test/resources/jdbc_init.sql | 4 ---- .../{jdbc_init.sql => jdbc_shadow_init.sql} | 8 ++++---- .../configWithDataSourceWithoutProps.yaml | 2 +- .../src/test/resources/yaml/schema/sharding/db0.sql | 8 -------- .../src/test/resources/yaml/schema/sharding/db1.sql | 8 -------- .../schema/sharding_replica_query/primary_ds_0.sql | 8 -------- .../schema/sharding_replica_query/primary_ds_1.sql | 8 -------- .../schema/sharding_replica_query/replica_ds_0.sql | 8 -------- .../schema/sharding_replica_query/replica_ds_1.sql | 8 -------- 17 files changed, 40 insertions(+), 66 deletions(-) diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLTest.java index 55120d6..2e4ad13 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLTest.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLTest.java @@ -39,7 +39,7 @@ import java.util.Set; public abstract class AbstractSQLTest { - private static final List<String> DB_NAMES = Arrays.asList("jdbc_0", "jdbc_1", "encrypt", "test_primary_ds", "test_replica_ds"); + private static final List<String> DB_NAMES = Arrays.asList("jdbc_0", "jdbc_1", "shadow_jdbc_0", "shadow_jdbc_1", "encrypt", "test_primary_ds", "test_replica_ds"); private static final Set<DatabaseType> DATABASE_TYPES = Sets.newHashSet(DatabaseTypeRegistry.getActualDatabaseType("H2")); @@ -77,7 +77,13 @@ public abstract class AbstractSQLTest { private static void buildSchema(final String dbName, final DatabaseType databaseType) { try { Connection conn = DATABASE_TYPE_MAP.get(databaseType).get(dbName).getConnection(); - RunScript.execute(conn, new InputStreamReader(Objects.requireNonNull(AbstractSQLTest.class.getClassLoader().getResourceAsStream("jdbc_init.sql")))); + if ("encrypt".equals(dbName)) { + RunScript.execute(conn, new InputStreamReader(Objects.requireNonNull(AbstractSQLTest.class.getClassLoader().getResourceAsStream("jdbc_encrypt_init.sql")))); + } else if ("shadow_jdbc_0".equals(dbName) || "shadow_jdbc_1".equals(dbName)) { + RunScript.execute(conn, new InputStreamReader(Objects.requireNonNull(AbstractSQLTest.class.getClassLoader().getResourceAsStream("jdbc_shadow_init.sql")))); + } else { + RunScript.execute(conn, new InputStreamReader(Objects.requireNonNull(AbstractSQLTest.class.getClassLoader().getResourceAsStream("jdbc_init.sql")))); + } conn.close(); } catch (final SQLException ex) { throw new RuntimeException(ex); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForEncryptTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForEncryptTest.java index d52168a..2d1c6fa 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForEncryptTest.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForEncryptTest.java @@ -50,7 +50,7 @@ public abstract class AbstractShardingSphereDataSourceForEncryptTest extends Abs private static final List<String> ENCRYPT_DB_NAMES = Collections.singletonList("encrypt"); - private static final String ENCRYPT_CONFIG_FILE = "encrypt-config.yaml"; + private static final String ENCRYPT_CONFIG_FILE = "config-encrypt.yaml"; @BeforeClass public static void initEncryptDataSource() throws SQLException, IOException { diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShadowTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShadowTest.java index 38f417b..ae1dc25 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShadowTest.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShadowTest.java @@ -38,7 +38,7 @@ public abstract class AbstractShardingSphereDataSourceForShadowTest extends Abst private static final String CONFIG_SHADOW = "config-shadow.yaml"; - private static final List<String> SHADOW_DB_NAMES = Arrays.asList("jdbc_0", "jdbc_1"); + private static final List<String> SHADOW_DB_NAMES = Arrays.asList("shadow_jdbc_0", "shadow_jdbc_1"); @BeforeClass public static void initShadowDataSource() throws SQLException, IOException { diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java index 05ccce2..5892586 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java @@ -137,7 +137,7 @@ public final class ShadowPreparedStatementTest extends AbstractShardingSphereDat private void assertResultSet(final boolean isShadow, final int resultSetCount, final Object cipherPwd) throws SQLException { Map<String, DataSource> dataMaps = getDatabaseTypeMap().get(DatabaseTypeRegistry.getActualDatabaseType("H2")); - DataSource dataSource = isShadow ? dataMaps.get("jdbc_1") : dataMaps.get("jdbc_0"); + DataSource dataSource = isShadow ? dataMaps.get("shadow_jdbc_1") : dataMaps.get("shadow_jdbc_0"); try (Statement statement = dataSource.getConnection().createStatement()) { ResultSet resultSet = statement.executeQuery(SELECT_SQL); int count = 1; @@ -151,7 +151,7 @@ public final class ShadowPreparedStatementTest extends AbstractShardingSphereDat private void assertResultSet(final boolean isShadow, final int id, final int resultSetCount, final Object cipherPwd) throws SQLException { Map<String, DataSource> dataMaps = getDatabaseTypeMap().get(DatabaseTypeRegistry.getActualDatabaseType("H2")); - DataSource dataSource = isShadow ? dataMaps.get("jdbc_1") : dataMaps.get("jdbc_0"); + DataSource dataSource = isShadow ? dataMaps.get("shadow_jdbc_1") : dataMaps.get("shadow_jdbc_0"); try (PreparedStatement statement = dataSource.getConnection().prepareStatement(SELECT_SQL_BY_ID)) { statement.setObject(1, id); ResultSet resultSet = statement.executeQuery(); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowStatementTest.java index 0ba056e..c5b2612 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowStatementTest.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowStatementTest.java @@ -87,7 +87,7 @@ public final class ShadowStatementTest extends AbstractShardingSphereDataSourceF private void assertResultSet(final boolean isShadow, final int resultSetCount, final Object cipherPwd) throws SQLException { Map<String, DataSource> dataMaps = getDatabaseTypeMap().get(DatabaseTypeRegistry.getActualDatabaseType("H2")); - DataSource dataSource = isShadow ? dataMaps.get("jdbc_1") : dataMaps.get("jdbc_0"); + DataSource dataSource = isShadow ? dataMaps.get("shadow_jdbc_1") : dataMaps.get("shadow_jdbc_0"); try (Statement statement = dataSource.getConnection().createStatement()) { ResultSet resultSet = statement.executeQuery(SELECT_SQL); int count = 1; diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/encrypt-config.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config-encrypt.yaml similarity index 100% rename from shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/encrypt-config.yaml rename to shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config-encrypt.yaml diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config-shadow.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config-shadow.yaml index a8b8d7e..41a1fa1 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config-shadow.yaml +++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config-shadow.yaml @@ -19,6 +19,6 @@ rules: - !SHADOW column: shadow sourceDataSourceNames: - - jdbc_0 + - shadow_jdbc_0 shadowDataSourceNames: - - jdbc_1 \ No newline at end of file + - shadow_jdbc_1 \ No newline at end of file diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_encrypt_init.sql b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_encrypt_init.sql new file mode 100644 index 0000000..aec6dd1 --- /dev/null +++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_encrypt_init.sql @@ -0,0 +1,20 @@ +/* + * 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. + */ + +CREATE TABLE IF NOT EXISTS t_encrypt (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, plain_pwd VARCHAR(45), PRIMARY KEY (id)); +CREATE TABLE IF NOT EXISTS t_query_encrypt (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, assist_pwd VARCHAR(45) NULL, PRIMARY KEY (id)); +CREATE TABLE IF NOT EXISTS t_encrypt_contains_column (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, plain_pwd VARCHAR(45), cipher_pwd2 VARCHAR(45) NULL, plain_pwd2 VARCHAR(45), PRIMARY KEY (id)); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_init.sql b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_init.sql index 4e129c1..dde4846 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_init.sql +++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_init.sql @@ -26,10 +26,6 @@ CREATE TABLE IF NOT EXISTS t_order_item_auto_0 (item_id INT NOT NULL, order_id I CREATE TABLE IF NOT EXISTS t_order_item_auto_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (item_id)); CREATE TABLE IF NOT EXISTS t_config (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id)); -CREATE TABLE IF NOT EXISTS t_global (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id)); -CREATE TABLE IF NOT EXISTS t_encrypt (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, plain_pwd VARCHAR(45), PRIMARY KEY (id)); -CREATE TABLE IF NOT EXISTS t_query_encrypt (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, assist_pwd VARCHAR(45) NULL, PRIMARY KEY (id)); -CREATE TABLE IF NOT EXISTS t_encrypt_contains_column (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, plain_pwd VARCHAR(45), cipher_pwd2 VARCHAR(45) NULL, plain_pwd2 VARCHAR(45), PRIMARY KEY (id)); CREATE TABLE IF NOT EXISTS t_user_0 (id INT NOT NULL, name VARCHAR(45) NULL, PRIMARY KEY (id)); CREATE TABLE IF NOT EXISTS t_user_1 (id INT NOT NULL, name VARCHAR(45) NULL, PRIMARY KEY (id)); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_init.sql b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_shadow_init.sql similarity index 96% copy from shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_init.sql copy to shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_shadow_init.sql index 4e129c1..5e0a0cc 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_init.sql +++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/jdbc_shadow_init.sql @@ -26,10 +26,10 @@ CREATE TABLE IF NOT EXISTS t_order_item_auto_0 (item_id INT NOT NULL, order_id I CREATE TABLE IF NOT EXISTS t_order_item_auto_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (item_id)); CREATE TABLE IF NOT EXISTS t_config (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id)); -CREATE TABLE IF NOT EXISTS t_global (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id)); -CREATE TABLE IF NOT EXISTS t_encrypt (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, plain_pwd VARCHAR(45), PRIMARY KEY (id)); -CREATE TABLE IF NOT EXISTS t_query_encrypt (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, assist_pwd VARCHAR(45) NULL, PRIMARY KEY (id)); -CREATE TABLE IF NOT EXISTS t_encrypt_contains_column (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, plain_pwd VARCHAR(45), cipher_pwd2 VARCHAR(45) NULL, plain_pwd2 VARCHAR(45), PRIMARY KEY (id)); CREATE TABLE IF NOT EXISTS t_user_0 (id INT NOT NULL, name VARCHAR(45) NULL, PRIMARY KEY (id)); CREATE TABLE IF NOT EXISTS t_user_1 (id INT NOT NULL, name VARCHAR(45) NULL, PRIMARY KEY (id)); + +CREATE TABLE IF NOT EXISTS t_encrypt (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, plain_pwd VARCHAR(45), PRIMARY KEY (id)); +CREATE TABLE IF NOT EXISTS t_query_encrypt (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, assist_pwd VARCHAR(45) NULL, PRIMARY KEY (id)); +CREATE TABLE IF NOT EXISTS t_encrypt_contains_column (id INT NOT NULL AUTO_INCREMENT, cipher_pwd VARCHAR(45) NULL, plain_pwd VARCHAR(45), cipher_pwd2 VARCHAR(45) NULL, plain_pwd2 VARCHAR(45), PRIMARY KEY (id)); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutProps.yaml index e171b2f..300902c 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutProps.yaml +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_replica_query/configWithDataSourceWithoutProps.yaml @@ -47,7 +47,7 @@ rules: config: actualDataNodes: pr_ds_${0..1}.t_config t_order: - actualDataNodes: pr_ds_${0..1}.t_order_${0..2} + actualDataNodes: pr_ds_${0..1}.t_order_${0..1} databaseStrategy: standard: shardingColumn: user_id diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db0.sql b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db0.sql index 1680618..8f3bd3b 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db0.sql +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db0.sql @@ -19,19 +19,11 @@ DROP SCHEMA IF EXISTS `db0`; CREATE SCHEMA `db0`; DROP TABLE IF EXISTS `t_order_0`; DROP TABLE IF EXISTS `t_order_1`; -DROP TABLE IF EXISTS `t_order_2`; -DROP TABLE IF EXISTS `t_order_3`; DROP TABLE IF EXISTS `t_order_item_0`; DROP TABLE IF EXISTS `t_order_item_1`; -DROP TABLE IF EXISTS `t_order_item_2`; -DROP TABLE IF EXISTS `t_order_item_3`; DROP TABLE IF EXISTS `t_config`; CREATE TABLE `t_order_0` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_1` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_2` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_3` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_item_0` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_order_item_1` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_2` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_3` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_config` (`id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`id`)); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db1.sql b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db1.sql index 209f1f1..347a02b 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db1.sql +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db1.sql @@ -19,19 +19,11 @@ DROP SCHEMA IF EXISTS `db1`; CREATE SCHEMA `db1`; DROP TABLE IF EXISTS `t_order_0`; DROP TABLE IF EXISTS `t_order_1`; -DROP TABLE IF EXISTS `t_order_2`; -DROP TABLE IF EXISTS `t_order_3`; DROP TABLE IF EXISTS `t_order_item_0`; DROP TABLE IF EXISTS `t_order_item_1`; -DROP TABLE IF EXISTS `t_order_item_2`; -DROP TABLE IF EXISTS `t_order_item_3`; DROP TABLE IF EXISTS `t_config`; CREATE TABLE `t_order_0` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_1` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_2` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_3` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_item_0` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_order_item_1` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_2` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_3` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_config` (`id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`id`)); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/primary_ds_0.sql b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/primary_ds_0.sql index 4cc6867..d5b1cc2 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/primary_ds_0.sql +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/primary_ds_0.sql @@ -19,19 +19,11 @@ DROP SCHEMA IF EXISTS `primary_ds_0`; CREATE SCHEMA `primary_ds_0`; DROP TABLE IF EXISTS `t_order_0`; DROP TABLE IF EXISTS `t_order_1`; -DROP TABLE IF EXISTS `t_order_2`; -DROP TABLE IF EXISTS `t_order_3`; DROP TABLE IF EXISTS `t_order_item_0`; DROP TABLE IF EXISTS `t_order_item_1`; -DROP TABLE IF EXISTS `t_order_item_2`; -DROP TABLE IF EXISTS `t_order_item_3`; DROP TABLE IF EXISTS `t_config`; CREATE TABLE `t_order_0` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_1` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_2` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_3` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_item_0` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_order_item_1` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_2` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_3` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_config` (`id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`id`)); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/primary_ds_1.sql b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/primary_ds_1.sql index dc3eee5..15776c6 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/primary_ds_1.sql +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/primary_ds_1.sql @@ -19,19 +19,11 @@ DROP SCHEMA IF EXISTS `primary_ds_1`; CREATE SCHEMA `primary_ds_1`; DROP TABLE IF EXISTS `t_order_0`; DROP TABLE IF EXISTS `t_order_1`; -DROP TABLE IF EXISTS `t_order_2`; -DROP TABLE IF EXISTS `t_order_3`; DROP TABLE IF EXISTS `t_order_item_0`; DROP TABLE IF EXISTS `t_order_item_1`; -DROP TABLE IF EXISTS `t_order_item_2`; -DROP TABLE IF EXISTS `t_order_item_3`; DROP TABLE IF EXISTS `t_config`; CREATE TABLE `t_order_0` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_1` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_2` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_3` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_item_0` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_order_item_1` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_2` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_3` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_config` (`id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`id`)); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/replica_ds_0.sql b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/replica_ds_0.sql index 2a48007..d346d3a 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/replica_ds_0.sql +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/replica_ds_0.sql @@ -19,19 +19,11 @@ DROP SCHEMA IF EXISTS `replica_ds_0`; CREATE SCHEMA `replica_ds_0`; DROP TABLE IF EXISTS `t_order_0`; DROP TABLE IF EXISTS `t_order_1`; -DROP TABLE IF EXISTS `t_order_2`; -DROP TABLE IF EXISTS `t_order_3`; DROP TABLE IF EXISTS `t_order_item_0`; DROP TABLE IF EXISTS `t_order_item_1`; -DROP TABLE IF EXISTS `t_order_item_2`; -DROP TABLE IF EXISTS `t_order_item_3`; DROP TABLE IF EXISTS `t_config`; CREATE TABLE `t_order_0` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_1` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_2` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_3` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_item_0` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_order_item_1` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_2` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_3` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_config` (`id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`id`)); diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/replica_ds_1.sql b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/replica_ds_1.sql index 4a4f52d..0a4c70f 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/replica_ds_1.sql +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_replica_query/replica_ds_1.sql @@ -19,19 +19,11 @@ DROP SCHEMA IF EXISTS `replica_ds_1`; CREATE SCHEMA `replica_ds_1`; DROP TABLE IF EXISTS `t_order_0`; DROP TABLE IF EXISTS `t_order_1`; -DROP TABLE IF EXISTS `t_order_2`; -DROP TABLE IF EXISTS `t_order_3`; DROP TABLE IF EXISTS `t_order_item_0`; DROP TABLE IF EXISTS `t_order_item_1`; -DROP TABLE IF EXISTS `t_order_item_2`; -DROP TABLE IF EXISTS `t_order_item_3`; DROP TABLE IF EXISTS `t_config`; CREATE TABLE `t_order_0` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_1` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_2` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); -CREATE TABLE `t_order_3` (`order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`)); CREATE TABLE `t_order_item_0` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_order_item_1` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_2` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); -CREATE TABLE `t_order_item_3` (`order_item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_item_id`)); CREATE TABLE `t_config` (`id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`id`));