Skip to content

Ensure that all keywords can be used as identifiers. #34945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strongduanmu merged 1 commit into from
Mar 25, 2025
Merged

Ensure that all keywords can be used as identifiers. #34945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
504 changes: 8 additions & 496 deletions parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ showCreateDatabase
;

showCreateEvent
: SHOW CREATE EVENT eventName
: SHOW CREATE EVENT eventName
;

showCreateFunction
Expand Down Expand Up @@ -359,7 +359,7 @@ cacheTableIndexList
;

partitionList
: partitionName (COMMA_ partitionName)* | ALL
: ALL | partitionName (COMMA_ partitionName)*
;

flush
Expand All @@ -368,7 +368,7 @@ flush

flushOption
: BINARY LOGS | ENGINE LOGS | ERROR LOGS | GENERAL LOGS | HOSTS | LOGS | PRIVILEGES | OPTIMIZER_COSTS
| RELAY LOGS (FOR CHANNEL channelName)? | SLOW LOGS | STATUS | USER_RESOURCES
| RELAY LOGS (FOR CHANNEL channelName)? | SLOW LOGS | STATUS | USER_RESOURCES
;

tablesOption
Expand Down
12 changes: 7 additions & 5 deletions parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DMLStatement.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ assignment
;

setAssignmentsClause
: valueReference? SET assignment (COMMA_ assignment)*
: SET assignment (COMMA_ assignment)*
;

assignmentValues
Expand Down Expand Up @@ -202,7 +202,7 @@ loadStatement

loadDataStatement
: LOAD DATA
(LOW_PRIORITY | CONCURRENT)? LOCAL?
(LOW_PRIORITY | CONCURRENT)? LOCAL?
INFILE string_
(REPLACE | IGNORE)?
INTO TABLE tableName partitionNames?
Expand All @@ -216,7 +216,7 @@ loadDataStatement

loadXmlStatement
: LOAD XML
(LOW_PRIORITY | CONCURRENT)? LOCAL?
(LOW_PRIORITY | CONCURRENT)? LOCAL?
INFILE string_
(REPLACE | IGNORE)?
INTO TABLE tableName
Expand Down Expand Up @@ -288,8 +288,10 @@ tableReference
;

tableFactor
: tableName partitionNames? (AS? alias)? indexHintList?
: tableName
| tableName partitionNames? (AS? alias)? indexHintList?
| subquery AS? alias (LP_ columnNames RP_)?
| expr
| expr (AS? alias)?
| LATERAL subquery AS? alias (LP_ columnNames RP_)?
| LP_ tableReferences RP_
Expand Down Expand Up @@ -424,4 +426,4 @@ returningClause

targetList
: projection (COMMA_ projection)*
;
;
4 changes: 0 additions & 4 deletions ...in/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/MySQLFormatVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,6 @@ public String visitInsertSelectClause(final InsertSelectClauseContext ctx) {

@Override
public String visitSetAssignmentsClause(final SetAssignmentsClauseContext ctx) {
if (null != ctx.valueReference()) {
visit(ctx.valueReference());
formatPrint(' ');
}
indentCount++;
visit(ctx.SET());
formatPrint(' ');
Expand Down
2 changes: 2 additions & 0 deletions ...shardingsphere/test/it/sql/parser/it/mysql/internal/InternalUnsupportedMySQLParserIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

import org.apache.shardingsphere.test.it.sql.parser.internal.InternalSQLParserITSettings;
import org.apache.shardingsphere.test.it.sql.parser.internal.InternalUnsupportedSQLParserIT;
import org.junit.jupiter.api.Disabled;

@Disabled
@InternalSQLParserITSettings("MySQL")
class InternalUnsupportedMySQLParserIT extends InternalUnsupportedSQLParserIT {
}
Loading