This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 9f0395c825d Rename fromSchema to fromDatabase (#31876)
9f0395c825d is described below
commit 9f0395c825d2576e2c595eaca727867fb8507c07
Author: Raigor <[email protected]>
AuthorDate: Thu Jun 27 00:06:44 2024 +0800
Rename fromSchema to fromDatabase (#31876)
* Rename fromSchema to fromDatabase
* Refactor database assert
---
.../statement/dal/ShowColumnsStatementContext.java | 2 +-
.../statement/dal/ShowIndexStatementContext.java | 2 +-
.../dal/ShowTableStatusStatementContext.java | 2 +-
.../statement/dal/ShowTablesStatementContext.java | 2 +-
.../dal/ShowColumnsStatementContextTest.java | 8 +--
.../src/main/antlr4/imports/doris/BaseRule.g4 | 14 ++---
.../src/main/antlr4/imports/doris/DALStatement.g4 | 22 ++++----
.../src/main/antlr4/imports/doris/DCLStatement.g4 | 2 +-
.../src/main/antlr4/imports/doris/DDLStatement.g4 | 8 +--
.../src/main/antlr4/imports/doris/RLStatement.g4 | 6 +--
.../visitor/statement/DorisStatementVisitor.java | 8 +--
.../statement/type/DorisDALStatementVisitor.java | 40 +++++++--------
.../statement/type/DorisDCLStatementVisitor.java | 14 ++---
.../statement/type/DorisDDLStatementVisitor.java | 4 +-
.../src/main/antlr4/imports/mysql/DALStatement.g4 | 16 +++---
.../visitor/statement/MySQLStatementVisitor.java | 4 +-
.../statement/type/MySQLDALStatementVisitor.java | 38 +++++++-------
...SchemaSegment.java => FromDatabaseSegment.java} | 6 +--
.../core/segment/generic/DatabaseSegment.java | 2 +-
.../statement/available/FromDatabaseAvailable.java | 2 +-
.../core/statement/dal/ShowColumnsStatement.java | 12 ++---
.../core/statement/dal/ShowEventsStatement.java | 12 ++---
.../core/statement/dal/ShowIndexStatement.java | 12 ++---
.../statement/dal/ShowOpenTablesStatement.java | 12 ++---
.../statement/dal/ShowTableStatusStatement.java | 12 ++---
.../core/statement/dal/ShowTablesStatement.java | 12 ++---
.../core/statement/dal/ShowTriggersStatement.java | 12 ++---
.../statement/core/statement/dal/UseStatement.java | 2 +-
.../hbase/result/query/HBaseListResultSet.java | 4 +-
.../handler/admin/executor/ShowTablesExecutor.java | 2 +-
.../admin/executor/UseDatabaseExecutor.java | 2 +-
.../admin/executor/ShowTablesExecutorTest.java | 4 +-
.../admin/executor/UseDatabaseExecutorTest.java | 4 +-
.../asserts/segment/distsql/DatabaseAssert.java | 2 +-
.../dal/impl/ShowColumnsStatementAssert.java | 4 +-
.../dal/impl/ShowEventsStatementAssert.java | 6 +--
.../dal/impl/ShowIndexStatementAssert.java | 12 ++---
.../dal/impl/ShowOpenTablesStatementAssert.java | 6 +--
.../dal/impl/ShowTableStatusStatementAssert.java | 6 +--
.../dal/impl/ShowTablesStatementAssert.java | 6 +--
.../dal/impl/ShowTriggersStatementAssert.java | 6 +--
.../dal/impl/mysql/UseStatementAssert.java | 2 +-
...edFromSchema.java => ExpectedFromDatabase.java} | 6 +--
.../dal/ShowColumnsStatementTestCase.java | 2 +-
.../statement/dal/ShowEventsStatementTestCase.java | 4 +-
.../statement/dal/ShowIndexStatementTestCase.java | 2 +-
.../dal/ShowOpenTablesStatementTestCase.java | 4 +-
.../dal/ShowTableStatusStatementTestCase.java | 4 +-
.../statement/dal/ShowTablesStatementTestCase.java | 4 +-
.../dal/ShowTriggersStatementTestCase.java | 4 +-
.../jaxb/statement/dal/UseStatementTestCase.java | 2 +-
.../it/parser/src/main/resources/case/dal/show.xml | 60 +++++++++++-----------
52 files changed, 223 insertions(+), 223 deletions(-)
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContext.java
index c8c389a842c..69da9c0591d 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContext.java
@@ -49,7 +49,7 @@ public final class ShowColumnsStatementContext extends
CommonSQLStatementContext
@Override
public Collection<SQLSegment> getRemoveSegments() {
Collection<SQLSegment> result = new LinkedList<>();
- getSqlStatement().getFromSchema().ifPresent(result::add);
+ getSqlStatement().getFromDatabase().ifPresent(result::add);
return result;
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContext.java
index 67bc7505ed0..ae95958069a 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContext.java
@@ -49,7 +49,7 @@ public final class ShowIndexStatementContext extends
CommonSQLStatementContext i
@Override
public Collection<SQLSegment> getRemoveSegments() {
Collection<SQLSegment> result = new LinkedList<>();
- getSqlStatement().getFromSchema().ifPresent(result::add);
+ getSqlStatement().getFromDatabase().ifPresent(result::add);
return result;
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowTableStatusStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowTableStatusStatementContext.java
index 800b32fe7a2..dbe2b0fa0d7 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowTableStatusStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowTableStatusStatementContext.java
@@ -42,7 +42,7 @@ public final class ShowTableStatusStatementContext extends
CommonSQLStatementCon
@Override
public Collection<SQLSegment> getRemoveSegments() {
Collection<SQLSegment> result = new LinkedList<>();
- getSqlStatement().getFromSchema().ifPresent(result::add);
+ getSqlStatement().getFromDatabase().ifPresent(result::add);
return result;
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowTablesStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowTablesStatementContext.java
index e7ec374ae6b..4e42f4fc937 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowTablesStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowTablesStatementContext.java
@@ -44,7 +44,7 @@ public final class ShowTablesStatementContext extends
CommonSQLStatementContext
@Override
public Collection<SQLSegment> getRemoveSegments() {
Collection<SQLSegment> result = new LinkedList<>();
- getSqlStatement().getFromSchema().ifPresent(result::add);
+ getSqlStatement().getFromDatabase().ifPresent(result::add);
return result;
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContextTest.java
index 633776f09dc..b052f5d1b6c 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContextTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.binder.context.statement.dal;
import
org.apache.shardingsphere.infra.binder.context.statement.CommonSQLStatementContext;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.DatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
@@ -44,14 +44,14 @@ class ShowColumnsStatementContextTest {
String tableName = "tbl_1";
String databaseName = "sharding_db";
SimpleTableSegment table = new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue(tableName)));
- FromSchemaSegment fromSchema = new FromSchemaSegment(0, 0, new
DatabaseSegment(0, 0, new IdentifierValue(databaseName)));
+ FromDatabaseSegment fromDatabase = new FromDatabaseSegment(0, 0, new
DatabaseSegment(0, 0, new IdentifierValue(databaseName)));
when(showColumnsStatement.getTable()).thenReturn(table);
-
when(showColumnsStatement.getFromSchema()).thenReturn(Optional.of(fromSchema));
+
when(showColumnsStatement.getFromDatabase()).thenReturn(Optional.of(fromDatabase));
ShowColumnsStatementContext actual = new
ShowColumnsStatementContext(showColumnsStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(showColumnsStatement));
assertThat(actual.getTablesContext().getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList(tableName)));
- assertThat(actual.getRemoveSegments(),
is(Collections.singletonList(fromSchema)));
+ assertThat(actual.getRemoveSegments(),
is(Collections.singletonList(fromDatabase)));
}
}
diff --git a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/BaseRule.g4
b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/BaseRule.g4
index 50a6dca4053..306969a8683 100644
--- a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/BaseRule.g4
+++ b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/BaseRule.g4
@@ -649,24 +649,24 @@ transactionAccessMode
: READ (WRITE | ONLY)
;
-schemaName
+databaseName
: identifier
;
-schemaNames
- : schemaName (COMMA_ schemaName)*
+databaseNames
+ : databaseName (COMMA_ databaseName)*
;
charsetName
: textOrIdentifier | BINARY | DEFAULT
;
-schemaPairs
- : schemaPair (COMMA_ schemaPair)*
+databasePairs
+ : databasePair (COMMA_ databasePair)*
;
-schemaPair
- : LP_ schemaName COMMA_ schemaName RP_
+databasePair
+ : LP_ databaseName COMMA_ databaseName RP_
;
tableName
diff --git
a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DALStatement.g4
b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DALStatement.g4
index 1681211e098..a4dba5e2080 100644
--- a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DALStatement.g4
+++ b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DALStatement.g4
@@ -20,7 +20,7 @@ grammar DALStatement;
import DMLStatement;
use
- : USE schemaName
+ : USE databaseName
;
help
@@ -34,8 +34,8 @@ explain
| ANALYZE (FORMAT EQ_ TREE)? (select | delete | update | insert))
;
-fromSchema
- : (FROM | IN) schemaName
+fromDatabase
+ : (FROM | IN) databaseName
;
fromTable
@@ -99,11 +99,11 @@ showCollation
;
showColumns
- : SHOW EXTENDED? FULL? (COLUMNS | FIELDS) fromTable fromSchema? showFilter?
+ : SHOW EXTENDED? FULL? (COLUMNS | FIELDS) fromTable fromDatabase?
showFilter?
;
showCreateDatabase
- : SHOW CREATE (DATABASE | SCHEMA) ifNotExists? schemaName
+ : SHOW CREATE (DATABASE | SCHEMA) ifNotExists? databaseName
;
showCreateEvent
@@ -151,7 +151,7 @@ showErrors
;
showEvents
- : SHOW EVENTS fromSchema? showFilter?
+ : SHOW EVENTS fromDatabase? showFilter?
;
showFunctionCode
@@ -167,7 +167,7 @@ showGrants
;
showIndex
- : SHOW EXTENDED? (INDEX | INDEXES | KEYS) fromTable fromSchema?
showWhereClause?
+ : SHOW EXTENDED? (INDEX | INDEXES | KEYS) fromTable fromDatabase?
showWhereClause?
;
showMasterStatus
@@ -175,7 +175,7 @@ showMasterStatus
;
showOpenTables
- : SHOW OPEN TABLES fromSchema? showFilter?
+ : SHOW OPEN TABLES fromDatabase? showFilter?
;
showPlugins
@@ -231,15 +231,15 @@ showStatus
;
showTableStatus
- : SHOW TABLE STATUS fromSchema? showFilter?
+ : SHOW TABLE STATUS fromDatabase? showFilter?
;
showTables
- : SHOW EXTENDED? FULL? TABLES fromSchema? showFilter?
+ : SHOW EXTENDED? FULL? TABLES fromDatabase? showFilter?
;
showTriggers
- : SHOW TRIGGERS fromSchema? showFilter?
+ : SHOW TRIGGERS fromDatabase? showFilter?
;
showVariables
diff --git
a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DCLStatement.g4
b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DCLStatement.g4
index 090e19f6406..eb133d7c021 100644
--- a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DCLStatement.g4
+++ b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DCLStatement.g4
@@ -86,7 +86,7 @@ aclType
grantIdentifier
: ASTERISK_ # grantLevelGlobal
| ASTERISK_ DOT_ASTERISK_ # grantLevelGlobal
- | schemaName DOT_ASTERISK_ # grantLevelSchemaGlobal
+ | databaseName DOT_ASTERISK_ # grantLevelDatabaseGlobal
| tableName # grantLevelTable
;
diff --git
a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DDLStatement.g4
b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DDLStatement.g4
index ba5e741be62..4b7a27c04e3 100644
--- a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DDLStatement.g4
+++ b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/DDLStatement.g4
@@ -244,11 +244,11 @@ createIndex
;
createDatabase
- : CREATE (DATABASE | SCHEMA) ifNotExists? schemaName
createDatabaseSpecification_*
+ : CREATE (DATABASE | SCHEMA) ifNotExists? databaseName
createDatabaseSpecification_*
;
alterDatabase
- : ALTER (DATABASE | SCHEMA) schemaName? alterDatabaseSpecification_*
+ : ALTER (DATABASE | SCHEMA) databaseName? alterDatabaseSpecification_*
;
createDatabaseSpecification_
@@ -263,7 +263,7 @@ alterDatabaseSpecification_
;
dropDatabase
- : DROP (DATABASE | SCHEMA) ifExists? schemaName
+ : DROP (DATABASE | SCHEMA) ifExists? databaseName
;
alterInstance
@@ -453,7 +453,7 @@ createTrigger
;
dropTrigger
- : DROP TRIGGER ifExists? (schemaName DOT_)? triggerName
+ : DROP TRIGGER ifExists? (databaseName DOT_)? triggerName
;
renameTable
diff --git
a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/RLStatement.g4
b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/RLStatement.g4
index 1564dfe223c..f035a0ced8b 100644
--- a/parser/sql/dialect/doris/src/main/antlr4/imports/doris/RLStatement.g4
+++ b/parser/sql/dialect/doris/src/main/antlr4/imports/doris/RLStatement.g4
@@ -134,13 +134,13 @@ filterDefs
;
filterDef
- : REPLICATE_DO_DB EQ_ LP_ schemaNames? RP_
- | REPLICATE_IGNORE_DB EQ_ LP_ schemaNames? RP_
+ : REPLICATE_DO_DB EQ_ LP_ databaseNames? RP_
+ | REPLICATE_IGNORE_DB EQ_ LP_ databaseNames? RP_
| REPLICATE_DO_TABLE EQ_ LP_ tableList? RP_
| REPLICATE_IGNORE_TABLE EQ_ LP_ tableList? RP_
| REPLICATE_WILD_DO_TABLE EQ_ LP_ wildTables? RP_
| REPLICATE_WILD_IGNORE_TABLE EQ_ LP_ wildTables? RP_
- | REPLICATE_REWRITE_DB EQ_ LP_ schemaPairs? RP_
+ | REPLICATE_REWRITE_DB EQ_ LP_ databasePairs? RP_
;
wildTables
diff --git
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/DorisStatementVisitor.java
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/DorisStatementVisitor.java
index 2652d7bf15c..7710fadd59a 100644
---
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/DorisStatementVisitor.java
+++
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/DorisStatementVisitor.java
@@ -51,6 +51,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.Convert
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.CteClauseContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.CurrentUserFunctionContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.DataTypeContext;
+import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.DatabaseNameContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.DeleteContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.DuplicateSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.EngineRefContext;
@@ -110,7 +111,6 @@ import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.Replace
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.ReplaceSelectClauseContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.ReplaceValuesClauseContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.RowConstructorListContext;
-import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.SchemaNameContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.SelectContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.SelectSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.SelectWithIntoContext;
@@ -334,7 +334,7 @@ public abstract class DorisStatementVisitor extends
DorisStatementBaseVisitor<AS
}
@Override
- public final ASTNode visitSchemaName(final SchemaNameContext ctx) {
+ public final ASTNode visitDatabaseName(final DatabaseNameContext ctx) {
return new DatabaseSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), (IdentifierValue) visit(ctx.identifier()));
}
@@ -1719,8 +1719,8 @@ public abstract class DorisStatementVisitor extends
DorisStatementBaseVisitor<AS
OwnerSegment owner = new
OwnerSegment(identifier.getStart().getStartIndex(),
identifier.getStop().getStopIndex(), new IdentifierValue(identifier.getText()));
result.setOwner(owner);
if (shorthand.identifier().size() > 1) {
- IdentifierContext schemaIdentifier = shorthand.identifier().get(0);
- owner.setOwner(new
OwnerSegment(schemaIdentifier.getStart().getStartIndex(),
schemaIdentifier.getStop().getStopIndex(), new
IdentifierValue(schemaIdentifier.getText())));
+ IdentifierContext databaseIdentifier =
shorthand.identifier().get(0);
+ owner.setOwner(new
OwnerSegment(databaseIdentifier.getStart().getStartIndex(),
databaseIdentifier.getStop().getStopIndex(), new
IdentifierValue(databaseIdentifier.getText())));
}
return result;
}
diff --git
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
index baa88ac21c7..84eb110699b 100644
---
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
+++
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
@@ -39,7 +39,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.DropRes
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.ExplainContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.ExplainableStatementContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.FlushContext;
-import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.FromSchemaContext;
+import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.FromDatabaseContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.FromTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.HelpContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.IndexNameContext;
@@ -119,7 +119,7 @@ import
org.apache.shardingsphere.sql.parser.doris.visitor.statement.DorisStateme
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.CacheTableIndexSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.CloneActionSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.CloneInstanceSegment;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromTableSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.LoadTableIndexSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.PartitionDefinitionSegment;
@@ -235,7 +235,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowCreateDatabase(final ShowCreateDatabaseContext
ctx) {
DorisShowCreateDatabaseStatement result = new
DorisShowCreateDatabaseStatement();
- result.setDatabaseName(((DatabaseSegment)
visit(ctx.schemaName())).getIdentifier().getValue());
+ result.setDatabaseName(((DatabaseSegment)
visit(ctx.databaseName())).getIdentifier().getValue());
return result;
}
@@ -551,7 +551,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitUse(final UseContext ctx) {
DorisUseStatement result = new DorisUseStatement();
- result.setSchema(((DatabaseSegment)
visit(ctx.schemaName())).getIdentifier().getValue());
+ result.setDatabase(((DatabaseSegment)
visit(ctx.databaseName())).getIdentifier().getValue());
return result;
}
@@ -630,8 +630,8 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowEvents(final ShowEventsContext ctx) {
DorisShowEventsStatement result = new DorisShowEventsStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -643,8 +643,8 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowTables(final ShowTablesContext ctx) {
DorisShowTablesStatement result = new DorisShowTablesStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -657,8 +657,8 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowTriggers(final ShowTriggersContext ctx) {
DorisShowTriggersStatement result = new DorisShowTriggersStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -675,8 +675,8 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowTableStatus(final ShowTableStatusContext ctx) {
DorisShowTableStatusStatement result = new
DorisShowTableStatusStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -691,8 +691,8 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
if (null != ctx.fromTable()) {
result.setTable(((FromTableSegment)
visit(ctx.fromTable())).getTable());
}
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -716,8 +716,8 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowIndex(final ShowIndexContext ctx) {
DorisShowIndexStatement result = new DorisShowIndexStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.fromTable()) {
result.setTable(((FromTableSegment)
visitFromTable(ctx.fromTable())).getTable());
@@ -866,8 +866,8 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowOpenTables(final ShowOpenTablesContext ctx) {
DorisShowOpenTablesStatement result = new
DorisShowOpenTablesStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -987,8 +987,8 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
}
@Override
- public ASTNode visitFromSchema(final FromSchemaContext ctx) {
- return new FromSchemaSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), (DatabaseSegment) visit(ctx.schemaName()));
+ public ASTNode visitFromDatabase(final FromDatabaseContext ctx) {
+ return new FromDatabaseSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
diff --git
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDCLStatementVisitor.java
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDCLStatementVisitor.java
index afdf292b7a1..69f01e1ccce 100644
---
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDCLStatementVisitor.java
+++
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDCLStatementVisitor.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.DropRol
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.DropUserContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.GrantIdentifierContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.GrantLevelGlobalContext;
-import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.GrantLevelSchemaGlobalContext;
+import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.GrantLevelDatabaseGlobalContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.GrantLevelTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.GrantProxyContext;
import
org.apache.shardingsphere.sql.parser.autogen.DorisStatementParser.GrantRoleOrPrivilegeOnToContext;
@@ -175,17 +175,17 @@ public final class DorisDCLStatementVisitor extends
DorisStatementVisitor implem
return new GrantLevelSegment(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), "*", "*");
}
- if (ctx instanceof GrantLevelSchemaGlobalContext) {
- String schemaName = new
IdentifierValue(((GrantLevelSchemaGlobalContext)
ctx).schemaName().getText()).getValue();
- return new GrantLevelSegment(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), schemaName, "*");
+ if (ctx instanceof GrantLevelDatabaseGlobalContext) {
+ String databaseName = new
IdentifierValue(((GrantLevelDatabaseGlobalContext)
ctx).databaseName().getText()).getValue();
+ return new GrantLevelSegment(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), databaseName, "*");
}
- String schemaName = null;
+ String databaseName = null;
String tableName;
if (null != ((GrantLevelTableContext) ctx).tableName().owner()) {
- schemaName = new IdentifierValue(((GrantLevelTableContext)
ctx).tableName().owner().getText()).getValue();
+ databaseName = new IdentifierValue(((GrantLevelTableContext)
ctx).tableName().owner().getText()).getValue();
}
tableName = new IdentifierValue(((GrantLevelTableContext)
ctx).tableName().name().getText()).getValue();
- return new GrantLevelSegment(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), schemaName, tableName);
+ return new GrantLevelSegment(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), databaseName, tableName);
}
@Override
diff --git
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDDLStatementVisitor.java
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDDLStatementVisitor.java
index 738a9acf999..cf2e5d274e8 100644
---
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDDLStatementVisitor.java
+++
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDDLStatementVisitor.java
@@ -230,7 +230,7 @@ public final class DorisDDLStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitCreateDatabase(final CreateDatabaseContext ctx) {
DorisCreateDatabaseStatement result = new
DorisCreateDatabaseStatement();
- result.setDatabaseName(new
IdentifierValue(ctx.schemaName().getText()).getValue());
+ result.setDatabaseName(new
IdentifierValue(ctx.databaseName().getText()).getValue());
result.setIfNotExists(null != ctx.ifNotExists());
return result;
}
@@ -243,7 +243,7 @@ public final class DorisDDLStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitDropDatabase(final DropDatabaseContext ctx) {
DorisDropDatabaseStatement result = new DorisDropDatabaseStatement();
- result.setDatabaseName(new
IdentifierValue(ctx.schemaName().getText()).getValue());
+ result.setDatabaseName(new
IdentifierValue(ctx.databaseName().getText()).getValue());
result.setIfExists(null != ctx.ifExists());
return result;
}
diff --git
a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
index efb857340e6..a4dba5e2080 100644
--- a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
+++ b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
@@ -34,7 +34,7 @@ explain
| ANALYZE (FORMAT EQ_ TREE)? (select | delete | update | insert))
;
-fromSchema
+fromDatabase
: (FROM | IN) databaseName
;
@@ -99,7 +99,7 @@ showCollation
;
showColumns
- : SHOW EXTENDED? FULL? (COLUMNS | FIELDS) fromTable fromSchema? showFilter?
+ : SHOW EXTENDED? FULL? (COLUMNS | FIELDS) fromTable fromDatabase?
showFilter?
;
showCreateDatabase
@@ -151,7 +151,7 @@ showErrors
;
showEvents
- : SHOW EVENTS fromSchema? showFilter?
+ : SHOW EVENTS fromDatabase? showFilter?
;
showFunctionCode
@@ -167,7 +167,7 @@ showGrants
;
showIndex
- : SHOW EXTENDED? (INDEX | INDEXES | KEYS) fromTable fromSchema?
showWhereClause?
+ : SHOW EXTENDED? (INDEX | INDEXES | KEYS) fromTable fromDatabase?
showWhereClause?
;
showMasterStatus
@@ -175,7 +175,7 @@ showMasterStatus
;
showOpenTables
- : SHOW OPEN TABLES fromSchema? showFilter?
+ : SHOW OPEN TABLES fromDatabase? showFilter?
;
showPlugins
@@ -231,15 +231,15 @@ showStatus
;
showTableStatus
- : SHOW TABLE STATUS fromSchema? showFilter?
+ : SHOW TABLE STATUS fromDatabase? showFilter?
;
showTables
- : SHOW EXTENDED? FULL? TABLES fromSchema? showFilter?
+ : SHOW EXTENDED? FULL? TABLES fromDatabase? showFilter?
;
showTriggers
- : SHOW TRIGGERS fromSchema? showFilter?
+ : SHOW TRIGGERS fromDatabase? showFilter?
;
showVariables
diff --git
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
index cc9e03e0f01..d91285ca824 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
@@ -1719,8 +1719,8 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
OwnerSegment owner = new
OwnerSegment(identifier.getStart().getStartIndex(),
identifier.getStop().getStopIndex(), new IdentifierValue(identifier.getText()));
result.setOwner(owner);
if (shorthand.identifier().size() > 1) {
- IdentifierContext schemaIdentifier = shorthand.identifier().get(0);
- owner.setOwner(new
OwnerSegment(schemaIdentifier.getStart().getStartIndex(),
schemaIdentifier.getStop().getStopIndex(), new
IdentifierValue(schemaIdentifier.getText())));
+ IdentifierContext databaseIdentifier =
shorthand.identifier().get(0);
+ owner.setOwner(new
OwnerSegment(databaseIdentifier.getStart().getStartIndex(),
databaseIdentifier.getStop().getStopIndex(), new
IdentifierValue(databaseIdentifier.getText())));
}
return result;
}
diff --git
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
index 5591d33d4af..71f24332f42 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
@@ -39,7 +39,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.DropRes
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ExplainContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ExplainableStatementContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.FlushContext;
-import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.FromSchemaContext;
+import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.FromDatabaseContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.FromTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.HelpContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.IndexNameContext;
@@ -119,7 +119,7 @@ import
org.apache.shardingsphere.sql.parser.mysql.visitor.statement.MySQLStateme
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.CacheTableIndexSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.CloneActionSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.CloneInstanceSegment;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromTableSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.LoadTableIndexSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.PartitionDefinitionSegment;
@@ -551,7 +551,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitUse(final UseContext ctx) {
MySQLUseStatement result = new MySQLUseStatement();
- result.setSchema(((DatabaseSegment)
visit(ctx.databaseName())).getIdentifier().getValue());
+ result.setDatabase(((DatabaseSegment)
visit(ctx.databaseName())).getIdentifier().getValue());
return result;
}
@@ -630,8 +630,8 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowEvents(final ShowEventsContext ctx) {
MySQLShowEventsStatement result = new MySQLShowEventsStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -643,8 +643,8 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowTables(final ShowTablesContext ctx) {
MySQLShowTablesStatement result = new MySQLShowTablesStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -657,8 +657,8 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowTriggers(final ShowTriggersContext ctx) {
MySQLShowTriggersStatement result = new MySQLShowTriggersStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -675,8 +675,8 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowTableStatus(final ShowTableStatusContext ctx) {
MySQLShowTableStatusStatement result = new
MySQLShowTableStatusStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -691,8 +691,8 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
if (null != ctx.fromTable()) {
result.setTable(((FromTableSegment)
visit(ctx.fromTable())).getTable());
}
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -716,8 +716,8 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowIndex(final ShowIndexContext ctx) {
MySQLShowIndexStatement result = new MySQLShowIndexStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.fromTable()) {
result.setTable(((FromTableSegment)
visitFromTable(ctx.fromTable())).getTable());
@@ -866,8 +866,8 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowOpenTables(final ShowOpenTablesContext ctx) {
MySQLShowOpenTablesStatement result = new
MySQLShowOpenTablesStatement();
- if (null != ctx.fromSchema()) {
- result.setFromSchema((FromSchemaSegment) visit(ctx.fromSchema()));
+ if (null != ctx.fromDatabase()) {
+ result.setFromDatabase((FromDatabaseSegment)
visit(ctx.fromDatabase()));
}
if (null != ctx.showFilter()) {
result.setFilter((ShowFilterSegment) visit(ctx.showFilter()));
@@ -987,8 +987,8 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
}
@Override
- public ASTNode visitFromSchema(final FromSchemaContext ctx) {
- return new FromSchemaSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), (DatabaseSegment) visit(ctx.databaseName()));
+ public ASTNode visitFromDatabase(final FromDatabaseContext ctx) {
+ return new FromDatabaseSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/FromSchemaSegment.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/FromDatabaseSegment.java
similarity index 90%
rename from
parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/FromSchemaSegment.java
rename to
parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/FromDatabaseSegment.java
index c61834fcfc0..f69227831df 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/FromSchemaSegment.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/FromDatabaseSegment.java
@@ -23,15 +23,15 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.SQLSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.DatabaseSegment;
/**
- * From schema segment.
+ * From database segment.
*/
@RequiredArgsConstructor
@Getter
-public final class FromSchemaSegment implements SQLSegment {
+public final class FromDatabaseSegment implements SQLSegment {
private final int startIndex;
private final int stopIndex;
- private final DatabaseSegment schema;
+ private final DatabaseSegment database;
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/generic/DatabaseSegment.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/generic/DatabaseSegment.java
index 49341d91a37..7bd9fe6f61d 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/generic/DatabaseSegment.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/generic/DatabaseSegment.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.SQLSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
/**
- * Schema segment.
+ * Database segment.
*/
@RequiredArgsConstructor
@Getter
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/available/FromDatabaseAvailable.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/available/FromDatabaseAvailable.java
index 6da7b377a20..99c4c08379a 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/available/FromDatabaseAvailable.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/available/FromDatabaseAvailable.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.Datab
import java.util.Optional;
/**
- * From schema available.
+ * From database available.
*/
public interface FromDatabaseAvailable {
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowColumnsStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowColumnsStatement.java
index c3aad7b758e..ad569440bd0 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowColumnsStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowColumnsStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sql.parser.statement.core.statement.dal;
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
@@ -35,17 +35,17 @@ public abstract class ShowColumnsStatement extends
AbstractSQLStatement implemen
@Getter
private SimpleTableSegment table;
- private FromSchemaSegment fromSchema;
+ private FromDatabaseSegment fromDatabase;
private ShowFilterSegment filter;
/**
- * Get from schema.
+ * Get from database.
*
- * @return from schema
+ * @return from database
*/
- public Optional<FromSchemaSegment> getFromSchema() {
- return Optional.ofNullable(fromSchema);
+ public Optional<FromDatabaseSegment> getFromDatabase() {
+ return Optional.ofNullable(fromDatabase);
}
/**
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowEventsStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowEventsStatement.java
index 89c28d2bcdc..d290c3b0c2b 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowEventsStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowEventsStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.statement.core.statement.dal;
import lombok.Setter;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
@@ -30,17 +30,17 @@ import java.util.Optional;
@Setter
public abstract class ShowEventsStatement extends AbstractSQLStatement
implements DALStatement {
- private FromSchemaSegment fromSchema;
+ private FromDatabaseSegment fromDatabase;
private ShowFilterSegment filter;
/**
- * Get from schema.
+ * Get from database.
*
- * @return from schema
+ * @return from database
*/
- public Optional<FromSchemaSegment> getFromSchema() {
- return Optional.ofNullable(fromSchema);
+ public Optional<FromDatabaseSegment> getFromDatabase() {
+ return Optional.ofNullable(fromDatabase);
}
/**
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowIndexStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowIndexStatement.java
index 0f4ef3af3bc..3f3e5016c30 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowIndexStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowIndexStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sql.parser.statement.core.statement.dal;
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
@@ -34,14 +34,14 @@ public abstract class ShowIndexStatement extends
AbstractSQLStatement implements
@Getter
private SimpleTableSegment table;
- private FromSchemaSegment fromSchema;
+ private FromDatabaseSegment fromDatabase;
/**
- * Get from schema.
+ * Get from database.
*
- * @return from schema
+ * @return from database
*/
- public Optional<FromSchemaSegment> getFromSchema() {
- return Optional.ofNullable(fromSchema);
+ public Optional<FromDatabaseSegment> getFromDatabase() {
+ return Optional.ofNullable(fromDatabase);
}
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowOpenTablesStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowOpenTablesStatement.java
index eebe97a8777..31680323bca 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowOpenTablesStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowOpenTablesStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.statement.core.statement.dal;
import lombok.Setter;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
@@ -30,17 +30,17 @@ import java.util.Optional;
@Setter
public abstract class ShowOpenTablesStatement extends AbstractSQLStatement
implements DALStatement {
- private FromSchemaSegment fromSchema;
+ private FromDatabaseSegment fromDatabase;
private ShowFilterSegment filter;
/**
- * Get from schema.
+ * Get from database.
*
- * @return from schema
+ * @return from database
*/
- public Optional<FromSchemaSegment> getFromSchema() {
- return Optional.ofNullable(fromSchema);
+ public Optional<FromDatabaseSegment> getFromDatabase() {
+ return Optional.ofNullable(fromDatabase);
}
/**
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTableStatusStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTableStatusStatement.java
index 91ddd46e24b..a8cd53b4bf1 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTableStatusStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTableStatusStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.statement.core.statement.dal;
import lombok.Setter;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
@@ -30,17 +30,17 @@ import java.util.Optional;
@Setter
public abstract class ShowTableStatusStatement extends AbstractSQLStatement
implements DALStatement {
- private FromSchemaSegment fromSchema;
+ private FromDatabaseSegment fromDatabase;
private ShowFilterSegment filter;
/**
- * Get from schema.
+ * Get from database.
*
- * @return from schema
+ * @return from database
*/
- public Optional<FromSchemaSegment> getFromSchema() {
- return Optional.ofNullable(fromSchema);
+ public Optional<FromDatabaseSegment> getFromDatabase() {
+ return Optional.ofNullable(fromDatabase);
}
/**
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTablesStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTablesStatement.java
index 2a2441e0a72..ca64d95661e 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTablesStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTablesStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sql.parser.statement.core.statement.dal;
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
@@ -31,7 +31,7 @@ import java.util.Optional;
@Setter
public abstract class ShowTablesStatement extends AbstractSQLStatement
implements DALStatement {
- private FromSchemaSegment fromSchema;
+ private FromDatabaseSegment fromDatabase;
private ShowFilterSegment filter;
@@ -39,12 +39,12 @@ public abstract class ShowTablesStatement extends
AbstractSQLStatement implement
private boolean containsFull;
/**
- * Get from schema segment.
+ * Get from database segment.
*
- * @return from schema segment
+ * @return from database segment
*/
- public Optional<FromSchemaSegment> getFromSchema() {
- return Optional.ofNullable(fromSchema);
+ public Optional<FromDatabaseSegment> getFromDatabase() {
+ return Optional.ofNullable(fromDatabase);
}
/**
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTriggersStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTriggersStatement.java
index e290faf6ebf..4e3b6b75786 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTriggersStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTriggersStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.statement.core.statement.dal;
import lombok.Setter;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
@@ -30,17 +30,17 @@ import java.util.Optional;
@Setter
public abstract class ShowTriggersStatement extends AbstractSQLStatement
implements DALStatement {
- private FromSchemaSegment fromSchema;
+ private FromDatabaseSegment fromDatabase;
private ShowFilterSegment filter;
/**
- * Get from schema.
+ * Get from database.
*
- * @return from schema
+ * @return from database
*/
- public Optional<FromSchemaSegment> getFromSchema() {
- return Optional.ofNullable(fromSchema);
+ public Optional<FromDatabaseSegment> getFromDatabase() {
+ return Optional.ofNullable(fromDatabase);
}
/**
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/UseStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/UseStatement.java
index 7221cb09532..c7855321719 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/UseStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/UseStatement.java
@@ -28,5 +28,5 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQL
@Setter
public abstract class UseStatement extends AbstractSQLStatement implements
DALStatement {
- private String schema;
+ private String database;
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseListResultSet.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseListResultSet.java
index ce406c65032..1e3e51c401e 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseListResultSet.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseListResultSet.java
@@ -45,8 +45,8 @@ public final class HBaseListResultSet implements
HBaseQueryResultSet {
public void init(final SQLStatementContext sqlStatementContext) throws
SQLException {
ShowTablesStatementContext context = (ShowTablesStatementContext)
sqlStatementContext;
Map<String, String> result;
- if (context.getSqlStatement().getFromSchema().isPresent()) {
- String clusterName =
context.getSqlStatement().getFromSchema().get().getSchema().getIdentifier().getValue();
+ if (context.getSqlStatement().getFromDatabase().isPresent()) {
+ String clusterName =
context.getSqlStatement().getFromDatabase().get().getDatabase().getIdentifier().getValue();
result = listTablesInHBaseByFromSchema(clusterName);
} else {
result = listTablesInHBase();
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
index 9e0ea379c40..0332f47fbae 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
@@ -64,7 +64,7 @@ public final class ShowTablesExecutor implements
DatabaseAdminQueryExecutor {
@Override
public void execute(final ConnectionSession connectionSession) {
- String databaseName = showTablesStatement.getFromSchema().map(schema
->
schema.getSchema().getIdentifier().getValue()).orElseGet(connectionSession::getDatabaseName);
+ String databaseName = showTablesStatement.getFromDatabase().map(schema
->
schema.getDatabase().getIdentifier().getValue()).orElseGet(connectionSession::getDatabaseName);
queryResultMetaData = createQueryResultMetaData(databaseName);
mergedResult = new
TransparentMergedResult(getQueryResult(databaseName));
}
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutor.java
index ec3c9479292..062324b7184 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutor.java
@@ -38,7 +38,7 @@ public final class UseDatabaseExecutor implements
DatabaseAdminExecutor {
@Override
public void execute(final ConnectionSession connectionSession) {
- String databaseName =
SQLUtils.getExactlyValue(useStatement.getSchema());
+ String databaseName =
SQLUtils.getExactlyValue(useStatement.getDatabase());
AuthorityRule authorityRule =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(AuthorityRule.class);
AuthorityChecker authorityChecker = new
AuthorityChecker(authorityRule,
connectionSession.getConnectionContext().getGrantee());
ShardingSpherePreconditions.checkState(ProxyContext.getInstance().databaseExists(databaseName)
&& authorityChecker.isAuthorized(databaseName),
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
index 3cb9004b81c..3bd89994df5 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
@@ -36,7 +36,7 @@ import
org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromSchemaSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowLikeSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.DatabaseSegment;
@@ -177,7 +177,7 @@ class ShowTablesExecutorTest {
@Test
void assertShowTableFromUncompletedDatabase() throws SQLException {
MySQLShowTablesStatement showTablesStatement = new
MySQLShowTablesStatement();
- showTablesStatement.setFromSchema(new FromSchemaSegment(0, 0, new
DatabaseSegment(0, 0, new IdentifierValue("uncompleted"))));
+ showTablesStatement.setFromDatabase(new FromDatabaseSegment(0, 0, new
DatabaseSegment(0, 0, new IdentifierValue("uncompleted"))));
ShowTablesExecutor executor = new
ShowTablesExecutor(showTablesStatement,
TypedSPILoader.getService(DatabaseType.class, "MySQL"));
ContextManager contextManager = mockContextManager(getDatabases());
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
index 80a0630609e..18e4a3fc1e2 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
@@ -62,7 +62,7 @@ class UseDatabaseExecutorTest {
@Test
void assertExecuteUseStatementBackendHandler() {
MySQLUseStatement useStatement = mock(MySQLUseStatement.class);
-
when(useStatement.getSchema()).thenReturn(String.format(DATABASE_PATTERN, 0));
+
when(useStatement.getDatabase()).thenReturn(String.format(DATABASE_PATTERN, 0));
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
when(ProxyContext.getInstance().databaseExists("db_0")).thenReturn(true);
@@ -75,7 +75,7 @@ class UseDatabaseExecutorTest {
@Test
void assertExecuteUseStatementBackendHandlerWhenSchemaNotExist() {
MySQLUseStatement useStatement = mock(MySQLUseStatement.class);
-
when(useStatement.getSchema()).thenReturn(String.format(DATABASE_PATTERN, 10));
+
when(useStatement.getDatabase()).thenReturn(String.format(DATABASE_PATTERN,
10));
UseDatabaseExecutor executor = new UseDatabaseExecutor(useStatement);
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
index 8f17589b21b..42d3d6506fa 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
@@ -38,7 +38,7 @@ public final class DatabaseAssert {
* @param expected expected database test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final DatabaseSegment actual, final ExpectedDatabase expected) {
- IdentifierValueAssert.assertIs(assertContext, actual.getIdentifier(),
expected, "schema");
+ IdentifierValueAssert.assertIs(assertContext, actual.getIdentifier(),
expected, "database");
SQLSegmentAssert.assertIs(assertContext, actual, expected);
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowColumnsStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowColumnsStatementAssert.java
index 26f0910467f..bd6f4c904c8 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowColumnsStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowColumnsStatementAssert.java
@@ -43,8 +43,8 @@ public final class ShowColumnsStatementAssert {
if (null != actual.getTable()) {
TableAssert.assertIs(assertContext, actual.getTable(),
expected.getTable());
}
- if (actual.getFromSchema().isPresent()) {
- DatabaseAssert.assertIs(assertContext,
actual.getFromSchema().get().getSchema(), expected.getSchema());
+ if (actual.getFromDatabase().isPresent()) {
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get().getDatabase(), expected.getDatabase());
}
if (actual.getFilter().isPresent()) {
ShowFilterAssert.assertIs(assertContext, actual.getFilter().get(),
expected.getFilter());
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowEventsStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowEventsStatementAssert.java
index 20492657c3e..85161da3353 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowEventsStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowEventsStatementAssert.java
@@ -40,9 +40,9 @@ public final class ShowEventsStatementAssert {
* @param expected expected show events statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowEventsStatement actual, final ShowEventsStatementTestCase expected) {
- if (actual.getFromSchema().isPresent()) {
- DatabaseAssert.assertIs(assertContext,
actual.getFromSchema().get().getSchema(), expected.getFromSchema().getSchema());
- SQLSegmentAssert.assertIs(assertContext,
actual.getFromSchema().get(), expected.getFromSchema());
+ if (actual.getFromDatabase().isPresent()) {
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get().getDatabase(),
expected.getFromDatabase().getDatabase());
+ SQLSegmentAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getFromDatabase());
}
if (actual.getFilter().isPresent()) {
ShowFilterAssert.assertIs(assertContext, actual.getFilter().get(),
expected.getFilter());
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowIndexStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowIndexStatementAssert.java
index c36948f016e..d8e233affff 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowIndexStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowIndexStatementAssert.java
@@ -44,7 +44,7 @@ public final class ShowIndexStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowIndexStatement actual, final ShowIndexStatementTestCase expected) {
assertTable(assertContext, actual, expected);
- assertSchema(assertContext, actual, expected);
+ assertDatabase(assertContext, actual, expected);
}
private static void assertTable(final SQLCaseAssertContext assertContext,
final ShowIndexStatement actual, final ShowIndexStatementTestCase expected) {
@@ -55,12 +55,12 @@ public final class ShowIndexStatementAssert {
}
}
- private static void assertSchema(final SQLCaseAssertContext assertContext,
final ShowIndexStatement actual, final ShowIndexStatementTestCase expected) {
- if (null == expected.getSchema()) {
- assertFalse(actual.getFromSchema().isPresent(),
assertContext.getText("Actual database segment should not exist."));
+ private static void assertDatabase(final SQLCaseAssertContext
assertContext, final ShowIndexStatement actual, final
ShowIndexStatementTestCase expected) {
+ if (null == expected.getDatabase()) {
+ assertFalse(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database segment should not exist."));
} else {
- assertTrue(actual.getFromSchema().isPresent(),
assertContext.getText("Actual database segment should exist."));
- SQLSegmentAssert.assertIs(assertContext,
actual.getFromSchema().get(), expected.getSchema());
+ assertTrue(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database segment should exist."));
+ SQLSegmentAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getDatabase());
}
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowOpenTablesStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowOpenTablesStatementAssert.java
index 803a6c530cb..d7b70cbaeff 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowOpenTablesStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowOpenTablesStatementAssert.java
@@ -40,9 +40,9 @@ public final class ShowOpenTablesStatementAssert {
* @param expected expected show open tables statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowOpenTablesStatement actual, final ShowOpenTablesStatementTestCase
expected) {
- if (actual.getFromSchema().isPresent()) {
- DatabaseAssert.assertIs(assertContext,
actual.getFromSchema().get().getSchema(), expected.getFromSchema().getSchema());
- SQLSegmentAssert.assertIs(assertContext,
actual.getFromSchema().get(), expected.getFromSchema());
+ if (actual.getFromDatabase().isPresent()) {
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get().getDatabase(),
expected.getFromDatabase().getDatabase());
+ SQLSegmentAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getFromDatabase());
}
if (actual.getFilter().isPresent()) {
ShowFilterAssert.assertIs(assertContext, actual.getFilter().get(),
expected.getFilter());
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTableStatusStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTableStatusStatementAssert.java
index f8663696117..eefb616b7ac 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTableStatusStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTableStatusStatementAssert.java
@@ -40,9 +40,9 @@ public final class ShowTableStatusStatementAssert {
* @param expected expected show table status statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowTableStatusStatement actual, final ShowTableStatusStatementTestCase
expected) {
- if (actual.getFromSchema().isPresent()) {
- DatabaseAssert.assertIs(assertContext,
actual.getFromSchema().get().getSchema(), expected.getFromSchema().getSchema());
- SQLSegmentAssert.assertIs(assertContext,
actual.getFromSchema().get(), expected.getFromSchema());
+ if (actual.getFromDatabase().isPresent()) {
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get().getDatabase(),
expected.getFromDatabase().getDatabase());
+ SQLSegmentAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getFromDatabase());
}
if (actual.getFilter().isPresent()) {
ShowFilterAssert.assertIs(assertContext, actual.getFilter().get(),
expected.getFilter());
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTablesStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTablesStatementAssert.java
index 8ceb5947eb5..56a394b176b 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTablesStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTablesStatementAssert.java
@@ -40,9 +40,9 @@ public final class ShowTablesStatementAssert {
* @param expected expected show tables statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowTablesStatement actual, final ShowTablesStatementTestCase expected) {
- if (actual.getFromSchema().isPresent()) {
- DatabaseAssert.assertIs(assertContext,
actual.getFromSchema().get().getSchema(), expected.getFromSchema().getSchema());
- SQLSegmentAssert.assertIs(assertContext,
actual.getFromSchema().get(), expected.getFromSchema());
+ if (actual.getFromDatabase().isPresent()) {
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get().getDatabase(),
expected.getFromDatabase().getDatabase());
+ SQLSegmentAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getFromDatabase());
}
if (actual.getFilter().isPresent()) {
ShowFilterAssert.assertIs(assertContext, actual.getFilter().get(),
expected.getFilter());
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTriggersStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTriggersStatementAssert.java
index 895ec8dd386..c87fd6c3a17 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTriggersStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ShowTriggersStatementAssert.java
@@ -40,9 +40,9 @@ public final class ShowTriggersStatementAssert {
* @param expected expected show tables statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowTriggersStatement actual, final ShowTriggersStatementTestCase
expected) {
- if (actual.getFromSchema().isPresent()) {
- DatabaseAssert.assertIs(assertContext,
actual.getFromSchema().get().getSchema(), expected.getFromSchema().getSchema());
- SQLSegmentAssert.assertIs(assertContext,
actual.getFromSchema().get(), expected.getFromSchema());
+ if (actual.getFromDatabase().isPresent()) {
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get().getDatabase(),
expected.getFromDatabase().getDatabase());
+ SQLSegmentAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getFromDatabase());
}
if (actual.getFilter().isPresent()) {
ShowFilterAssert.assertIs(assertContext, actual.getFilter().get(),
expected.getFilter());
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/mysql/UseStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/mysql/UseStatementAssert.java
index 2b39b2e31ea..b06356c69ac 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/mysql/UseStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/mysql/UseStatementAssert.java
@@ -40,7 +40,7 @@ public final class UseStatementAssert {
* @param expected expected use statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final UseStatement actual, final UseStatementTestCase expected) {
- assertThat(assertContext.getText("Schema name assertion error: "),
actual.getSchema(), is(expected.getSchema().getName()));
+ assertThat(assertContext.getText("Database name assertion error: "),
actual.getDatabase(), is(expected.getDatabase().getName()));
// TODO create a new assert class named `SchemaAssert`
// TODO extract and assert start index, stop index, start delimiter
and end delimiter
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/segment/impl/from/ExpectedFromSchema.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/segment/impl/from/ExpectedFromDatabase.java
similarity index 88%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/segment/impl/from/ExpectedFromSchema.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/segment/impl/from/ExpectedFromDatabase.java
index e052345ad47..afbda84fc12 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/segment/impl/from/ExpectedFromSchema.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/segment/impl/from/ExpectedFromDatabase.java
@@ -23,11 +23,11 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.database.ExpectedDatabase;
/**
- * Expected from schema segment.
+ * Expected from database segment.
*/
@Getter
@Setter
-public final class ExpectedFromSchema extends AbstractExpectedSQLSegment {
+public final class ExpectedFromDatabase extends AbstractExpectedSQLSegment {
- private ExpectedDatabase schema;
+ private ExpectedDatabase database;
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowColumnsStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowColumnsStatementTestCase.java
index 441f022800a..75851b6a671 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowColumnsStatementTestCase.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowColumnsStatementTestCase.java
@@ -37,7 +37,7 @@ public final class ShowColumnsStatementTestCase extends
SQLParserTestCase {
private ExpectedSimpleTable table;
@XmlElement
- private ExpectedDatabase schema;
+ private ExpectedDatabase database;
@XmlElement
private ExpectedShowFilter filter;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowEventsStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowEventsStatementTestCase.java
index 4cd0459e148..6546e15bd39 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowEventsStatementTestCase.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowEventsStatementTestCase.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromSchema;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromDatabase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.show.ExpectedShowFilter;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
@@ -33,7 +33,7 @@ import javax.xml.bind.annotation.XmlElement;
public final class ShowEventsStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "from")
- private ExpectedFromSchema fromSchema;
+ private ExpectedFromDatabase fromDatabase;
@XmlElement
private ExpectedShowFilter filter;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowIndexStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowIndexStatementTestCase.java
index 0a07770925b..9cbea979ca2 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowIndexStatementTestCase.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowIndexStatementTestCase.java
@@ -36,5 +36,5 @@ public final class ShowIndexStatementTestCase extends
SQLParserTestCase {
private ExpectedSimpleTable table;
@XmlElement
- private ExpectedDatabase schema;
+ private ExpectedDatabase database;
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowOpenTablesStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowOpenTablesStatementTestCase.java
index 96d11b00016..36ec10f5175 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowOpenTablesStatementTestCase.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowOpenTablesStatementTestCase.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromSchema;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromDatabase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.show.ExpectedShowFilter;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
@@ -33,7 +33,7 @@ import javax.xml.bind.annotation.XmlElement;
public final class ShowOpenTablesStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "from")
- private ExpectedFromSchema fromSchema;
+ private ExpectedFromDatabase fromDatabase;
@XmlElement
private ExpectedShowFilter filter;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTableStatusStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTableStatusStatementTestCase.java
index 7ff6e560407..4810f24d0a2 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTableStatusStatementTestCase.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTableStatusStatementTestCase.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromSchema;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromDatabase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.show.ExpectedShowFilter;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
@@ -33,7 +33,7 @@ import javax.xml.bind.annotation.XmlElement;
public final class ShowTableStatusStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "from")
- private ExpectedFromSchema fromSchema;
+ private ExpectedFromDatabase fromDatabase;
@XmlElement
private ExpectedShowFilter filter;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTablesStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTablesStatementTestCase.java
index 66c6f0f0f6e..33153cc44b0 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTablesStatementTestCase.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTablesStatementTestCase.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromSchema;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromDatabase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.show.ExpectedShowFilter;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
@@ -33,7 +33,7 @@ import javax.xml.bind.annotation.XmlElement;
public final class ShowTablesStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "from")
- private ExpectedFromSchema fromSchema;
+ private ExpectedFromDatabase fromDatabase;
@XmlElement
private ExpectedShowFilter filter;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTriggersStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTriggersStatementTestCase.java
index 5130644a9b9..21fcff90dc2 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTriggersStatementTestCase.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/ShowTriggersStatementTestCase.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromSchema;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.from.ExpectedFromDatabase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.show.ExpectedShowFilter;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
@@ -33,7 +33,7 @@ import javax.xml.bind.annotation.XmlElement;
public final class ShowTriggersStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "from")
- private ExpectedFromSchema fromSchema;
+ private ExpectedFromDatabase fromDatabase;
@XmlElement
private ExpectedShowFilter filter;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/UseStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/UseStatementTestCase.java
index 9dd8fa95add..e1b1768375d 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/UseStatementTestCase.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/dal/UseStatementTestCase.java
@@ -32,5 +32,5 @@ import javax.xml.bind.annotation.XmlElement;
public final class UseStatementTestCase extends SQLParserTestCase {
@XmlElement
- private ExpectedDatabase schema;
+ private ExpectedDatabase database;
}
diff --git a/test/it/parser/src/main/resources/case/dal/show.xml
b/test/it/parser/src/main/resources/case/dal/show.xml
index adce43da426..6d056443995 100644
--- a/test/it/parser/src/main/resources/case/dal/show.xml
+++ b/test/it/parser/src/main/resources/case/dal/show.xml
@@ -23,7 +23,7 @@
<show-index sql-case-id="show_index_with_indexes_with_table_and_database">
<table name="t_order" start-index="18" stop-index="24" />
- <schema name="sharding_db" start-index="26" stop-index="41" />
+ <database name="sharding_db" start-index="26" stop-index="41" />
</show-index>
<show-index sql-case-id="show_index_with_keys_with_database_and_table">
@@ -34,12 +34,12 @@
<show-index sql-case-id="show_index_with_table_back_quotes">
<table name="t_order" start-delimiter="`" end-delimiter="`"
start-index="18" stop-index="26" />
- <schema name="sharding_db" start-index="28" stop-index="43" />
+ <database name="sharding_db" start-index="28" stop-index="43" />
</show-index>
<show-index sql-case-id="show_index_with_database_back_quotes">
<table name="t_order" start-index="18" stop-index="24" />
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="26" stop-index="43" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="26" stop-index="43" />
</show-index>
<show-index sql-case-id="show_index_with_back_quotes">
@@ -60,7 +60,7 @@
<show-columns sql-case-id="show_columns_with_schema">
<table name="t_order" start-delimiter="`" end-delimiter="`"
start-index="18" stop-index="26" />
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="33" stop-index="45" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="33" stop-index="45" />
</show-columns>
<show-columns sql-case-id="show_columns_with_like_pattern">
@@ -102,7 +102,7 @@
<show-columns sql-case-id="show_columns_by_fields_with_schema">
<table name="t_order" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="25" />
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="32" stop-index="44" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="32" stop-index="44" />
</show-columns>
<show-columns sql-case-id="show_columns_by_fields_with_like_pattern">
@@ -306,19 +306,19 @@
<show-open-tables sql-case-id="show_open_tables_from_schema">
<from start-index="17" stop-index="34">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="22" stop-index="34" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="22" stop-index="34" />
</from>
</show-open-tables>
<show-open-tables sql-case-id="show_open_tables_in_schema">
<from start-index="17" stop-index="32">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="20" stop-index="32" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="20" stop-index="32" />
</from>
</show-open-tables>
<show-open-tables sql-case-id="show_open_tables_with_like_pattern">
<from start-index="17" stop-index="34">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="22" stop-index="34" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="22" stop-index="34" />
</from>
<filter start-index="36" stop-index="51">
<like pattern="t_order_%" start-delimiter="'" end-delimiter="'"
start-index="36" stop-index="51" />
@@ -327,7 +327,7 @@
<show-open-tables sql-case-id="show_open_tables_with_where_expr"
parameters="'t_order'">
<from start-index="17" stop-index="34">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="22" stop-index="34" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="22" stop-index="34" />
</from>
<filter start-index="36" stop-index="52" literal-start-index="36"
literal-stop-index="60">
<where start-index="36" stop-index="52" literal-start-index="36"
literal-stop-index="60">
@@ -349,7 +349,7 @@
<show-open-tables
sql-case-id="show_open_tables_with_where_expr_no_parameter">
<from start-index="17" stop-index="34">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="22" stop-index="34" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="22" stop-index="34" />
</from>
<filter start-index="36" stop-index="60">
<where start-index="36" stop-index="60">
@@ -372,13 +372,13 @@
<show-triggers sql-case-id="show_triggers_from_schema">
<from start-index="14" stop-index="31">
- <schema name="sharding_db" start-index="19" stop-index="31"
start-delimiter="`" end-delimiter="`" />
+ <database name="sharding_db" start-index="19" stop-index="31"
start-delimiter="`" end-delimiter="`" />
</from>
</show-triggers>
<show-triggers sql-case-id="show_triggers_in_schema">
<from start-index="14" stop-index="29">
- <schema name="sharding_db" start-index="17" stop-index="29"
start-delimiter="`" end-delimiter="`" />
+ <database name="sharding_db" start-index="17" stop-index="29"
start-delimiter="`" end-delimiter="`" />
</from>
</show-triggers>
@@ -390,7 +390,7 @@
<show-triggers sql-case-id="show_triggers_with_like_pattern">
<from start-index="14" stop-index="31">
- <schema name="sharding_db" start-index="19" stop-index="31"
start-delimiter="`" end-delimiter="`" />
+ <database name="sharding_db" start-index="19" stop-index="31"
start-delimiter="`" end-delimiter="`" />
</from>
<filter start-index="33" stop-index="43">
<like pattern="sys%" start-index="33" stop-index="43"
start-delimiter="'" end-delimiter="'" />
@@ -399,7 +399,7 @@
<show-triggers sql-case-id="show_triggers_with_where_expr"
parameters="'t_order'">
<from start-index="14" stop-index="31">
- <schema name="sharding_db" start-index="19" stop-index="31"
start-delimiter="`" end-delimiter="`" />
+ <database name="sharding_db" start-index="19" stop-index="31"
start-delimiter="`" end-delimiter="`" />
</from>
<filter start-index="33" stop-index="49" literal-start-index="33"
literal-stop-index="57">
<where start-index="33" stop-index="49" literal-start-index="33"
literal-stop-index="57">
@@ -421,7 +421,7 @@
<show-triggers sql-case-id="show_triggers_with_where_expr_no_parameter">
<from start-index="14" stop-index="31">
- <schema name="sharding_db" start-index="19" stop-index="31"
start-delimiter="`" end-delimiter="`" />
+ <database name="sharding_db" start-index="19" stop-index="31"
start-delimiter="`" end-delimiter="`" />
</from>
<filter start-index="33" stop-index="57">
<where start-index="33" stop-index="57">
@@ -444,19 +444,19 @@
<show-table-status sql-case-id="show_table_status_from_schema">
<from start-index="18" stop-index="35">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="23" stop-index="35" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="23" stop-index="35" />
</from>
</show-table-status>
<show-table-status sql-case-id="show_table_status_in_schema">
<from start-index="18" stop-index="33">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="21" stop-index="33" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="21" stop-index="33" />
</from>
</show-table-status>
<show-table-status sql-case-id="show_table_status_with_like_pattern">
<from start-index="18" stop-index="35">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="23" stop-index="35" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="23" stop-index="35" />
</from>
<filter start-index="37" stop-index="52">
<like pattern="t_order_%" start-delimiter="'" end-delimiter="'"
start-index="37" stop-index="52" />
@@ -465,7 +465,7 @@
<show-table-status sql-case-id="show_table_status_with_where_expr"
parameters="'t_order'">
<from start-index="18" stop-index="35">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="23" stop-index="35" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="23" stop-index="35" />
</from>
<filter start-index="37" stop-index="52" literal-start-index="37"
literal-stop-index="60">
<where start-index="37" stop-index="52" literal-start-index="37"
literal-stop-index="60">
@@ -487,7 +487,7 @@
<show-table-status
sql-case-id="show_table_status_with_where_expr_no_parameter">
<from start-index="18" stop-index="35">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="23" stop-index="35" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="23" stop-index="35" />
</from>
<filter start-index="37" stop-index="60">
<where start-index="37" stop-index="60">
@@ -558,13 +558,13 @@
<show-events sql-case-id="show_events_from_schema">
<from start-index="12" stop-index="29">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
</from>
</show-events>
<show-events sql-case-id="show_events_in_schema">
<from start-index="12" stop-index="27">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="15" stop-index="27" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="15" stop-index="27" />
</from>
</show-events>
@@ -576,7 +576,7 @@
<show-events sql-case-id="show_events_with_like_pattern">
<from start-index="12" stop-index="29">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
</from>
<filter start-index="31" stop-index="47">
<like pattern="sharding_%" start-delimiter="'" end-delimiter="'"
start-index="31" stop-index="47" />
@@ -585,7 +585,7 @@
<show-events sql-case-id="show_events_with_where_expr"
parameters="'sharding_db'">
<from start-index="12" stop-index="29">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
</from>
<filter start-index="31" stop-index="42" literal-start-index="31"
literal-stop-index="54">
<where start-index="31" stop-index="42" literal-start-index="31"
literal-stop-index="54">
@@ -607,7 +607,7 @@
<show-events sql-case-id="show_events_with_where_expr_no_parameter">
<from start-index="12" stop-index="29">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
</from>
<filter start-index="31" stop-index="54">
<where start-index="31" stop-index="54">
@@ -632,20 +632,20 @@
<show-tables sql-case-id="show_tables_from_schema">
<from start-index="12" stop-index="29">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
</from>
</show-tables>
<show-tables sql-case-id="show_tables_in_schema">
<from start-index="12" stop-index="27">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="15" stop-index="27" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="15" stop-index="27" />
</from>
</show-tables>
<show-tables sql-case-id="show_tables_with_like_pattern">
<from start-index="12" stop-index="29">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="17" stop-index="29" />
</from>
<filter start-index="31" stop-index="46">
<like pattern="t_order_%" start-delimiter="'" end-delimiter="'"
start-index="31" stop-index="46" />
@@ -654,7 +654,7 @@
<show-tables sql-case-id="show_tables_with_where_expr" parameters="'BASE
TABLE'">
<from start-index="26" stop-index="43">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="31" stop-index="43" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="31" stop-index="43" />
</from>
<filter start-index="45" stop-index="66" literal-start-index="45"
literal-stop-index="77">
<where start-index="45" stop-index="66" literal-start-index="45"
literal-stop-index="77">
@@ -676,7 +676,7 @@
<show-tables sql-case-id="show_tables_with_where_expr_no_parameter">
<from start-index="26" stop-index="43">
- <schema name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="31" stop-index="43" />
+ <database name="sharding_db" start-delimiter="`" end-delimiter="`"
start-index="31" stop-index="43" />
</from>
<filter start-index="45" stop-index="77">
<where start-index="45" stop-index="77">
