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/05/28 07:06:29 UTC
[shardingsphere] branch master updated: Rename schemeName to databaseName (#18011)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 78ba9dcaaf3 Rename schemeName to databaseName (#18011)
78ba9dcaaf3 is described below
commit 78ba9dcaaf3bb6407d252a873917f7762dd36672
Author: lanchengx <52...@users.noreply.github.com>
AuthorDate: Sat May 28 15:06:24 2022 +0800
Rename schemeName to databaseName (#18011)
* Rename schemeName to databaseName [sharding]
* Rename schemeName to databaseName [single table doc]
* Rename schemeName to databaseName [readwrite splitting]
* Rename schemeName to databaseName [db discovery]
* Rename schemeName to databaseName [encrypt]
* Rename schemeName to databaseName [shadow]
* Rename class and variable.
---
.../distsql/syntax/ral/_index.cn.md | 12 +++++-----
.../distsql/syntax/ral/_index.en.md | 12 +++++-----
.../distsql/syntax/rql/resource-query.cn.md | 4 ++--
.../distsql/syntax/rql/resource-query.en.md | 4 ++--
.../syntax/rql/rule-query/db-discovery.cn.md | 6 ++---
.../syntax/rql/rule-query/db-discovery.en.md | 6 ++---
.../distsql/syntax/rql/rule-query/encrypt.cn.md | 4 ++--
.../distsql/syntax/rql/rule-query/encrypt.en.md | 4 ++--
.../rql/rule-query/readwrite-splitting.cn.md | 2 +-
.../rql/rule-query/readwrite-splitting.en.md | 2 +-
.../distsql/syntax/rql/rule-query/shadow.cn.md | 6 ++---
.../distsql/syntax/rql/rule-query/shadow.en.md | 6 ++---
.../distsql/syntax/rql/rule-query/sharding.cn.md | 18 +++++++-------
.../distsql/syntax/rql/rule-query/sharding.en.md | 18 +++++++-------
.../syntax/rql/rule-query/single-table.cn.md | 2 +-
.../syntax/rql/rule-query/single-table.en.md | 2 +-
.../src/main/antlr4/imports/BaseRule.g4 | 4 ++--
.../src/main/antlr4/imports/RALStatement.g4 | 4 ++--
.../src/main/antlr4/imports/RQLStatement.g4 | 14 +++++------
.../parser/autogen/CommonDistSQLStatement.g4 | 2 +-
.../core/common/CommonDistSQLStatementVisitor.java | 28 +++++++++++-----------
.../antlr4/imports/db-discovery/RQLStatement.g4 | 8 +++----
.../DatabaseDiscoveryDistSQLStatementVisitor.java | 10 ++++----
.../main/antlr4/imports/encrypt/RQLStatement.g4 | 4 ++--
.../core/EncryptDistSQLStatementVisitor.java | 6 ++---
.../antlr4/imports/readwrite-splitting/BaseRule.g4 | 2 +-
.../imports/readwrite-splitting/RALStatement.g4 | 6 ++---
.../imports/readwrite-splitting/RQLStatement.g4 | 2 +-
.../ReadwriteSplittingDistSQLStatementVisitor.java | 16 ++++++-------
.../src/main/antlr4/imports/shadow/RQLStatement.g4 | 8 +++----
.../parser/core/ShadowDistSQLStatementVisitor.java | 12 +++++-----
.../main/antlr4/imports/sharding/RQLStatement.g4 | 24 +++++++++----------
.../core/ShardingDistSQLStatementVisitor.java | 26 ++++++++++----------
.../data/pipeline/cases/base/BaseITCase.java | 4 ++--
.../cases/rql/rql-integration-test-cases.xml | 2 +-
.../ShowTableMetadataStatementAssert.java | 2 +-
.../distsql/rql/impl/ShowRulesStatementAssert.java | 4 ++--
.../rule/CountDatabaseRulesStatementAssert.java | 4 ++--
.../jaxb/cases/domain/SQLParserTestCases.java | 6 ++---
.../ral/ShowTableMetadataStatementTestCase.java | 4 ++--
...va => CountDatabaseRulesStatementTestCase.java} | 4 ++--
.../src/main/resources/case/ral/common.xml | 2 +-
.../src/main/resources/case/rql/show.xml | 20 ++++++++--------
.../main/resources/sql/supported/ral/common.xml | 12 +++++-----
.../src/main/resources/sql/supported/rql/show.xml | 16 ++++++-------
45 files changed, 182 insertions(+), 182 deletions(-)
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/_index.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/_index.cn.md
index d57f89fecaf..83547c3442a 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/_index.cn.md
@@ -40,10 +40,10 @@ RAL (Resource & Rule Administration Language) 为 Apache ShardingSphere 的管
| 语句 | 说明 | 示例 |
|:------------------------------------------------------------- |:-------------------------------------------------- |:---------------------------------------------- |
-| [ENABLE / DISABLE] READWRITE_SPLITTING (READ)? resourceName [FROM schemaName] | 启用 / 禁用读库 | ENABLE READWRITE_SPLITTING READ resource_0 |
+| [ENABLE / DISABLE] READWRITE_SPLITTING (READ)? resourceName [FROM databaseName] | 启用 / 禁用读库 | ENABLE READWRITE_SPLITTING READ resource_0 |
| [ENABLE / DISABLE] INSTANCE [IP=xxx, PORT=xxx / instanceId] | 启用 / 禁用 proxy 实例 | DISABLE INSTANCE 127.0.0.1@3307 |
| SHOW INSTANCE LIST | 查询 proxy 实例信息 | SHOW INSTANCE LIST |
-| SHOW READWRITE_SPLITTING (READ)? resourceName [FROM schemaName] | 查询所有读库的状态 | SHOW READWRITE_SPLITTING READ RESOURCES |
+| SHOW READWRITE_SPLITTING (READ)? resourceName [FROM databaseName] | 查询所有读库的状态 | SHOW READWRITE_SPLITTING READ RESOURCES |
## 全局规则
@@ -60,19 +60,19 @@ RAL (Resource & Rule Administration Language) 为 Apache ShardingSphere 的管
| 语句 | 说明 | 示例 |
|:--------------------------------------------------------------------------- |:----------------------------------------------------------- |:----------------------------------------------- |
| SHOW INSTANCE MODE | 查询当前 proxy 的 mode 配置 | SHOW INSTANCE MODE |
-| COUNT SCHEMA RULES [FROM schema] | 查询 schema 中的规则数量 | COUNT SCHEMA RULES |
+| COUNT DATABASE RULES [FROM database] | 查询 database 中的规则数量 | COUNT DATABASE RULES |
| SET VARIABLE proxy_property_name = xx | proxy_property_name 为 proxy 的[属性配置](/cn/user-manual/shardingsphere-proxy/yaml-config/props/) ，需使用下划线命名 | SET VARIABLE sql_show = true |
| SET VARIABLE transaction_type = xx | 修改当前连接的事务类型, 支持 LOCAL，XA，BASE | SET VARIABLE transaction_type = XA |
| SET VARIABLE agent_plugins_enabled = [TRUE / FALSE] | 设置 agent 插件的启用状态，默认值 false | SET VARIABLE agent_plugins_enabled = TRUE |
| SHOW ALL VARIABLES | 查询 proxy 所有的属性配置 | SHOW ALL VARIABLES |
-| SHOW VARIABLE variable_name | 查询 proxy 属性，需使用下划线命名 | SHOW VARIABLE sql_show |
+| SHOW VARIABLE variable_name | 查询 proxy 属性，需使用下划线命名 | SHOW VARIABLE sql_show |
| PREVIEW SQL | 预览实际 SQL | PREVIEW SELECT * FROM t_order |
| PARSE SQL | 解析 SQL 并输出抽象语法树 PARSE SELECT * FROM t_order |
| REFRESH TABLE METADATA | 刷新所有表的元数据 | REFRESH TABLE METADATA |
-| REFRESH TABLE METADATA [tableName / tableName FROM resource resourceName] | 刷新指定表的元数据 | REFRESH TABLE METADATA t_order FROM resource ds_1 |
+| REFRESH TABLE METADATA [tableName / tableName FROM RESOURCE resourceName] | 刷新指定表的元数据 | REFRESH TABLE METADATA t_order FROM RESOURCE ds_1 |
| SHOW TABLE METADATA tableName [, tableName] ... | 查询表的元数据 | SHOW TABLE METADATA t_order |
| EXPORT DATABASE CONFIG [FROM database_name] [, file="file_path"] | 查询 / 导出 database 中的资源和规则配置 | EXPORT DATABASE CONFIG FROM readwrite_splitting_db |
-| SHOW RULES USED RESOURCE resourceName [from schema] | 查询 schema 中使用指定资源的规则 | SHOW RULES USED RESOURCE ds_0 FROM schemaName |
+| SHOW RULES USED RESOURCE resourceName [from database] | 查询 database 中使用指定资源的规则 | SHOW RULES USED RESOURCE ds_0 FROM databaseName |
## 注意事项
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/_index.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/_index.en.md
index b5319ba58bb..dea08de2abf 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/_index.en.md
@@ -39,10 +39,10 @@ RAL (Resource & Rule Administration Language) responsible for the added-on featu
| Statement | Function | Example |
|:------------------------------------------------------------- |:---------------------------------- |:------------------------------------------ |
-| [ENABLE / DISABLE] READWRITE_SPLITTING (READ)? resourceName [FROM schemaName] | Enable or disable read data source | ENABLE READWRITE_SPLITTING READ resource_0 |
+| [ENABLE / DISABLE] READWRITE_SPLITTING (READ)? resourceName [FROM databaseName] | Enable or disable read data source | ENABLE READWRITE_SPLITTING READ resource_0 |
| [ENABLE / DISABLE] INSTANCE [IP=xxx, PORT=xxx / instanceId] | Enable or disable proxy instance | DISABLE INSTANCE 127.0.0.1@3307 |
| SHOW INSTANCE LIST | Query proxy instance information | SHOW INSTANCE LIST |
-| SHOW READWRITE_SPLITTING (READ)? resourceName [FROM schemaName] | Query all read resources status | SHOW READWRITE_SPLITTING READ RESOURCES |
+| SHOW READWRITE_SPLITTING (READ)? resourceName [FROM databaseName] | Query all read resources status | SHOW READWRITE_SPLITTING READ RESOURCES |
## Global Rule
@@ -58,8 +58,8 @@ RAL (Resource & Rule Administration Language) responsible for the added-on featu
| Statement | Function | Example |
|:--------------------------------------------------------------------------- |:---------------------------------------------------------------------------------- |:----------------------------------------- |
-| SHOW INSTANCE MODE | Query the mode configuration of the proxy | SHOW INSTANCE MODE |
-| COUNT SCHEMA RULES [FROM schema] | Query the number of rules in a schema | count schema rules |
+| SHOW INSTANCE MODE | Query the mode configuration of the proxy | SHOW INSTANCE MODE |
+| COUNT DATABASE RULES [FROM database] | Query the number of rules in a database | COUNT DATABASE RULES |
| SET VARIABLE proxy_property_name = xx | proxy_property_name is one of [properties configuration](/en/user-manual/shardingsphere-proxy/yaml-config/props/) of proxy, name is split by underscore | SET VARIABLE sql_show = true |
| SET VARIABLE transaction_type = xx | Modify transaction_type of the current connection, supports LOCAL, XA, BASE | SET VARIABLE transaction_type = XA |
| SET VARIABLE agent_plugins_enabled = [TRUE / FALSE] | Set whether the agent plugins are enabled, the default value is false | SET VARIABLE agent_plugins_enabled = TRUE |
@@ -68,10 +68,10 @@ RAL (Resource & Rule Administration Language) responsible for the added-on featu
| PREVIEW SQL | Preview the actual SQLs | PREVIEW SELECT * FROM t_order |
| PARSE SQL | Parse SQL and output abstract syntax tree | PARSE SELECT * FROM t_order |
| REFRESH TABLE METADATA | Refresh the metadata of all tables | REFRESH TABLE METADATA |
-| REFRESH TABLE METADATA [tableName / tableName FROM resource resourceName] | Refresh the metadata of a table | REFRESH TABLE METADATA t_order FROM resource ds_1 |
+| REFRESH TABLE METADATA [tableName / tableName FROM RESOURCE resourceName] | Refresh the metadata of a table | REFRESH TABLE METADATA t_order FROM resource ds_1 |
| SHOW TABLE METADATA tableName [, tableName] ... | Query table metadata | SHOW TABLE METADATA t_order |
| EXPORT DATABASE CONFIG [FROM database_name] [, file="file_path"] | Query / export resources and rule configuration in database | EXPORT DATABASE CONFIG FROM readwrite_splitting_db |
-| SHOW RULES USED RESOURCE resourceName [from schema] | Query the rules for using the specified resource in schema | SHOW RULES USED RESOURCE ds_0 FROM schemaName |
+| SHOW RULES USED RESOURCE resourceName [from database] | Query the rules for using the specified resource in database | SHOW RULES USED RESOURCE ds_0 FROM databaseName |
## Notice
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/resource-query.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/resource-query.cn.md
index 460a560631b..8e30caa0031 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/resource-query.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/resource-query.cn.md
@@ -6,7 +6,7 @@ weight = 1
## 语法说明
```sql
-SHOW SCHEMA RESOURCES [FROM schemaName]
+SHOW DATABASE RESOURCES [FROM databaseName]
```
## 返回值说明
@@ -23,7 +23,7 @@ SHOW SCHEMA RESOURCES [FROM schemaName]
## 示例
```sql
-mysql> show schema resources;
+mysql> show database resources;
+------+-------+-----------+------+------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
| name | type | host | port | db | attribute |
+------+-------+-----------+------+------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/resource-query.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/resource-query.en.md
index e9bbfe7d9de..758276f1453 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/resource-query.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/resource-query.en.md
@@ -6,7 +6,7 @@ weight = 1
## Syntax
```sql
-SHOW SCHEMA RESOURCES [FROM schemaName]
+SHOW DATABASE RESOURCES [FROM databaseName]
```
## Return Value Description
@@ -23,7 +23,7 @@ SHOW SCHEMA RESOURCES [FROM schemaName]
## Example
```sql
-mysql> show schema resources;
+mysql> show database resources;
+------+-------+-----------+------+------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
| name | type | host | port | db | attribute |
+------+-------+-----------+------+------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.cn.md
index 5da3ed1daca..bce2a811828 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.cn.md
@@ -6,11 +6,11 @@ weight = 4
## 语法说明
```sql
-SHOW DB_DISCOVERY RULES [FROM schemaName]
+SHOW DB_DISCOVERY RULES [FROM databaseName]
-SHOW DB_DISCOVERY TYPES [FROM schemaName]
+SHOW DB_DISCOVERY TYPES [FROM databaseName]
-SHOW DB_DISCOVERY HEARTBEATS [FROM schemaName]
+SHOW DB_DISCOVERY HEARTBEATS [FROM databaseName]
```
## 返回值说明
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.en.md
index 1141a049653..d45343cad12 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.en.md
@@ -6,11 +6,11 @@ weight = 4
## Syntax
```sql
-SHOW DB_DISCOVERY RULES [FROM schemaName]
+SHOW DB_DISCOVERY RULES [FROM databaseName]
-SHOW DB_DISCOVERY TYPES [FROM schemaName]
+SHOW DB_DISCOVERY TYPES [FROM databaseName]
-SHOW DB_DISCOVERY HEARTBEATS [FROM schemaName]
+SHOW DB_DISCOVERY HEARTBEATS [FROM databaseName]
```
## Return Value Description
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
index 2257766d830..3e9ac1a386b 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
@@ -6,9 +6,9 @@ weight = 5
## 语法说明
```sql
-SHOW ENCRYPT RULES [FROM schemaName]
+SHOW ENCRYPT RULES [FROM databaseName]
-SHOW ENCRYPT TABLE RULE tableName [from schemaName]
+SHOW ENCRYPT TABLE RULE tableName [from databaseName]
```
- 支持查询所有的数据加密规则和指定逻辑表名查询。
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
index 4d03eff4171..f041c23a5f7 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
@@ -6,9 +6,9 @@ weight = 5
## Syntax
```sql
-SHOW ENCRYPT RULES [FROM schemaName]
+SHOW ENCRYPT RULES [FROM databaseName]
-SHOW ENCRYPT TABLE RULE tableName [from schemaName]
+SHOW ENCRYPT TABLE RULE tableName [from databaseName]
```
- Support to query all data encryption rules and specify logical table name query
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting.cn.md
index 93250a969ed..59b4a54e7c4 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting.cn.md
@@ -6,7 +6,7 @@ weight = 3
## 语法说明
```sql
-SHOW READWRITE_SPLITTING RULES [FROM schemaName]
+SHOW READWRITE_SPLITTING RULES [FROM databaseName]
```
## 返回值说明
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting.en.md
index 19233f45c14..171fb521b87 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting.en.md
@@ -6,7 +6,7 @@ weight = 3
## Syntax
```sql
-SHOW READWRITE_SPLITTING RULES [FROM schemaName]
+SHOW READWRITE_SPLITTING RULES [FROM databaseName]
```
## Return Value Description
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/shadow.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/shadow.cn.md
index 947c91fbb14..0c519b0a11a 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/shadow.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/shadow.cn.md
@@ -6,11 +6,11 @@ weight = 6
## 语法说明
```sql
-SHOW SHADOW shadowRule | RULES [FROM schemaName]
+SHOW SHADOW shadowRule | RULES [FROM databaseName]
-SHOW SHADOW TABLE RULES [FROM schemaName]
+SHOW SHADOW TABLE RULES [FROM databaseName]
-SHOW SHADOW ALGORITHMS [FROM schemaName]
+SHOW SHADOW ALGORITHMS [FROM databaseName]
shadowRule:
RULE ruleName
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/shadow.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/shadow.en.md
index b6b3b94a275..90a63c4bc52 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/shadow.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/shadow.en.md
@@ -6,11 +6,11 @@ weight = 6
## Syntax
```sql
-SHOW SHADOW shadowRule | RULES [FROM schemaName]
+SHOW SHADOW shadowRule | RULES [FROM databaseName]
-SHOW SHADOW TABLE RULES [FROM schemaName]
+SHOW SHADOW TABLE RULES [FROM databaseName]
-SHOW SHADOW ALGORITHMS [FROM schemaName]
+SHOW SHADOW ALGORITHMS [FROM databaseName]
shadowRule:
RULE ruleName
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/sharding.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/sharding.cn.md
index 89bc2fdb3f8..b408f1ff3d1 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/sharding.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/sharding.cn.md
@@ -8,17 +8,17 @@ weight = 1
### Sharding Table Rule
```sql
-SHOW SHARDING TABLE tableRule | RULES [FROM schemaName]
+SHOW SHARDING TABLE tableRule | RULES [FROM databaseName]
-SHOW SHARDING ALGORITHMS [FROM schemaName]
+SHOW SHARDING ALGORITHMS [FROM databaseName]
-SHOW UNUSED SHARDING ALGORITHMS [FROM schemaName]
+SHOW UNUSED SHARDING ALGORITHMS [FROM databaseName]
-SHOW SHARDING KEY GENERATORS [FROM schemaName]
+SHOW SHARDING KEY GENERATORS [FROM databaseName]
-SHOW UNUSED SHARDING KEY GENERATORS [FROM schemaName]
+SHOW UNUSED SHARDING KEY GENERATORS [FROM databaseName]
-SHOW SHARDING TABLE RULES USED KEY GENERATOR keyGeneratorName [FROM schemaName]
+SHOW SHARDING TABLE RULES USED KEY GENERATOR keyGeneratorName [FROM databaseName]
SHOW DEFAULT SHARDING STRATEGY
@@ -33,18 +33,18 @@ tableRule:
### Sharding Binding Table Rule
```sql
-SHOW SHARDING BINDING TABLE RULES [FROM schemaName]
+SHOW SHARDING BINDING TABLE RULES [FROM databaseName]
```
### Sharding Broadcast Table Rule
```sql
-SHOW SHARDING BROADCAST TABLE RULES [FROM schemaName]
+SHOW SHARDING BROADCAST TABLE RULES [FROM databaseName]
```
### Sharding Scaling Rule
```sql
-SHOW SHARDING SCALING RULES [FROM schemaName]
+SHOW SHARDING SCALING RULES [FROM databaseName]
```
## 返回值说明
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/sharding.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/sharding.en.md
index 5c7bfef54c8..ad041045c0a 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/sharding.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/sharding.en.md
@@ -8,17 +8,17 @@ weight = 1
### Sharding Table Rule
```sql
-SHOW SHARDING TABLE tableRule | RULES [FROM schemaName]
+SHOW SHARDING TABLE tableRule | RULES [FROM databaseName]
-SHOW SHARDING ALGORITHMS [FROM schemaName]
+SHOW SHARDING ALGORITHMS [FROM databaseName]
-SHOW UNUSED SHARDING ALGORITHMS [FROM schemaName]
+SHOW UNUSED SHARDING ALGORITHMS [FROM databaseName]
-SHOW SHARDING KEY GENERATORS [FROM schemaName]
+SHOW SHARDING KEY GENERATORS [FROM databaseName]
-SHOW UNUSED SHARDING KEY GENERATORS [FROM schemaName]
+SHOW UNUSED SHARDING KEY GENERATORS [FROM databaseName]
-SHOW SHARDING TABLE RULES USED KEY GENERATOR keyGeneratorName [FROM schemaName]
+SHOW SHARDING TABLE RULES USED KEY GENERATOR keyGeneratorName [FROM databaseName]
SHOW DEFAULT SHARDING STRATEGY
@@ -33,18 +33,18 @@ tableRule:
### Sharding Binding Table Rule
```sql
-SHOW SHARDING BINDING TABLE RULES [FROM schemaName]
+SHOW SHARDING BINDING TABLE RULES [FROM databaseName]
```
### Sharding Broadcast Table Rule
```sql
-SHOW SHARDING BROADCAST TABLE RULES [FROM schemaName]
+SHOW SHARDING BROADCAST TABLE RULES [FROM databaseName]
```
### Sharding Scaling Rule
```sql
-SHOW SHARDING SCALING RULES [FROM schemaName]
+SHOW SHARDING SCALING RULES [FROM databaseName]
```
## Return Value Description
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/single-table.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/single-table.cn.md
index 436667a2ebf..3650b59727e 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/single-table.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/single-table.cn.md
@@ -6,7 +6,7 @@ weight = 2
## 语法说明
```sql
-SHOW SINGLE TABLE (tableRule | RULES) [FROM schemaName]
+SHOW SINGLE TABLE (tableRule | RULES) [FROM databaseName]
SHOW SINGLE TABLES
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/single-table.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/single-table.en.md
index 088ad5908a5..852dfbb88d5 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/single-table.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/single-table.en.md
@@ -6,7 +6,7 @@ weight = 2
## Syntax
```sql
-SHOW SINGLE TABLE (tableRule | RULES) [FROM schemaName]
+SHOW SINGLE TABLE (tableRule | RULES) [FROM databaseName]
SHOW SINGLE TABLES
diff --git a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/BaseRule.g4 b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/BaseRule.g4
index 93449bc2c9b..a79f20e79e0 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/BaseRule.g4
+++ b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/BaseRule.g4
@@ -35,11 +35,11 @@ tableName
: IDENTIFIER
;
-schemaName
+databaseName
: IDENTIFIER
;
-databaseName
+schemaName
: IDENTIFIER
;
diff --git a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RALStatement.g4 b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RALStatement.g4
index 71530509e92..e259e5f2e5c 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RALStatement.g4
+++ b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RALStatement.g4
@@ -56,7 +56,7 @@ refreshTableMetadata
;
showTableMetadata
- : SHOW TABLE METADATA tableName (COMMA tableName*)? (FROM schemaName)?
+ : SHOW TABLE METADATA tableName (COMMA tableName*)? (FROM databaseName)?
;
showAuthorityRule
@@ -108,7 +108,7 @@ unlabelInstance
;
countInstanceRules
- : COUNT INSTANCE RULES (FROM schemaName)?
+ : COUNT INSTANCE RULES (FROM databaseName)?
;
trafficRuleDefinition
diff --git a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RQLStatement.g4 b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RQLStatement.g4
index 176587b3e37..e2cd24cba1b 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RQLStatement.g4
+++ b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RQLStatement.g4
@@ -20,27 +20,27 @@ grammar RQLStatement;
import BaseRule;
showResources
- : SHOW SCHEMA RESOURCES (FROM schemaName)?
+ : SHOW DATABASE RESOURCES (FROM databaseName)?
;
showUnusedResources
- : SHOW UNUSED SCHEMA? RESOURCES (FROM schemaName)?
+ : SHOW UNUSED DATABASE? RESOURCES (FROM databaseName)?
;
showSingleTableRules
- : SHOW SINGLE TABLE RULES (FROM schemaName)?
+ : SHOW SINGLE TABLE RULES (FROM databaseName)?
;
showSingleTable
- : SHOW SINGLE (table | TABLES) (FROM schemaName)?
+ : SHOW SINGLE (table | TABLES) (FROM databaseName)?
;
-countSchemaRules
- : COUNT SCHEMA RULES (FROM schemaName)?
+countDatabaseRules
+ : COUNT DATABASE RULES (FROM databaseName)?
;
showRulesUsedResource
- : SHOW RULES USED RESOURCE resourceName (FROM schemaName)?
+ : SHOW RULES USED RESOURCE resourceName (FROM databaseName)?
;
table
diff --git a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4 b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
index 011bf04d23d..f351d72afa0 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
+++ b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
@@ -37,7 +37,7 @@ execute
| unlabelInstance
| countInstanceRules
| alterInstance
- | countSchemaRules
+ | countDatabaseRules
| prepareDistSQL
| applyDistSQL
| discardDistSQL
diff --git a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/common/CommonDistSQLStatementVisitor.java b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/common/CommonDistSQLStatementVisitor.java
index d16537e721f..d443b733154 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/common/CommonDistSQLStatementVisitor.java
+++ b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/common/CommonDistSQLStatementVisitor.java
@@ -32,11 +32,12 @@ import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementPa
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.ApplyDistSQLContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.CacheOptionContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.ClearHintContext;
+import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.CountDatabaseRulesContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.CountInstanceRulesContext;
-import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.CountSchemaRulesContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.CreateDefaultSingleTableRuleContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.CreateTrafficRuleContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.DataSourceContext;
+import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.DatabaseNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.DisableInstanceContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.DiscardDistSQLContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.DropDefaultSingleTableRuleContext;
@@ -57,7 +58,6 @@ import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementPa
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.PropertyContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.ProviderDefinitionContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.RefreshTableMetadataContext;
-import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.SchemaNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.SetVariableContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.ShowAllVariablesContext;
import org.apache.shardingsphere.distsql.parser.autogen.CommonDistSQLStatementParser.ShowAuthorityRuleContext;
@@ -149,7 +149,7 @@ public final class CommonDistSQLStatementVisitor extends CommonDistSQLStatementB
@Override
public ASTNode visitShowTableMetadata(final ShowTableMetadataContext ctx) {
Collection<String> tableNames = ctx.tableName().stream().map(this::getIdentifierValue).collect(Collectors.toSet());
- return new ShowTableMetadataStatement(tableNames, null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowTableMetadataStatement(tableNames, null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -249,8 +249,8 @@ public final class CommonDistSQLStatementVisitor extends CommonDistSQLStatementB
}
@Override
- public ASTNode visitCountSchemaRules(final CountSchemaRulesContext ctx) {
- return new CountDatabaseRulesStatement(null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ public ASTNode visitCountDatabaseRules(final CountDatabaseRulesContext ctx) {
+ return new CountDatabaseRulesStatement(null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -288,16 +288,16 @@ public final class CommonDistSQLStatementVisitor extends CommonDistSQLStatementB
@Override
public ASTNode visitShowResources(final ShowResourcesContext ctx) {
- return new ShowResourcesStatement(null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowResourcesStatement(null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
public ASTNode visitShowUnusedResources(final ShowUnusedResourcesContext ctx) {
- return new ShowUnusedResourcesStatement(null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowUnusedResourcesStatement(null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
- public ASTNode visitSchemaName(final SchemaNameContext ctx) {
+ public ASTNode visitDatabaseName(final DatabaseNameContext ctx) {
return new DatabaseSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), new IdentifierValue(ctx.getText()));
}
@@ -308,12 +308,12 @@ public final class CommonDistSQLStatementVisitor extends CommonDistSQLStatementB
@Override
public ASTNode visitShowSingleTableRules(final ShowSingleTableRulesContext ctx) {
- return new ShowSingleTableRulesStatement(null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowSingleTableRulesStatement(null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
public ASTNode visitShowSingleTable(final ShowSingleTableContext ctx) {
- return new ShowSingleTableStatement(null == ctx.table() ? null : getIdentifierValue(ctx.table().tableName()), null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowSingleTableStatement(null == ctx.table() ? null : getIdentifierValue(ctx.table().tableName()), null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -337,14 +337,14 @@ public final class CommonDistSQLStatementVisitor extends CommonDistSQLStatementB
return new RefreshTableMetadataStatement();
}
String tableName = getIdentifierValue(ctx.refreshScope().tableName());
- String databaseName = null;
+ String resourceName = null;
String schemaName = null;
if (null != ctx.refreshScope().fromSegment()) {
FromSegmentContext fromSegment = ctx.refreshScope().fromSegment();
- databaseName = getIdentifierValue(fromSegment.resourceName());
+ resourceName = getIdentifierValue(fromSegment.resourceName());
schemaName = null == fromSegment.schemaName() ? null : getIdentifierValue(fromSegment.schemaName());
}
- return new RefreshTableMetadataStatement(tableName, databaseName, schemaName);
+ return new RefreshTableMetadataStatement(tableName, resourceName, schemaName);
}
@Override
@@ -473,7 +473,7 @@ public final class CommonDistSQLStatementVisitor extends CommonDistSQLStatementB
@Override
public ASTNode visitShowRulesUsedResource(final ShowRulesUsedResourceContext ctx) {
- return new ShowRulesUsedResourceStatement(getIdentifierValue(ctx.resourceName()), null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowRulesUsedResourceStatement(getIdentifierValue(ctx.resourceName()), null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/antlr4/imports/db-discovery/RQLStatement.g4 b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/antlr4/imports/db-discovery/RQLStatement.g4
index e54264726eb..986205a231f 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/antlr4/imports/db-discovery/RQLStatement.g4
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/antlr4/imports/db-discovery/RQLStatement.g4
@@ -20,17 +20,17 @@ grammar RQLStatement;
import BaseRule;
showDatabaseDiscoveryRules
- : SHOW DB_DISCOVERY RULES (FROM schemaName)?
+ : SHOW DB_DISCOVERY RULES (FROM databaseName)?
;
showDatabaseDiscoveryTypes
- : SHOW DB_DISCOVERY TYPES (FROM schemaName)?
+ : SHOW DB_DISCOVERY TYPES (FROM databaseName)?
;
showDatabaseDiscoveryHeartbeats
- : SHOW DB_DISCOVERY HEARTBEATS (FROM schemaName)?
+ : SHOW DB_DISCOVERY HEARTBEATS (FROM databaseName)?
;
-schemaName
+databaseName
: IDENTIFIER
;
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLSt [...]
index f85eba65437..73b9cb5a911 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
@@ -46,13 +46,13 @@ import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQL
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.DatabaseDiscoveryRuleContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.DatabaseDiscoveryRuleDefinitionContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.DatabaseDiscoveryTypeDefinitionContext;
+import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.DatabaseNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.DropDatabaseDiscoveryHeartbeatContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.DropDatabaseDiscoveryRuleContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.DropDatabaseDiscoveryTypeContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.PropertiesContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.PropertyContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.ResourcesContext;
-import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.SchemaNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.ShowDatabaseDiscoveryHeartbeatsContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.ShowDatabaseDiscoveryRulesContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.ShowDatabaseDiscoveryTypesContext;
@@ -116,7 +116,7 @@ public final class DatabaseDiscoveryDistSQLStatementVisitor extends DatabaseDisc
@Override
public ASTNode visitShowDatabaseDiscoveryRules(final ShowDatabaseDiscoveryRulesContext ctx) {
- return new ShowDatabaseDiscoveryRulesStatement(null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowDatabaseDiscoveryRulesStatement(null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -152,12 +152,12 @@ public final class DatabaseDiscoveryDistSQLStatementVisitor extends DatabaseDisc
@Override
public ASTNode visitShowDatabaseDiscoveryTypes(final ShowDatabaseDiscoveryTypesContext ctx) {
- return new ShowDatabaseDiscoveryTypesStatement(null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowDatabaseDiscoveryTypesStatement(null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
public ASTNode visitShowDatabaseDiscoveryHeartbeats(final ShowDatabaseDiscoveryHeartbeatsContext ctx) {
- return new ShowDatabaseDiscoveryHeartbeatsStatement(null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowDatabaseDiscoveryHeartbeatsStatement(null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
private String getIdentifierValue(final ParseTree context) {
@@ -168,7 +168,7 @@ public final class DatabaseDiscoveryDistSQLStatementVisitor extends DatabaseDisc
}
@Override
- public ASTNode visitSchemaName(final SchemaNameContext ctx) {
+ public ASTNode visitDatabaseName(final DatabaseNameContext ctx) {
return new DatabaseSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), new IdentifierValue(ctx.getText()));
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-parser/src/main/antlr4/imports/encrypt/RQLStatement.g4 b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-parser/src/main/antlr4/imports/encrypt/RQLStatement.g4
index 66fb4c746d4..c91658ce8ac 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-parser/src/main/antlr4/imports/encrypt/RQLStatement.g4
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-parser/src/main/antlr4/imports/encrypt/RQLStatement.g4
@@ -20,13 +20,13 @@ grammar RQLStatement;
import BaseRule;
showEncryptRules
- : SHOW ENCRYPT (TABLE tableRule | RULES) (FROM schemaName)?
+ : SHOW ENCRYPT (TABLE tableRule | RULES) (FROM databaseName)?
;
tableRule
: RULE tableName
;
-schemaName
+databaseName
: IDENTIFIER
;
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
index 9f85f05f8b5..8b5fa0c5333 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
@@ -23,10 +23,10 @@ import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementP
import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.AlgorithmPropertyContext;
import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.AlterEncryptRuleContext;
import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.CreateEncryptRuleContext;
+import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.DatabaseNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.DropEncryptRuleContext;
import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.EncryptColumnDefinitionContext;
import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.EncryptRuleDefinitionContext;
-import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.SchemaNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.ShowEncryptRulesContext;
import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.TableNameContext;
import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment;
@@ -68,7 +68,7 @@ public final class EncryptDistSQLStatementVisitor extends EncryptDistSQLStatemen
@Override
public ASTNode visitShowEncryptRules(final ShowEncryptRulesContext ctx) {
return new ShowEncryptRulesStatement(null == ctx.tableRule() ? null : getIdentifierValue(ctx.tableRule().tableName()),
- null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -120,7 +120,7 @@ public final class EncryptDistSQLStatementVisitor extends EncryptDistSQLStatemen
}
@Override
- public ASTNode visitSchemaName(final SchemaNameContext ctx) {
+ public ASTNode visitDatabaseName(final DatabaseNameContext ctx) {
return new DatabaseSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), new IdentifierValue(ctx.getText()));
}
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/BaseRule.g4 b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/BaseRule.g4
index 4fc7b8144ed..5bbe04b19da 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/BaseRule.g4
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/BaseRule.g4
@@ -19,7 +19,7 @@ grammar BaseRule;
import Symbol, Keyword, Literals;
-schemaName
+databaseName
: IDENTIFIER
;
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/RALStatement.g4 b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/RALStatement.g4
index 2ad2d2a9ac2..ee25f3cd37c 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/RALStatement.g4
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/RALStatement.g4
@@ -32,15 +32,15 @@ clearReadwriteSplittingHint
;
enableReadDataSource
- : ENABLE READWRITE_SPLITTING (READ)? resourceName (FROM schemaName)?
+ : ENABLE READWRITE_SPLITTING (READ)? resourceName (FROM databaseName)?
;
disableReadDataSource
- : DISABLE READWRITE_SPLITTING (READ)? resourceName (FROM schemaName)?
+ : DISABLE READWRITE_SPLITTING (READ)? resourceName (FROM databaseName)?
;
showReadwriteSplittingReadResources
- : SHOW READWRITE_SPLITTING READ RESOURCES (FROM schemaName)?
+ : SHOW READWRITE_SPLITTING READ RESOURCES (FROM databaseName)?
;
sourceValue
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/RQLStatement.g4 b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/RQLStatement.g4
index 1a4398a436a..a8cd5024e5b 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/RQLStatement.g4
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/antlr4/imports/readwrite-splitting/RQLStatement.g4
@@ -20,5 +20,5 @@ grammar RQLStatement;
import BaseRule;
showReadwriteSplittingRules
- : SHOW READWRITE_SPLITTING RULES (FROM schemaName)?
+ : SHOW READWRITE_SPLITTING RULES (FROM databaseName)?
;
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/java/org/apache/shardingsphere/readwrit [...]
index 565501ab7ed..a9e2c4772ed 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
@@ -24,27 +24,27 @@ import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQ
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.AlterReadwriteSplittingRuleContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ClearReadwriteSplittingHintContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.CreateReadwriteSplittingRuleContext;
+import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.DatabaseNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.DisableReadDataSourceContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.DropReadwriteSplittingRuleContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.EnableReadDataSourceContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ReadwriteSplittingRuleDefinitionContext;
-import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.SchemaNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.SetReadwriteSplittingHintSourceContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ShowReadwriteSplittingHintStatusContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ShowReadwriteSplittingReadResourcesContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ShowReadwriteSplittingRulesContext;
import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.StaticReadwriteSplittingRuleDefinitionContext;
import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment;
-import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowReadwriteSplittingReadResourcesStatement;
-import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.status.SetReadwriteSplittingStatusStatement;
import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment;
import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.AlterReadwriteSplittingRuleStatement;
import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CreateReadwriteSplittingRuleStatement;
import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement;
+import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowReadwriteSplittingReadResourcesStatement;
import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowReadwriteSplittingRulesStatement;
import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ClearReadwriteSplittingHintStatement;
import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.SetReadwriteSplittingHintStatement;
import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ShowReadwriteSplittingHintStatusStatement;
+import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.status.SetReadwriteSplittingStatusStatement;
import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
@@ -76,19 +76,19 @@ public final class ReadwriteSplittingDistSQLStatementVisitor extends ReadwriteSp
@Override
public ASTNode visitEnableReadDataSource(final EnableReadDataSourceContext ctx) {
- DatabaseSegment schemaSegment = Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null;
+ DatabaseSegment schemaSegment = Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null;
return new SetReadwriteSplittingStatusStatement(ctx.ENABLE().getText().toUpperCase(), getIdentifierValue(ctx.resourceName()), schemaSegment);
}
@Override
public ASTNode visitDisableReadDataSource(final DisableReadDataSourceContext ctx) {
- DatabaseSegment schemaSegment = Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null;
+ DatabaseSegment schemaSegment = Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null;
return new SetReadwriteSplittingStatusStatement(ctx.DISABLE().getText().toUpperCase(), getIdentifierValue(ctx.resourceName()), schemaSegment);
}
@Override
public ASTNode visitShowReadwriteSplittingRules(final ShowReadwriteSplittingRulesContext ctx) {
- return new ShowReadwriteSplittingRulesStatement(Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowReadwriteSplittingRulesStatement(Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
@Override
@@ -113,7 +113,7 @@ public final class ReadwriteSplittingDistSQLStatementVisitor extends ReadwriteSp
}
@Override
- public ASTNode visitSchemaName(final SchemaNameContext ctx) {
+ public ASTNode visitDatabaseName(final DatabaseNameContext ctx) {
return new DatabaseSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), new IdentifierValue(ctx.getText()));
}
@@ -124,7 +124,7 @@ public final class ReadwriteSplittingDistSQLStatementVisitor extends ReadwriteSp
@Override
public ASTNode visitShowReadwriteSplittingReadResources(final ShowReadwriteSplittingReadResourcesContext ctx) {
- return new ShowReadwriteSplittingReadResourcesStatement(Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowReadwriteSplittingReadResourcesStatement(Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-parser/src/main/antlr4/imports/shadow/RQLStatement.g4 b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-parser/src/main/antlr4/imports/shadow/RQLStatement.g4
index 6a41ade03e9..3851f2c7ad0 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-parser/src/main/antlr4/imports/shadow/RQLStatement.g4
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-parser/src/main/antlr4/imports/shadow/RQLStatement.g4
@@ -20,21 +20,21 @@ grammar RQLStatement;
import BaseRule;
showShadowRules
- : SHOW SHADOW (shadowRule | RULES) (FROM schemaName)?
+ : SHOW SHADOW (shadowRule | RULES) (FROM databaseName)?
;
showShadowTableRules
- : SHOW SHADOW TABLE RULES (FROM schemaName)?
+ : SHOW SHADOW TABLE RULES (FROM databaseName)?
;
showShadowAlgorithms
- : SHOW SHADOW ALGORITHMS (FROM schemaName)?
+ : SHOW SHADOW ALGORITHMS (FROM databaseName)?
;
shadowRule
: RULE ruleName
;
-schemaName
+databaseName
: IDENTIFIER
;
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
index b870520bb3a..e8a20fed148 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementPa
import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.DropDefaultShadowAlgorithmContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.DropShadowAlgorithmContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.DropShadowRuleContext;
-import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.SchemaNameContext;
+import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.DatabaseNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShadowAlgorithmDefinitionContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShadowRuleDefinitionContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShadowTableRuleContext;
@@ -86,7 +86,7 @@ public final class ShadowDistSQLStatementVisitor extends ShadowDistSQLStatementB
@Override
public ASTNode visitShowShadowAlgorithms(final ShowShadowAlgorithmsContext ctx) {
- return new ShowShadowAlgorithmsStatement(null != ctx.schemaName() ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowShadowAlgorithmsStatement(null != ctx.databaseName() ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
@Override
@@ -139,13 +139,13 @@ public final class ShadowDistSQLStatementVisitor extends ShadowDistSQLStatementB
@Override
public ASTNode visitShowShadowRules(final ShowShadowRulesContext ctx) {
String ruleName = null == ctx.shadowRule() ? null : getIdentifierValue(ctx.shadowRule().ruleName());
- DatabaseSegment databaseSegment = null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName());
- return new ShowShadowRulesStatement(ruleName, null == ctx.schemaName() ? null : databaseSegment);
+ DatabaseSegment databaseSegment = null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName());
+ return new ShowShadowRulesStatement(ruleName, null == ctx.databaseName() ? null : databaseSegment);
}
@Override
public ASTNode visitShowShadowTableRules(final ShowShadowTableRulesContext ctx) {
- return new ShowShadowTableRulesStatement(null != ctx.schemaName() ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowShadowTableRulesStatement(null != ctx.databaseName() ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
private String getIdentifierValue(final ParserRuleContext ctx) {
@@ -164,7 +164,7 @@ public final class ShadowDistSQLStatementVisitor extends ShadowDistSQLStatementB
}
@Override
- public ASTNode visitSchemaName(final SchemaNameContext ctx) {
+ public ASTNode visitDatabaseName(final DatabaseNameContext ctx) {
return new DatabaseSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), new IdentifierValue(ctx.getText()));
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/imports/sharding/RQLStatement.g4 b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/imports/sharding/RQLStatement.g4
index 5a78bc5ea89..ab673b3174e 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/imports/sharding/RQLStatement.g4
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/imports/sharding/RQLStatement.g4
@@ -20,53 +20,53 @@ grammar RQLStatement;
import BaseRule;
showShardingTableRules
- : SHOW SHARDING TABLE (tableRule | RULES) (FROM schemaName)?
+ : SHOW SHARDING TABLE (tableRule | RULES) (FROM databaseName)?
;
showShardingBindingTableRules
- : SHOW SHARDING BINDING TABLE RULES (FROM schemaName)?
+ : SHOW SHARDING BINDING TABLE RULES (FROM databaseName)?
;
showShardingBroadcastTableRules
- : SHOW SHARDING BROADCAST TABLE RULES (FROM schemaName)?
+ : SHOW SHARDING BROADCAST TABLE RULES (FROM databaseName)?
;
showShardingAlgorithms
- : SHOW SHARDING ALGORITHMS (FROM schemaName)?
+ : SHOW SHARDING ALGORITHMS (FROM databaseName)?
;
showShardingTableNodes
- : SHOW SHARDING TABLE NODES tableName? (FROM schemaName)?
+ : SHOW SHARDING TABLE NODES tableName? (FROM databaseName)?
;
showShardingKeyGenerators
- : SHOW SHARDING KEY GENERATORS (FROM schemaName)?
+ : SHOW SHARDING KEY GENERATORS (FROM databaseName)?
;
showShardingDefaultShardingStrategy
- : SHOW DEFAULT SHARDING STRATEGY (FROM schemaName)?
+ : SHOW DEFAULT SHARDING STRATEGY (FROM databaseName)?
;
showUnusedShardingAlgorithms
- : SHOW UNUSED SHARDING ALGORITHMS (FROM schemaName)?
+ : SHOW UNUSED SHARDING ALGORITHMS (FROM databaseName)?
;
showUnusedShardingKeyGenerators
- : SHOW UNUSED SHARDING KEY GENERATORS (FROM schemaName)?
+ : SHOW UNUSED SHARDING KEY GENERATORS (FROM databaseName)?
;
showShardingTableRulesUsedAlgorithm
- : SHOW SHARDING TABLE RULES USED ALGORITHM algorithmName (FROM schemaName)?
+ : SHOW SHARDING TABLE RULES USED ALGORITHM algorithmName (FROM databaseName)?
;
showShardingTableRulesUsedKeyGenerator
- : SHOW SHARDING TABLE RULES USED KEY GENERATOR keyGeneratorName (FROM schemaName)?
+ : SHOW SHARDING TABLE RULES USED KEY GENERATOR keyGeneratorName (FROM databaseName)?
;
tableRule
: RULE tableName
;
-schemaName
+databaseName
: IDENTIFIER
;
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
index c17c2c4e675..4f44598035e 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
@@ -38,6 +38,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatement
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.CreateShardingKeyGeneratorContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.CreateShardingTableRuleContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.DataNodesContext;
+import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.DatabaseNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.DropDefaultShardingStrategyContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.DropShardingAlgorithmContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.DropShardingBindingTableRulesContext;
@@ -48,7 +49,6 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatement
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.KeyGenerateStrategyContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.KeyGeneratorDefinitionContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.ResourcesContext;
-import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.SchemaNameContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.SetShardingHintDatabaseValueContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.ShardingAlgorithmDefinitionContext;
import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.ShardingAutoTableRuleContext;
@@ -171,7 +171,7 @@ public final class ShardingDistSQLStatementVisitor extends ShardingDistSQLStatem
@Override
public ASTNode visitShowShardingBroadcastTableRules(final ShowShardingBroadcastTableRulesContext ctx) {
- return new ShowShardingBroadcastTableRulesStatement(Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowShardingBroadcastTableRulesStatement(Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
@Override
@@ -283,12 +283,12 @@ public final class ShardingDistSQLStatementVisitor extends ShardingDistSQLStatem
@Override
public ASTNode visitShowShardingTableRules(final ShowShardingTableRulesContext ctx) {
return new ShowShardingTableRulesStatement(null == ctx.tableRule() ? null : getIdentifierValue(ctx.tableRule().tableName()),
- null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
public ASTNode visitShowShardingAlgorithms(final ShowShardingAlgorithmsContext ctx) {
- return new ShowShardingAlgorithmsStatement(Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowShardingAlgorithmsStatement(Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
@Override
@@ -316,7 +316,7 @@ public final class ShardingDistSQLStatementVisitor extends ShardingDistSQLStatem
@Override
public ASTNode visitShowShardingTableNodes(final ShowShardingTableNodesContext ctx) {
return new ShowShardingTableNodesStatement(null == ctx.tableName() ? null : getIdentifierValue(ctx.tableName()),
- null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -420,11 +420,11 @@ public final class ShardingDistSQLStatementVisitor extends ShardingDistSQLStatem
@Override
public ASTNode visitShowShardingBindingTableRules(final ShowShardingBindingTableRulesContext ctx) {
- return new ShowShardingBindingTableRulesStatement(null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowShardingBindingTableRulesStatement(null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
- public ASTNode visitSchemaName(final SchemaNameContext ctx) {
+ public ASTNode visitDatabaseName(final DatabaseNameContext ctx) {
return new DatabaseSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), new IdentifierValue(ctx.getText()));
}
@@ -444,7 +444,7 @@ public final class ShardingDistSQLStatementVisitor extends ShardingDistSQLStatem
@Override
public ASTNode visitShowShardingKeyGenerators(final ShowShardingKeyGeneratorsContext ctx) {
- return new ShowShardingKeyGeneratorsStatement(Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowShardingKeyGeneratorsStatement(Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
@Override
@@ -456,12 +456,12 @@ public final class ShardingDistSQLStatementVisitor extends ShardingDistSQLStatem
@Override
public ASTNode visitShowShardingDefaultShardingStrategy(final ShowShardingDefaultShardingStrategyContext ctx) {
- return new ShowDefaultShardingStrategyStatement(Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowDefaultShardingStrategyStatement(Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
@Override
public ASTNode visitShowUnusedShardingAlgorithms(final ShowUnusedShardingAlgorithmsContext ctx) {
- return new ShowUnusedShardingAlgorithmsStatement(Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowUnusedShardingAlgorithmsStatement(Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
private String buildShardingColumn(final ShardingColumnDefinitionContext ctx) {
@@ -472,16 +472,16 @@ public final class ShardingDistSQLStatementVisitor extends ShardingDistSQLStatem
@Override
public ASTNode visitShowUnusedShardingKeyGenerators(final ShowUnusedShardingKeyGeneratorsContext ctx) {
- return new ShowUnusedShardingKeyGeneratorsStatement(Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowUnusedShardingKeyGeneratorsStatement(Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
@Override
public ASTNode visitShowShardingTableRulesUsedAlgorithm(final ShowShardingTableRulesUsedAlgorithmContext ctx) {
- return new ShowShardingTableRulesUsedAlgorithmStatement(getIdentifierValue(ctx.algorithmName()), Objects.nonNull(ctx.schemaName()) ? (DatabaseSegment) visit(ctx.schemaName()) : null);
+ return new ShowShardingTableRulesUsedAlgorithmStatement(getIdentifierValue(ctx.algorithmName()), Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment) visit(ctx.databaseName()) : null);
}
@Override
public ASTNode visitShowShardingTableRulesUsedKeyGenerator(final ShowShardingTableRulesUsedKeyGeneratorContext ctx) {
- return new ShowShardingTableRulesUsedKeyGeneratorStatement(getIdentifierValue(ctx.keyGeneratorName()), null == ctx.schemaName() ? null : (DatabaseSegment) visit(ctx.schemaName()));
+ return new ShowShardingTableRulesUsedKeyGeneratorStatement(getIdentifierValue(ctx.keyGeneratorName()), null == ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
index 8f7b26a6150..7ff3c000b96 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
@@ -152,7 +152,7 @@ public abstract class BaseITCase {
addSourceResource0(connection);
}
}
- List<Map<String, Object>> resources = queryForListWithLog("SHOW SCHEMA RESOURCES from sharding_db");
+ List<Map<String, Object>> resources = queryForListWithLog("SHOW DATABASE RESOURCES FROM sharding_db");
assertThat(resources.size(), is(2));
}
@@ -174,7 +174,7 @@ public abstract class BaseITCase {
.replace("${ds3}", JDBC_URL_APPENDER.appendQueryProperties(getActualJdbcUrlTemplate("ds_3"), queryProps))
.replace("${ds4}", JDBC_URL_APPENDER.appendQueryProperties(getActualJdbcUrlTemplate("ds_4"), queryProps));
executeWithLog(addTargetResource);
- List<Map<String, Object>> resources = queryForListWithLog("SHOW SCHEMA RESOURCES from sharding_db");
+ List<Map<String, Object>> resources = queryForListWithLog("SHOW DATABASE RESOURCES from sharding_db");
assertThat(resources.size(), is(5));
assertBeforeApplyScalingMetadataCorrectly();
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/rql-integration-test-cases.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/rql-integration-test-cases.xml
index 2e1c3cfd9d2..0e5a34add40 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/rql-integration-test-cases.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/rql-integration-test-cases.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
<integration-test-cases>
- <test-case sql="SHOW SCHEMA RESOURCES" scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW DATABASE RESOURCES" scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
<assertion expected-data-file="show_resources.xml" />
</test-case>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/common/queryable/ShowTableMetadataStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/common/queryable/ShowTableMetadataStatementAssert.java
index 58c4b90c2d4..af2c7798dc6 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/common/queryable/ShowTableMetadataStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/common/queryable/ShowTableMetadataStatementAssert.java
@@ -45,7 +45,7 @@ public final class ShowTableMetadataStatementAssert {
assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
- DatabaseAssert.assertIs(assertContext, actual.getDatabase().get(), expected.getSchema());
+ DatabaseAssert.assertIs(assertContext, actual.getDatabase().get(), expected.getDatabase());
assertThat(assertContext.getText("Table assertion error:"), actual.getTableNames(), is(expected.getTableNames()));
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rql/impl/ShowRulesStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rql/impl/ShowRulesStatementAssert.java
index 4fb90078e7c..1397b055785 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rql/impl/ShowRulesStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rql/impl/ShowRulesStatementAssert.java
@@ -66,7 +66,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rql.impl.rule.ShowUnusedShardingAlgorithmsStatementAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rql.impl.rule.ShowUnusedShardingKeyGeneratorsStatementAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.CountSchemaRulesStatementTestCase;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.CountDatabaseRulesStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.ShowDataBaseDiscoveryRulesStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.ShowDefaultShardingStrategyStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.ShowEncryptRulesStatementTestCase;
@@ -137,7 +137,7 @@ public final class ShowRulesStatementAssert {
} else if (actual instanceof ShowUnusedShardingKeyGeneratorsStatement) {
ShowUnusedShardingKeyGeneratorsStatementAssert.assertIs(assertContext, (ShowUnusedShardingKeyGeneratorsStatement) actual, (ShowUnusedShardingKeyGeneratorsStatementTestCase) expected);
} else if (actual instanceof CountDatabaseRulesStatement) {
- CountDatabaseRulesStatementAssert.assertIs(assertContext, (CountDatabaseRulesStatement) actual, (CountSchemaRulesStatementTestCase) expected);
+ CountDatabaseRulesStatementAssert.assertIs(assertContext, (CountDatabaseRulesStatement) actual, (CountDatabaseRulesStatementTestCase) expected);
} else if (actual instanceof ShowRulesUsedResourceStatement) {
ShowRulesUsedResourceStatementAssert.assertIs(assertContext, (ShowRulesUsedResourceStatement) actual, (ShowRulesUsedResourceStatementTestCase) expected);
} else if (actual instanceof ShowShardingTableRulesUsedAlgorithmStatement) {
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rql/impl/rule/CountDatabaseRulesStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rql/impl/rule/CountDatabaseRulesStatementAssert.java
index cf72a721c20..969f64de6ce 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rql/impl/rule/CountDatabaseRulesStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rql/impl/rule/CountDatabaseRulesStatementAssert.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rql.show.CountDatabaseRulesStatement;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.database.DatabaseAssert;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.CountSchemaRulesStatementTestCase;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.CountDatabaseRulesStatementTestCase;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -40,7 +40,7 @@ public final class CountDatabaseRulesStatementAssert {
* @param actual actual count database rules statement
* @param expected expected count database rules statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final CountDatabaseRulesStatement actual, final CountSchemaRulesStatementTestCase expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext, final CountDatabaseRulesStatement actual, final CountDatabaseRulesStatementTestCase expected) {
if (null != expected.getDatabase()) {
assertTrue(assertContext.getText("Actual database should exist."), actual.getDatabase().isPresent());
DatabaseAssert.assertIs(assertContext, actual.getDatabase().get(), expected.getDatabase());
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
index 3e0e6fc8f09..c2597c44d3e 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
@@ -314,7 +314,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.drop.DropShardingKeyGeneratorStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.drop.DropShardingScalingRuleStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.drop.DropShardingTableRuleStatementTestCase;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.CountSchemaRulesStatementTestCase;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.CountDatabaseRulesStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.ShowDataBaseDiscoveryRulesStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.ShowDefaultShardingStrategyStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.ShowEncryptRulesStatementTestCase;
@@ -1265,8 +1265,8 @@ public final class SQLParserTestCases {
@XmlElement(name = "show-unused-sharding-algorithms")
private final List<ShowUnusedShardingAlgorithmsStatementTestCase> showUnusedShardingAlgorithmsTestCases = new LinkedList<>();
- @XmlElement(name = "count-schema-rules")
- private final List<CountSchemaRulesStatementTestCase> countSchemaRulesTestCases = new LinkedList<>();
+ @XmlElement(name = "count-database-rules")
+ private final List<CountDatabaseRulesStatementTestCase> countSchemaRulesTestCases = new LinkedList<>();
@XmlElement(name = "show-unused-sharding-key-generators")
private final List<ShowUnusedShardingKeyGeneratorsStatementTestCase> showUnusedShardingKeyGeneratorsTestCases = new LinkedList<>();
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowTableMetadataStatementTestCase.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowTableMetadataStatementTestCase.java
index e9fa600cb62..84a71090bc9 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowTableMetadataStatementTestCase.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowTableMetadataStatementTestCase.java
@@ -35,6 +35,6 @@ public final class ShowTableMetadataStatementTestCase extends SQLParserTestCase
@XmlElement(name = "table-name")
private Set<String> tableNames;
- @XmlElement(name = "schema")
- private ExpectedDatabase schema;
+ @XmlElement(name = "database")
+ private ExpectedDatabase database;
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rql/CountSchemaRulesStatementTestCase.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rql/CountDatabaseRulesStatementTestCase.java
similarity index 91%
rename from shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rql/CountSchemaRulesStatementTestCase.java
rename to shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rql/CountDatabaseRulesStatementTestCase.java
index 5acf7636c52..2264ab6da8f 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rql/CountSchemaRulesStatementTestCase.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rql/CountDatabaseRulesStatementTestCase.java
@@ -25,11 +25,11 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import javax.xml.bind.annotation.XmlElement;
/**
- * Count schema rules statement test case.
+ * Count database rules statement test case.
*/
@Getter
@Setter
-public final class CountSchemaRulesStatementTestCase extends SQLParserTestCase {
+public final class CountDatabaseRulesStatementTestCase extends SQLParserTestCase {
@XmlElement
private ExpectedDatabase database;
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/common.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/common.xml
index 2ec676df3e2..96f83c8cb3c 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/common.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/common.xml
@@ -34,7 +34,7 @@
<show-readwrite-splitting-read-resources sql-case-id="show-readwrite-splitting-read-resources" />
<show-table-metadata sql-case-id="show-table-metadata">
<table-name>t_order</table-name>
- <schema name="schema_name" start-index="33" stop-index="43" />
+ <database name="database_name" start-index="33" stop-index="45" />
</show-table-metadata>
<refresh-table-metadata sql-case-id="refresh-table-metadata" />
<refresh-table-metadata sql-case-id="refresh-table-metadata-with-table-name" table-name="t_order" />
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rql/show.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rql/show.xml
index 4edb53e496b..0bc8152646e 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rql/show.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rql/show.xml
@@ -26,7 +26,7 @@
</show-sharding-broadcast-table-rules>
<show-sharding-table-rules sql-case-id="show-sharding-table-rules">
- <database name="schemaName" start-index="31" stop-index="40"/>
+ <database name="databaseName" start-index="31" stop-index="42"/>
</show-sharding-table-rules>
<show-sharding-table-rules sql-case-id="show-sharding-table-rule">
@@ -35,11 +35,11 @@
<show-sharding-table-rules sql-case-id="show-sharding-table-rule-from">
<table name="t_order"/>
- <database name="schemaName" start-index="38" stop-index="47"/>
+ <database name="databaseName" start-index="38" stop-index="49"/>
</show-sharding-table-rules>
<show-sharding-algorithms sql-case-id="show-sharding-algorithms-from">
- <database name="schemaName" start-index="30" stop-index="39"/>
+ <database name="databaseName" start-index="30" stop-index="41"/>
</show-sharding-algorithms>
<show-readwrite-splitting-rules sql-case-id="show-readwrite-splitting-rules">
@@ -100,23 +100,23 @@
</show-default-sharding-strategy>
<show-sharding-scaling-rules sql-case-id="show-sharding-scaling-rules">
- <database name="schemaName" start-index="33" stop-index="42"/>
+ <database name="databaseName" start-index="33" stop-index="44"/>
</show-sharding-scaling-rules>
<show-unused-sharding-algorithms sql-case-id="show-unused-sharding-algorithms">
- <database name="schemaName" start-index="37" stop-index="46"/>
+ <database name="databaseName" start-index="37" stop-index="48"/>
</show-unused-sharding-algorithms>
<show-unused-sharding-key-generators sql-case-id="show-unused-sharding-key-generators">
- <database name="schemaName" start-index="41" stop-index="50"/>
+ <database name="databaseName" start-index="41" stop-index="52"/>
</show-unused-sharding-key-generators>
- <count-schema-rules sql-case-id="count-schema-rules">
- <database name="schemaName" start-index="24" stop-index="33"/>
- </count-schema-rules>
+ <count-database-rules sql-case-id="count-database-rules">
+ <database name="databaseName" start-index="26" stop-index="37"/>
+ </count-database-rules>
<show-rules-used-resource sql-case-id="show-rules-used-resource" resource-name="ds_0">
- <database name="schemaName" start-index="35" stop-index="44"/>
+ <database name="databaseName" start-index="35" stop-index="46"/>
</show-rules-used-resource>
<show-sharding-table-rules-used-key-generator sql-case-id="show-sharding-table-rules-used-key-generator" keyGenerator="snowflake">
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/common.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/common.xml
index 384768ab385..59e9f8ebc50 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/common.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/common.xml
@@ -31,12 +31,12 @@
<distsql-case id="show-sharding-hint-status" value="SHOW SHARDING HINT STATUS" />
<distsql-case id="show-instance" value="SHOW INSTANCE LIST" />
<distsql-case id="count-instance-rules" value="COUNT INSTANCE RULES" />
- <distsql-case id="show-readwrite-splitting-read-resources" value="show readwrite_splitting read resources" />
- <distsql-case id="show-table-metadata" value="SHOW TABLE METADATA t_order FROM schema_name" />
- <distsql-case id="refresh-table-metadata" value="refresh table metadata" />
- <distsql-case id="refresh-table-metadata-with-table-name" value="refresh table metadata t_order" />
- <distsql-case id="refresh-table-metadata-with-resource" value="refresh table metadata t_order from resource ds_0" />
- <distsql-case id="refresh-table-metadata-with-schema" value="REFRESH TABLE METADATA t_order FROM resource ds_0 SCHEMA public" />
+ <distsql-case id="show-readwrite-splitting-read-resources" value="SHOW READWRITE_SPLITTING READ RESOURCES" />
+ <distsql-case id="show-table-metadata" value="SHOW TABLE METADATA t_order FROM database_name" />
+ <distsql-case id="refresh-table-metadata" value="REFRESH TABLE METADATA" />
+ <distsql-case id="refresh-table-metadata-with-table-name" value="REFRESH TABLE METADATA t_order" />
+ <distsql-case id="refresh-table-metadata-with-resource" value="REFRESH TABLE METADATA t_order FROM RESOURCE ds_0" />
+ <distsql-case id="refresh-table-metadata-with-schema" value="REFRESH TABLE METADATA t_order FROM RESOURCE ds_0 SCHEMA public" />
<distsql-case id="show-authority-rule" value="SHOW AUTHORITY RULE" />
<distsql-case id="show-transaction-rule" value="SHOW TRANSACTION RULE" />
<distsql-case id="show-sql-parser-rule" value="SHOW SQL_PARSER RULE" />
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rql/show.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rql/show.xml
index cce011339f5..b60a3015529 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rql/show.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rql/show.xml
@@ -19,10 +19,10 @@
<sql-cases>
<distsql-case id="show-sharding-binding-table-rules" value="SHOW SHARDING BINDING TABLE RULES FROM sharding_db" />
<distsql-case id="show-sharding-broadcast-table-rules" value="SHOW SHARDING BROADCAST TABLE RULES FROM sharding_db" />
- <distsql-case id="show-sharding-table-rules" value="SHOW SHARDING TABLE RULES FROM schemaName" />
+ <distsql-case id="show-sharding-table-rules" value="SHOW SHARDING TABLE RULES FROM databaseName" />
<distsql-case id="show-sharding-table-rule" value="SHOW SHARDING TABLE RULE t_order" />
- <distsql-case id="show-sharding-table-rule-from" value="SHOW SHARDING TABLE RULE t_order FROM schemaName" />
- <distsql-case id="show-sharding-algorithms-from" value="SHOW SHARDING ALGORITHMS FROM schemaName" />
+ <distsql-case id="show-sharding-table-rule-from" value="SHOW SHARDING TABLE RULE t_order FROM databaseName" />
+ <distsql-case id="show-sharding-algorithms-from" value="SHOW SHARDING ALGORITHMS FROM databaseName" />
<distsql-case id="show-readwrite-splitting-rules" value="SHOW READWRITE_SPLITTING RULES FROM readwrite_splitting_db" />
<distsql-case id="show-db-discovery-rules" value="SHOW DB_DISCOVERY RULES FROM db_discovery_db" />
<distsql-case id="show-db-discovery-types" value="SHOW DB_DISCOVERY TYPES FROM db_discovery_db" />
@@ -37,11 +37,11 @@
<distsql-case id="show-sharding-table-nodes" value="SHOW SHARDING TABLE NODES t_order FROM sharding_db" />
<distsql-case id="show-sharding-key-generators" value="SHOW SHARDING KEY GENERATORS FROM sharding_db" />
<distsql-case id="show-default-sharding-strategy" value="SHOW DEFAULT SHARDING STRATEGY FROM sharding_db" />
- <distsql-case id="show-sharding-scaling-rules" value="SHOW SHARDING SCALING RULES FROM schemaName" />
- <distsql-case id="show-unused-sharding-algorithms" value="SHOW UNUSED SHARDING ALGORITHMS FROM schemaName" />
- <distsql-case id="show-unused-sharding-key-generators" value="SHOW UNUSED SHARDING KEY GENERATORS FROM schemaName" />
- <distsql-case id="count-schema-rules" value="COUNT SCHEMA RULES FROM schemaName" />
- <distsql-case id="show-rules-used-resource" value="SHOW RULES USED RESOURCE ds_0 FROM schemaName" />
+ <distsql-case id="show-sharding-scaling-rules" value="SHOW SHARDING SCALING RULES FROM databaseName" />
+ <distsql-case id="show-unused-sharding-algorithms" value="SHOW UNUSED SHARDING ALGORITHMS FROM databaseName" />
+ <distsql-case id="show-unused-sharding-key-generators" value="SHOW UNUSED SHARDING KEY GENERATORS FROM databaseName" />
+ <distsql-case id="count-database-rules" value="COUNT DATABASE RULES FROM databaseName" />
+ <distsql-case id="show-rules-used-resource" value="SHOW RULES USED RESOURCE ds_0 FROM databaseName" />
<distsql-case id="show-sharding-table-rules-used-key-generator" value="SHOW SHARDING TABLE RULES USED KEY GENERATOR snowflake from sharding_db" />
<distsql-case id="show-sharding-table-rules-used-algorithm" value="SHOW SHARDING TABLE RULES USED ALGORITHM t_order_inline FROM sharding_db" />
</sql-cases>