This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 da5fd9831ba Rename schemaName to databaseName in mysql sql parser
(#31874)
da5fd9831ba is described below
commit da5fd9831ba629a0cf2d9a5dce4e2355238d4944
Author: Raigor <[email protected]>
AuthorDate: Wed Jun 26 21:52:37 2024 +0800
Rename schemaName to databaseName in mysql sql parser (#31874)
---
.../mysql/src/main/antlr4/imports/mysql/BaseRule.g4 | 14 +++++++-------
.../mysql/src/main/antlr4/imports/mysql/DALStatement.g4 | 6 +++---
.../mysql/src/main/antlr4/imports/mysql/DCLStatement.g4 | 2 +-
.../mysql/src/main/antlr4/imports/mysql/DDLStatement.g4 | 8 ++++----
.../mysql/src/main/antlr4/imports/mysql/RLStatement.g4 | 6 +++---
.../mysql/visitor/statement/MySQLStatementVisitor.java | 4 ++--
.../visitor/statement/type/MySQLDALStatementVisitor.java | 6 +++---
.../visitor/statement/type/MySQLDCLStatementVisitor.java | 14 +++++++-------
.../visitor/statement/type/MySQLDDLStatementVisitor.java | 4 ++--
9 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
index b9599f46c3d..b03e2d8b9c8 100644
--- a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
+++ b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/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/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
index 1681211e098..efb857340e6 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
@@ -20,7 +20,7 @@ grammar DALStatement;
import DMLStatement;
use
- : USE schemaName
+ : USE databaseName
;
help
@@ -35,7 +35,7 @@ explain
;
fromSchema
- : (FROM | IN) schemaName
+ : (FROM | IN) databaseName
;
fromTable
@@ -103,7 +103,7 @@ showColumns
;
showCreateDatabase
- : SHOW CREATE (DATABASE | SCHEMA) ifNotExists? schemaName
+ : SHOW CREATE (DATABASE | SCHEMA) ifNotExists? databaseName
;
showCreateEvent
diff --git
a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DCLStatement.g4
b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DCLStatement.g4
index 090e19f6406..eb133d7c021 100644
--- a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DCLStatement.g4
+++ b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/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/mysql/src/main/antlr4/imports/mysql/DDLStatement.g4
b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DDLStatement.g4
index 0f095393485..e8bca66b1df 100644
--- a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DDLStatement.g4
+++ b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DDLStatement.g4
@@ -216,11 +216,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_
@@ -235,7 +235,7 @@ alterDatabaseSpecification_
;
dropDatabase
- : DROP (DATABASE | SCHEMA) ifExists? schemaName
+ : DROP (DATABASE | SCHEMA) ifExists? databaseName
;
alterInstance
@@ -425,7 +425,7 @@ createTrigger
;
dropTrigger
- : DROP TRIGGER ifExists? (schemaName DOT_)? triggerName
+ : DROP TRIGGER ifExists? (databaseName DOT_)? triggerName
;
renameTable
diff --git
a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/RLStatement.g4
b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/RLStatement.g4
index 1564dfe223c..f035a0ced8b 100644
--- a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/RLStatement.g4
+++ b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/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/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 1c42e8a8cfb..cc9e03e0f01 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
@@ -110,7 +110,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.Replace
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ReplaceSelectClauseContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ReplaceValuesClauseContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.RowConstructorListContext;
-import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.SchemaNameContext;
+import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.DatabaseNameContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.SelectContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.SelectSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.SelectWithIntoContext;
@@ -334,7 +334,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<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()));
}
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 3894bbabc98..5591d33d4af 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
@@ -235,7 +235,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowCreateDatabase(final ShowCreateDatabaseContext
ctx) {
MySQLShowCreateDatabaseStatement result = new
MySQLShowCreateDatabaseStatement();
- 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 MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitUse(final UseContext ctx) {
MySQLUseStatement result = new MySQLUseStatement();
- result.setSchema(((DatabaseSegment)
visit(ctx.schemaName())).getIdentifier().getValue());
+ result.setSchema(((DatabaseSegment)
visit(ctx.databaseName())).getIdentifier().getValue());
return result;
}
@@ -988,7 +988,7 @@ 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.schemaName()));
+ return new FromSchemaSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
diff --git
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementVisitor.java
index 2bb488574f5..576fc0fcb08 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementVisitor.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.DropRol
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.DropUserContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.GrantIdentifierContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.GrantLevelGlobalContext;
-import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.GrantLevelSchemaGlobalContext;
+import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.GrantLevelDatabaseGlobalContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.GrantLevelTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.GrantProxyContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.GrantRoleOrPrivilegeOnToContext;
@@ -174,17 +174,17 @@ public final class MySQLDCLStatementVisitor extends
MySQLStatementVisitor implem
if (ctx instanceof GrantLevelGlobalContext) {
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/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDDLStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDDLStatementVisitor.java
index 5e97804bb00..4c6e72f5c42 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDDLStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDDLStatementVisitor.java
@@ -229,7 +229,7 @@ public final class MySQLDDLStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitCreateDatabase(final CreateDatabaseContext ctx) {
MySQLCreateDatabaseStatement result = new
MySQLCreateDatabaseStatement();
- result.setDatabaseName(new
IdentifierValue(ctx.schemaName().getText()).getValue());
+ result.setDatabaseName(new
IdentifierValue(ctx.databaseName().getText()).getValue());
result.setIfNotExists(null != ctx.ifNotExists());
return result;
}
@@ -242,7 +242,7 @@ public final class MySQLDDLStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitDropDatabase(final DropDatabaseContext ctx) {
MySQLDropDatabaseStatement result = new MySQLDropDatabaseStatement();
- result.setDatabaseName(new
IdentifierValue(ctx.schemaName().getText()).getValue());
+ result.setDatabaseName(new
IdentifierValue(ctx.databaseName().getText()).getValue());
result.setIfExists(null != ctx.ifExists());
return result;
}
