Skip to content

Shardingsphere
Shardingsphere

apache / Shardingsphere

通知 56
Star 3
Fork 0
Shardingsphere
Shardingsphere

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 fc2c9dc0 编写于 作者: Z Zhang Yonglun 提交者： GitHub
浏览文件
操作

#6912, support keyword table name for PostgreSQL (#6914) 

* #6912, support keyword table name for PostgreSQL
上级 18e92ada
隐藏空白更改
内联 并排
Showing with 51 addition and 51 deletion
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dql-integrate-test-cases.xml
浏览文件 @ fc2c9dc0
......@@ -95,17 +95,17 @@
<assertion parameters="10:int, 11:int, 1009:int, 1108:int, none:String" expected-data-file="empty_order_item.xml" />
</dql-test-case>
<dql-test-case sql="SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id JOIN `select` c ON o.status = c.status WHERE o.user_id IN (?, ?) AND o.order_id BETWEEN ? AND ? AND o.status = ? ORDER BY i.item_id" db-types="MySQL">
<dql-test-case sql="SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id JOIN `key_word` c ON o.status = c.status WHERE o.user_id IN (?, ?) AND o.order_id BETWEEN ? AND ? AND o.status = ? ORDER BY i.item_id" db-types="MySQL">
<assertion parameters="10:int, 11:int, 1001:int, 1100:int, init:String" expected-data-file="select_sharding_route_with_broadcast_table.xml" />
<assertion parameters="10:int, 11:int, 1009:int, 1108:int, none:String" expected-data-file="empty_order_item.xml" />
</dql-test-case>
<dql-test-case sql="SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id JOIN &quot;select&quot; c ON o.status = c.status WHERE o.user_id IN (?, ?) AND o.order_id BETWEEN ? AND ? AND c.status = ? ORDER BY i.item_id" db-types="PostgreSQL,Oracle">
<dql-test-case sql="SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id JOIN &quot;key_word&quot; c ON o.status = c.status WHERE o.user_id IN (?, ?) AND o.order_id BETWEEN ? AND ? AND c.status = ? ORDER BY i.item_id" db-types="PostgreSQL,Oracle">
<assertion parameters="10:int, 11:int, 1001:int, 1100:int, init:String" expected-data-file="select_sharding_route_with_broadcast_table.xml" />
<assertion parameters="10:int, 11:int, 1009:int, 1108:int, none:String" expected-data-file="empty_order_item.xml" />
</dql-test-case>
<dql-test-case sql="SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id JOIN [select] c ON o.status = c.status WHERE o.user_id IN (?, ?) AND o.order_id BETWEEN ? AND ? AND c.status = ? ORDER BY i.item_id" db-types="SQLServer">
<dql-test-case sql="SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id JOIN [key_word] c ON o.status = c.status WHERE o.user_id IN (?, ?) AND o.order_id BETWEEN ? AND ? AND c.status = ? ORDER BY i.item_id" db-types="SQLServer">
<assertion parameters="10:int, 11:int, 1001:int, 1100:int, init:String" expected-data-file="select_sharding_route_with_broadcast_table.xml" />
<assertion parameters="10:int, 11:int, 1009:int, 1108:int, none:String" expected-data-file="empty_order_item.xml" />
</dql-test-case>
......
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/db/dataset.xml
浏览文件 @ fc2c9dc0
......@@ -32,7 +32,7 @@
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
<metadata data-nodes="db_${0..9}.select">
<metadata data-nodes="db_${0..9}.key_word">
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
......@@ -166,14 +166,14 @@
<row data-node="db_7.t_broadcast_table" values="1, init" />
<row data-node="db_8.t_broadcast_table" values="1, init" />
<row data-node="db_9.t_broadcast_table" values="1, init" />
<row data-node="db_0.select" values="1, init" />
<row data-node="db_1.select" values="1, init" />
<row data-node="db_2.select" values="1, init" />
<row data-node="db_3.select" values="1, init" />
<row data-node="db_4.select" values="1, init" />
<row data-node="db_5.select" values="1, init" />
<row data-node="db_6.select" values="1, init" />
<row data-node="db_7.select" values="1, init" />
<row data-node="db_8.select" values="1, init" />
<row data-node="db_9.select" values="1, init" />
<row data-node="db_0.key_word" values="1, init" />
<row data-node="db_1.key_word" values="1, init" />
<row data-node="db_2.key_word" values="1, init" />
<row data-node="db_3.key_word" values="1, init" />
<row data-node="db_4.key_word" values="1, init" />
<row data-node="db_5.key_word" values="1, init" />
<row data-node="db_6.key_word" values="1, init" />
<row data-node="db_7.key_word" values="1, init" />
<row data-node="db_8.key_word" values="1, init" />
<row data-node="db_9.key_word" values="1, init" />
</dataset>
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/db/schema.xml
浏览文件 @ fc2c9dc0
......@@ -34,12 +34,12 @@
<sql>CREATE INDEX order_index_t_order ON t_order (order_id)</sql>
<sql>CREATE TABLE t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id))</sql>
<sql>CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE `select` (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE key_word (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
</table-create>
<table-drop>
<sql>DROP TABLE t_order</sql>
<sql>DROP TABLE t_order_item</sql>
<sql>DROP TABLE t_broadcast_table</sql>
<sql>DROP TABLE `select`</sql>
<sql>DROP TABLE key_word</sql>
</table-drop>
</schema>
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/dataset.xml
浏览文件 @ fc2c9dc0
......@@ -36,7 +36,7 @@
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
<metadata data-nodes="master_db_${0..9}.select,slave_db_${0..9}.select">
<metadata data-nodes="master_db_${0..9}.key_word,slave_db_${0..9}.key_word">
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
......@@ -350,16 +350,16 @@
<row data-node="master_db_7.t_broadcast_table" values="1, init" />
<row data-node="master_db_8.t_broadcast_table" values="1, init" />
<row data-node="master_db_9.t_broadcast_table" values="1, init" />
<row data-node="master_db_0.select" values="1, init" />
<row data-node="master_db_1.select" values="1, init" />
<row data-node="master_db_2.select" values="1, init" />
<row data-node="master_db_3.select" values="1, init" />
<row data-node="master_db_4.select" values="1, init" />
<row data-node="master_db_5.select" values="1, init" />
<row data-node="master_db_6.select" values="1, init" />
<row data-node="master_db_7.select" values="1, init" />
<row data-node="master_db_8.select" values="1, init" />
<row data-node="master_db_9.select" values="1, init" />
<row data-node="master_db_0.key_word" values="1, init" />
<row data-node="master_db_1.key_word" values="1, init" />
<row data-node="master_db_2.key_word" values="1, init" />
<row data-node="master_db_3.key_word" values="1, init" />
<row data-node="master_db_4.key_word" values="1, init" />
<row data-node="master_db_5.key_word" values="1, init" />
<row data-node="master_db_6.key_word" values="1, init" />
<row data-node="master_db_7.key_word" values="1, init" />
<row data-node="master_db_8.key_word" values="1, init" />
<row data-node="master_db_9.key_word" values="1, init" />
<row data-node="master_db_0.t_global" values="1, global_master" />
<row data-node="slave_db_0.t_order_0" values="1000, 10, init_slave" />
<row data-node="slave_db_0.t_order_1" values="1001, 10, init_slave" />
......@@ -671,15 +671,15 @@
<row data-node="slave_db_7.t_broadcast_table" values="1, init_slave" />
<row data-node="slave_db_8.t_broadcast_table" values="1, init_slave" />
<row data-node="slave_db_9.t_broadcast_table" values="1, init_slave" />
<row data-node="slave_db_0.select" values="1, init_slave" />
<row data-node="slave_db_1.select" values="1, init_slave" />
<row data-node="slave_db_2.select" values="1, init_slave" />
<row data-node="slave_db_3.select" values="1, init_slave" />
<row data-node="slave_db_4.select" values="1, init_slave" />
<row data-node="slave_db_5.select" values="1, init_slave" />
<row data-node="slave_db_6.select" values="1, init_slave" />
<row data-node="slave_db_7.select" values="1, init_slave" />
<row data-node="slave_db_8.select" values="1, init_slave" />
<row data-node="slave_db_9.select" values="1, init_slave" />
<row data-node="slave_db_0.key_word" values="1, init_slave" />
<row data-node="slave_db_1.key_word" values="1, init_slave" />
<row data-node="slave_db_2.key_word" values="1, init_slave" />
<row data-node="slave_db_3.key_word" values="1, init_slave" />
<row data-node="slave_db_4.key_word" values="1, init_slave" />
<row data-node="slave_db_5.key_word" values="1, init_slave" />
<row data-node="slave_db_6.key_word" values="1, init_slave" />
<row data-node="slave_db_7.key_word" values="1, init_slave" />
<row data-node="slave_db_8.key_word" values="1, init_slave" />
<row data-node="slave_db_9.key_word" values="1, init_slave" />
<row data-node="slave_db_0.t_global" values="1, global_slave" />
</dataset>
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/schema.xml
浏览文件 @ fc2c9dc0
......@@ -72,7 +72,7 @@
<sql>CREATE TABLE t_order_item_9 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id))</sql>
<sql>CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE t_global (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE `select` (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE key_word (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
</table-create>
<table-drop>
<sql>DROP TABLE t_order_0</sql>
......@@ -97,6 +97,6 @@
<sql>DROP TABLE t_order_item_9</sql>
<sql>DROP TABLE t_broadcast_table</sql>
<sql>DROP TABLE t_global</sql>
<sql>DROP TABLE `select`</sql>
<sql>DROP TABLE key_word</sql>
</table-drop>
</schema>
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/dataset.xml
浏览文件 @ fc2c9dc0
......@@ -36,7 +36,7 @@
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
<metadata data-nodes="master.select,slave_${0..1}.select">
<metadata data-nodes="master.key_word,slave_${0..1}.key_word">
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
......@@ -161,7 +161,7 @@
<row data-node="master.t_order_item" values="290101, 2901, 29, init, 2017-08-08" />
<row data-node="master.t_order_item" values="290102, 2901, 29, init, 2017-08-08" />
<row data-node="master.t_broadcast_table" values="1, init" />
<row data-node="master.select" values="1, init" />
<row data-node="master.key_word" values="1, init" />
<row data-node="master.t_global" values="1, global_master" />
<row data-node="slave_0.t_order" values="1000, 10, init_slave" />
<row data-node="slave_0.t_order" values="1001, 10, init_slave" />
......@@ -284,7 +284,7 @@
<row data-node="slave_0.t_order_item" values="290101, 2901, 29, init_slave, 2017-08-08" />
<row data-node="slave_0.t_order_item" values="290102, 2901, 29, init_slave, 2017-08-08" />
<row data-node="slave_0.t_broadcast_table" values="1, init_slave" />
<row data-node="slave_0.select" values="1, init_slave" />
<row data-node="slave_0.key_word" values="1, init_slave" />
<row data-node="slave_0.t_global" values="1, global_slave_0" />
<row data-node="slave_1.t_order" values="1000, 10, init_slave" />
<row data-node="slave_1.t_order" values="1001, 10, init_slave" />
......@@ -407,6 +407,6 @@
<row data-node="slave_1.t_order_item" values="290101, 2901, 29, init_slave, 2017-08-08" />
<row data-node="slave_1.t_order_item" values="290102, 2901, 29, init_slave, 2017-08-08" />
<row data-node="slave_1.t_broadcast_table" values="1, init_slave" />
<row data-node="slave_1.select" values="1, init_slave" />
<row data-node="slave_1.key_word" values="1, init_slave" />
<row data-node="slave_1.t_global" values="1, global_slave_1" />
</dataset>
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/schema.xml
浏览文件 @ fc2c9dc0
......@@ -28,13 +28,13 @@
<sql>CREATE TABLE t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id))</sql>
<sql>CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE t_global (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE `select` (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE key_word (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
</table-create>
<table-drop>
<sql>DROP TABLE t_order</sql>
<sql>DROP TABLE t_order_item</sql>
<sql>DROP TABLE t_broadcast_table</sql>
<sql>DROP TABLE t_global</sql>
<sql>DROP TABLE `select`</sql>
<sql>DROP TABLE key_word</sql>
</table-drop>
</schema>
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/shadow/schema.xml
浏览文件 @ fc2c9dc0
......@@ -26,12 +26,12 @@
<sql>CREATE INDEX order_index_t_order ON t_order (order_id)</sql>
<sql>CREATE TABLE t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id))</sql>
<sql>CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE `select` (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE key_word (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
</table-create>
<table-drop>
<sql>DROP TABLE t_order</sql>
<sql>DROP TABLE t_order_item</sql>
<sql>DROP TABLE t_broadcast_table</sql>
<sql>DROP TABLE `select`</sql>
<sql>DROP TABLE key_word</sql>
</table-drop>
</schema>
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/tbl/dataset.xml
浏览文件 @ fc2c9dc0
......@@ -32,7 +32,7 @@
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
<metadata data-nodes="tbl.select">
<metadata data-nodes="tbl.key_word">
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
......@@ -97,5 +97,5 @@
<row data-node="tbl.t_order_item_9" values="110900, 1109, 11, init, 2017-08-19" />
<row data-node="tbl.t_order_item_9" values="110901, 1109, 11, init, 2017-08-19" />
<row data-node="tbl.t_broadcast_table" values="1, init" />
<row data-node="tbl.select" values="1, init" />
<row data-node="tbl.key_word" values="1, init" />
</dataset>
shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/tbl/schema.xml
浏览文件 @ fc2c9dc0
......@@ -52,7 +52,7 @@
<sql>CREATE TABLE t_order_item_8 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id))</sql>
<sql>CREATE TABLE t_order_item_9 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id))</sql>
<sql>CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE `select` (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
<sql>CREATE TABLE key_word (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id))</sql>
</table-create>
<table-drop>
<sql>DROP TABLE t_order_0</sql>
......@@ -76,6 +76,6 @@
<sql>DROP TABLE t_order_item_8</sql>
<sql>DROP TABLE t_order_item_9</sql>
<sql>DROP TABLE t_broadcast_table</sql>
<sql>DROP TABLE `select`</sql>
<sql>DROP TABLE key_word</sql>
</table-drop>
</schema>
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或