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 2022/11/05 07:54:35 UTC
[shardingsphere] branch master updated: Add cascade for drop h2 drop statement to avoid exception (#21971)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 ef1431655c0 Add cascade for drop h2 drop statement to avoid exception (#21971)
ef1431655c0 is described below
commit ef1431655c03a7acf0eafc81df614f9c493bba0c
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Sat Nov 5 15:54:28 2022 +0800
Add cascade for drop h2 drop statement to avoid exception (#21971)
---
.../db/data/actual/init-sql/h2/01-actual-init.sql | 10 +++---
.../data/actual/init-sql/h2/actual-db_0-init.sql | 12 ++++----
.../data/actual/init-sql/h2/actual-db_1-init.sql | 10 +++---
.../actual/init-sql/h2/actual-logic_db-init.sql | 8 ++---
.../data/expected/init-sql/h2/01-expected-init.sql | 36 +++++++++++-----------
5 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/01-actual-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/01-actual-init.sql
index f705ef534b0..8f1c0c3a71b 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/01-actual-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/01-actual-init.sql
@@ -15,11 +15,11 @@
-- limitations under the License.
--
-DROP TABLE IF EXISTS t_order;
-DROP TABLE IF EXISTS t_order_item;
-DROP TABLE IF EXISTS t_product_category;
-DROP TABLE IF EXISTS t_country;
-DROP TABLE IF EXISTS t_broadcast_table;
+DROP TABLE IF EXISTS t_order CASCADE;
+DROP TABLE IF EXISTS t_order_item CASCADE;
+DROP TABLE IF EXISTS t_product_category CASCADE;
+DROP TABLE IF EXISTS t_country CASCADE;
+DROP TABLE IF EXISTS t_broadcast_table CASCADE;
CREATE TABLE t_order (order_id BIGINT PRIMARY KEY, user_id INT NOT NULL, status VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark VARCHAR(50) NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE t_order_item (item_id BIGINT PRIMARY KEY, order_id BIGINT NOT NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-db_0-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-db_0-init.sql
index 8c99fd9a37b..460d8869fd8 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-db_0-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-db_0-init.sql
@@ -15,12 +15,12 @@
-- limitations under the License.
--
-DROP TABLE IF EXISTS t_user;
-DROP TABLE IF EXISTS t_product;
-DROP TABLE IF EXISTS t_order_federate;
-DROP TABLE IF EXISTS t_order_federate_sharding;
-DROP TABLE IF EXISTS t_order_item_federate_sharding;
-DROP TABLE IF EXISTS t_single_table;
+DROP TABLE IF EXISTS t_user CASCADE;
+DROP TABLE IF EXISTS t_product CASCADE;
+DROP TABLE IF EXISTS t_order_federate CASCADE;
+DROP TABLE IF EXISTS t_order_federate_sharding CASCADE;
+DROP TABLE IF EXISTS t_order_item_federate_sharding CASCADE;
+DROP TABLE IF EXISTS t_single_table CASCADE;
CREATE TABLE t_user (user_id INT PRIMARY KEY, user_name VARCHAR(50) NOT NULL, password VARCHAR(50) NOT NULL, email VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE t_product (product_id INT PRIMARY KEY, product_name VARCHAR(50) NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status VARCHAR(50) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-db_1-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-db_1-init.sql
index 8112557037a..7d3feb8256a 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-db_1-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-db_1-init.sql
@@ -15,11 +15,11 @@
-- limitations under the License.
--
-DROP TABLE IF EXISTS t_merchant;
-DROP TABLE IF EXISTS t_product_detail;
-DROP TABLE IF EXISTS t_order_item_federate;
-DROP TABLE IF EXISTS t_order_federate_sharding;
-DROP TABLE IF EXISTS t_order_item_federate_sharding;
+DROP TABLE IF EXISTS t_merchant CASCADE;
+DROP TABLE IF EXISTS t_product_detail CASCADE;
+DROP TABLE IF EXISTS t_order_item_federate CASCADE;
+DROP TABLE IF EXISTS t_order_federate_sharding CASCADE;
+DROP TABLE IF EXISTS t_order_item_federate_sharding CASCADE;
CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE t_product_detail (detail_id INT PRIMARY KEY, product_id INT NOT NULL, description VARCHAR(50) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-logic_db-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-logic_db-init.sql
index e34dbc86608..dfbd322a73e 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-logic_db-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/actual/init-sql/h2/actual-logic_db-init.sql
@@ -15,10 +15,10 @@
-- limitations under the License.
--
-DROP VIEW IF EXISTS t_order_item_join_view;
-DROP VIEW IF EXISTS t_order_subquery_view;
-DROP VIEW IF EXISTS t_order_aggregation_view;
-DROP VIEW IF EXISTS t_order_union_view;
+DROP VIEW IF EXISTS t_order_item_join_view CASCADE;
+DROP VIEW IF EXISTS t_order_subquery_view CASCADE;
+DROP VIEW IF EXISTS t_order_aggregation_view CASCADE;
+DROP VIEW IF EXISTS t_order_union_view CASCADE;
CREATE VIEW t_order_item_join_view AS SELECT o.order_id, o.user_id, i.item_id FROM t_order o INNER JOIN t_order_item i ON o.order_id = i.order_id WHERE o.user_id = 10 ORDER BY o.order_id, i.item_id;
CREATE VIEW t_order_subquery_view AS SELECT * FROM t_order o WHERE o.order_id IN (SELECT i.order_id FROM t_order_item i INNER JOIN t_product p ON i.product_id = p.product_id WHERE p.product_id = 10);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/expected/init-sql/h2/01-expected-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/expected/init-sql/h2/01-expected-init.sql
index e22624e9838..293ee373429 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/expected/init-sql/h2/01-expected-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/db/data/expected/init-sql/h2/01-expected-init.sql
@@ -15,25 +15,25 @@
-- limitations under the License.
--
-DROP TABLE IF EXISTS t_order;
-DROP TABLE IF EXISTS t_order_item;
-DROP TABLE IF EXISTS t_user;
-DROP TABLE IF EXISTS t_merchant;
-DROP TABLE IF EXISTS t_product;
-DROP TABLE IF EXISTS t_product_detail;
-DROP TABLE IF EXISTS t_product_category;
-DROP TABLE IF EXISTS t_country;
-DROP VIEW IF EXISTS t_order_item_join_view;
-DROP VIEW IF EXISTS t_order_subquery_view;
-DROP VIEW IF EXISTS t_order_aggregation_view;
-DROP VIEW IF EXISTS t_order_union_view;
+DROP TABLE IF EXISTS t_order CASCADE;
+DROP TABLE IF EXISTS t_order_item CASCADE;
+DROP TABLE IF EXISTS t_user CASCADE;
+DROP TABLE IF EXISTS t_merchant CASCADE;
+DROP TABLE IF EXISTS t_product CASCADE;
+DROP TABLE IF EXISTS t_product_detail CASCADE;
+DROP TABLE IF EXISTS t_product_category CASCADE;
+DROP TABLE IF EXISTS t_country CASCADE;
+DROP VIEW IF EXISTS t_order_item_join_view CASCADE;
+DROP VIEW IF EXISTS t_order_subquery_view CASCADE;
+DROP VIEW IF EXISTS t_order_aggregation_view CASCADE;
+DROP VIEW IF EXISTS t_order_union_view CASCADE;
-- TODO replace these tables with standard tables
-DROP TABLE IF EXISTS t_single_table;
-DROP TABLE IF EXISTS t_broadcast_table;
-DROP TABLE IF EXISTS t_order_federate;
-DROP TABLE IF EXISTS t_order_item_federate;
-DROP TABLE IF EXISTS t_order_federate_sharding;
-DROP TABLE IF EXISTS t_order_item_federate_sharding;
+DROP TABLE IF EXISTS t_single_table CASCADE;
+DROP TABLE IF EXISTS t_broadcast_table CASCADE;
+DROP TABLE IF EXISTS t_order_federate CASCADE;
+DROP TABLE IF EXISTS t_order_item_federate CASCADE;
+DROP TABLE IF EXISTS t_order_federate_sharding CASCADE;
+DROP TABLE IF EXISTS t_order_item_federate_sharding CASCADE;
CREATE TABLE t_order (order_id BIGINT PRIMARY KEY, user_id INT NOT NULL, status VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark VARCHAR(50) NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE t_order_item (item_id BIGINT PRIMARY KEY, order_id BIGINT NOT NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL, creation_date DATE NOT NULL);