You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2020/12/23 16:27:14 UTC
[shardingsphere] branch master updated: Refactor for code format
(#8743)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 ab45b9d Refactor for code format (#8743)
ab45b9d is described below
commit ab45b9dba391d6bd904ff8da6b596f1d1299a241
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Dec 24 00:26:44 2020 +0800
Refactor for code format (#8743)
* Refactor MySQLSQLStatVisitor
* For code format
---
.../parser/mysql/visitor/MySQLSQLStatVisitor.java | 47 +++-----
.../format/impl/MySQLDALFormatSQLVisitor.java | 2 +-
.../format/impl/MySQLDCLFormatSQLVisitor.java | 2 +-
.../format/impl/MySQLDDLFormatSQLVisitor.java | 2 +-
.../format/impl/MySQLDMLFormatSQLVisitor.java | 2 +-
.../visitor/format/impl/MySQLFormatSQLVisitor.java | 128 ++++++++++-----------
.../format/impl/MySQLRLFormatSQLVisitor.java | 2 +-
.../format/impl/MySQLTCLFormatSQLVisitor.java | 2 +-
.../impl/MySQLDALStatementSQLVisitor.java | 14 +--
.../impl/MySQLDCLStatementSQLVisitor.java | 4 +-
.../impl/MySQLDDLStatementSQLVisitor.java | 18 ++-
.../impl/MySQLDMLStatementSQLVisitor.java | 6 +-
.../statement/impl/MySQLRLStatementSQLVisitor.java | 4 +-
.../statement/impl/MySQLStatementSQLVisitor.java | 56 +++++----
.../impl/MySQLTCLStatementSQLVisitor.java | 6 +-
15 files changed, 137 insertions(+), 158 deletions(-)
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/MySQLSQLStatVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/MySQLSQLStatVisitor.java
index c628d35..3926115 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/MySQLSQLStatVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/MySQLSQLStatVisitor.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.sql.parser.mysql.visitor;
import lombok.Getter;
-import lombok.Setter;
import org.antlr.v4.runtime.tree.TerminalNode;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementBaseVisitor;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AliasContext;
@@ -39,20 +38,20 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.Tab
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
/**
- * MySQL SQL Stats visitor for MySQL.
+ * SQL Stats visitor for MySQL.
*/
@Getter
-@Setter
public final class MySQLSQLStatVisitor extends MySQLStatementBaseVisitor<SqlStats> {
-
+
private final SqlStats sqlStats = new SqlStats();
-
+
@Override
public SqlStats visitTableFactor(final TableFactorContext ctx) {
if (null != ctx.tableName()) {
SimpleTableSegment tableSegment = getTableName(ctx.tableName());
if (null != ctx.alias()) {
- tableSegment.setAlias(getAlias(ctx.alias()));
+ AliasContext aliasContext = ctx.alias();
+ tableSegment.setAlias(new AliasSegment(aliasContext.start.getStartIndex(), aliasContext.stop.getStopIndex(), new IdentifierValue(aliasContext.textOrIdentifier().getText())));
}
sqlStats.addTable(tableSegment);
return sqlStats;
@@ -60,7 +59,7 @@ public final class MySQLSQLStatVisitor extends MySQLStatementBaseVisitor<SqlStat
super.visitTableFactor(ctx);
return sqlStats;
}
-
+
@Override
public SqlStats visitInsert(final InsertContext ctx) {
SimpleTableSegment tableSegment = getTableName(ctx.tableName());
@@ -74,21 +73,19 @@ public final class MySQLSQLStatVisitor extends MySQLStatementBaseVisitor<SqlStat
}
return sqlStats;
}
-
+
@Override
public SqlStats visitColumnRef(final ColumnRefContext ctx) {
- ColumnSegment column = getColumn(ctx);
- sqlStats.addColumn(column);
+ sqlStats.addColumn(getColumn(ctx));
return sqlStats;
}
-
+
@Override
public SqlStats visitColumnDefinition(final ColumnDefinitionContext ctx) {
- ColumnSegment column = getColumn(ctx.column_name);
- sqlStats.addColumn(column);
+ sqlStats.addColumn(new ColumnSegment(ctx.column_name.start.getStartIndex(), ctx.column_name.stop.getStopIndex(), new IdentifierValue(ctx.column_name.getText())));
return sqlStats;
}
-
+
private ColumnSegment getColumn(final ColumnRefContext ctx) {
IdentifierValue name;
OwnerSegment owner = null;
@@ -105,31 +102,23 @@ public final class MySQLSQLStatVisitor extends MySQLStatementBaseVisitor<SqlStat
result.setOwner(owner);
return result;
}
-
- private ColumnSegment getColumn(final IdentifierContext ctx) {
- return new ColumnSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), new IdentifierValue(ctx.getText()));
- }
-
- private AliasSegment getAlias(final AliasContext ctx) {
- return new AliasSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), new IdentifierValue(ctx.textOrIdentifier().getText()));
- }
-
+
private SimpleTableSegment getTableName(final TableNameContext ctx) {
- SimpleTableSegment result = new SimpleTableSegment(new TableNameSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), getTableFromIden(ctx.name().identifier())));
+ SimpleTableSegment result = new SimpleTableSegment(new TableNameSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), new IdentifierValue(ctx.name().identifier().getText())));
OwnerContext owner = ctx.owner();
if (null != owner) {
result.setOwner(new OwnerSegment(owner.getStart().getStartIndex(), owner.getStop().getStopIndex(), new IdentifierValue(owner.identifier().getText())));
}
return result;
}
-
+
@Override
public SqlStats visitTableName(final TableNameContext ctx) {
SimpleTableSegment tableSegment = getTableName(ctx);
sqlStats.addTable(tableSegment);
return sqlStats;
}
-
+
@Override
public SqlStats visitTableWild(final TableWildContext ctx) {
ColumnSegment column = new ColumnSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), new IdentifierValue("*"));
@@ -138,11 +127,7 @@ public final class MySQLSQLStatVisitor extends MySQLStatementBaseVisitor<SqlStat
sqlStats.addColumn(column);
return sqlStats;
}
-
- private IdentifierValue getTableFromIden(final IdentifierContext ctx) {
- return new IdentifierValue(ctx.getText());
- }
-
+
@Override
public SqlStats visitTerminal(final TerminalNode node) {
super.visitTerminal(node);
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDALFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDALFormatSQLVisitor.java
index 8eb5450..92db0b0 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDALFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDALFormatSQLVisitor.java
@@ -28,7 +28,7 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLDALFormatSQLVisitor extends MySQLFormatSQLVisitor implements DALSQLVisitor, SQLFormatVisitor {
-
+
public MySQLDALFormatSQLVisitor(final Properties props) {
super(props);
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDCLFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDCLFormatSQLVisitor.java
index 5ae6a6b..ab936eb 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDCLFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDCLFormatSQLVisitor.java
@@ -28,7 +28,7 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLDCLFormatSQLVisitor extends MySQLFormatSQLVisitor implements DCLSQLVisitor, SQLFormatVisitor {
-
+
public MySQLDCLFormatSQLVisitor(final Properties props) {
super(props);
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDDLFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDDLFormatSQLVisitor.java
index 4c23370..8f40ac9 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDDLFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDDLFormatSQLVisitor.java
@@ -28,7 +28,7 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLDDLFormatSQLVisitor extends MySQLFormatSQLVisitor implements DDLSQLVisitor, SQLFormatVisitor {
-
+
public MySQLDDLFormatSQLVisitor(final Properties props) {
super(props);
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDMLFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDMLFormatSQLVisitor.java
index f128c40..d14192d 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDMLFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLDMLFormatSQLVisitor.java
@@ -28,7 +28,7 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLDMLFormatSQLVisitor extends MySQLFormatSQLVisitor implements DMLSQLVisitor, SQLFormatVisitor {
-
+
public MySQLDMLFormatSQLVisitor(final Properties props) {
super(props);
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
index cec15f6..172ae58 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
@@ -78,19 +78,19 @@ import java.util.Properties;
@Getter
@Setter
public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<String> {
-
+
private StringBuilder result = new StringBuilder();
-
+
private boolean upperCase = true;
-
+
private boolean parameterized = true;
-
+
private int indentCount;
-
+
private int lines;
-
+
private int projectionsCountOfLine = 3;
-
+
public MySQLFormatSQLVisitor(final Properties props) {
if (null != props) {
if (props.containsKey("upperCase")) {
@@ -104,7 +104,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
}
}
-
+
@Override
public String visitSelect(final SelectContext ctx) {
if (null != ctx.queryExpression()) {
@@ -121,7 +121,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(";");
return result.toString();
}
-
+
@Override
public String visitQueryExpression(final QueryExpressionContext ctx) {
if (null != ctx.withClause()) {
@@ -143,7 +143,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitQueryExpressionParens(final QueryExpressionParensContext ctx) {
formatPrintln();
@@ -164,7 +164,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(")");
return result.toString();
}
-
+
@Override
public String visitQueryExpressionBody(final QueryExpressionBodyContext ctx) {
if (1 == ctx.getChildCount()) {
@@ -184,7 +184,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitQuerySpecification(final QuerySpecificationContext ctx) {
formatPrint("SELECT ");
@@ -216,14 +216,14 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitExplicitTable(final ExplicitTableContext ctx) {
formatPrint("TABLE ");
visit(ctx.tableName());
return result.toString();
}
-
+
@Override
public String visitInsert(final InsertContext ctx) {
visit(ctx.INSERT());
@@ -253,13 +253,13 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitPartitionNames(final PartitionNamesContext ctx) {
visit(ctx.PARTITION());
formatPrintln(" (");
- int idenCount = ctx.identifier().size();
- for (int i = 0; i < idenCount; i++) {
+ int identifierCount = ctx.identifier().size();
+ for (int i = 0; i < identifierCount; i++) {
if (i == 0) {
visit(ctx.identifier(i));
} else {
@@ -270,7 +270,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(")");
return result.toString();
}
-
+
@Override
public String visitInsertValuesClause(final InsertValuesClauseContext ctx) {
if (null != ctx.LP_()) {
@@ -312,7 +312,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitInsertSelectClause(final InsertSelectClauseContext ctx) {
if (null != ctx.valueReference()) {
@@ -330,7 +330,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
visit(ctx.select());
return result.toString();
}
-
+
@Override
public String visitSetAssignmentsClause(final SetAssignmentsClauseContext ctx) {
if (null != ctx.valueReference()) {
@@ -340,8 +340,8 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
indentCount++;
visit(ctx.SET());
formatPrint(" ");
- int assigntCount = ctx.assignment().size();
- for (int i = 0; i < assigntCount; i++) {
+ int assignmentCount = ctx.assignment().size();
+ for (int i = 0; i < assignmentCount; i++) {
if (i == 0) {
visit(ctx.assignment(i));
} else {
@@ -352,7 +352,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
indentCount--;
return result.toString();
}
-
+
@Override
public String visitDerivedColumns(final DerivedColumnsContext ctx) {
formatPrint("(");
@@ -368,7 +368,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(")");
return result.toString();
}
-
+
@Override
public String visitOnDuplicateKeyClause(final OnDuplicateKeyClauseContext ctx) {
visit(ctx.ON());
@@ -392,7 +392,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
indentCount--;
return result.toString();
}
-
+
@Override
public String visitTableName(final TableNameContext ctx) {
if (null != ctx.owner()) {
@@ -402,14 +402,14 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(ctx.name().getText());
return result.toString();
}
-
+
@Override
public String visitTableValueConstructor(final TableValueConstructorContext ctx) {
formatPrint("VALUES ");
visit(ctx.rowConstructorList());
return result.toString();
}
-
+
@Override
public String visitAlterTable(final AlterTableContext ctx) {
visit(ctx.ALTER());
@@ -430,7 +430,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitAlterTableActions(final AlterTableActionsContext ctx) {
if (null != ctx.alterCommandList()) {
@@ -444,7 +444,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitAlterCommandList(final AlterCommandListContext ctx) {
if (null != ctx.alterCommandsModifierList()) {
@@ -458,7 +458,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitAlterList(final AlterListContext ctx) {
int childCount = ctx.getChildCount();
@@ -477,7 +477,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitCreateTableOptionsSpaceSeparated(final CreateTableOptionsSpaceSeparatedContext ctx) {
int childCount = ctx.getChildCount();
@@ -489,7 +489,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitStandaloneAlterTableAction(final StandaloneAlterTableActionContext ctx) {
if (null != ctx.alterCommandsModifierList()) {
@@ -499,7 +499,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
visit(ctx.standaloneAlterCommands());
return result.toString();
}
-
+
@Override
public String visitRowConstructorList(final RowConstructorListContext ctx) {
int rowCount = ctx.assignmentValues().size();
@@ -517,7 +517,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitAssignmentValues(final AssignmentValuesContext ctx) {
formatPrint("(");
@@ -533,7 +533,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(")");
return result.toString();
}
-
+
@Override
public String visitWhereClause(final WhereClauseContext ctx) {
visit(ctx.WHERE());
@@ -544,7 +544,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
indentCount--;
return result.toString();
}
-
+
@Override
public String visitExpr(final ExprContext ctx) {
if (null != ctx.logicalOperator()) {
@@ -563,13 +563,13 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitAlias(final AliasContext ctx) {
formatPrint(ctx.getText());
return result.toString();
}
-
+
@Override
public String visitProjections(final ProjectionsContext ctx) {
indentCount++;
@@ -593,7 +593,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
indentCount--;
return result.toString();
}
-
+
@Override
public String visitProjection(final ProjectionContext ctx) {
if (null != ctx.expr()) {
@@ -611,7 +611,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitCreateDefinitionClause(final CreateDefinitionClauseContext ctx) {
indentCount++;
@@ -623,7 +623,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
indentCount--;
return result.toString();
}
-
+
@Override
public String visitTableElementList(final TableElementListContext ctx) {
int tableElementCount = ctx.tableElement().size();
@@ -637,7 +637,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitFieldLength(final FieldLengthContext ctx) {
formatPrint("(");
@@ -645,7 +645,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(")");
return result.toString();
}
-
+
@Override
public String visitPrecision(final PrecisionContext ctx) {
formatPrint("(");
@@ -655,7 +655,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(")");
return super.visitPrecision(ctx);
}
-
+
@Override
public String visitTypeDatetimePrecision(final TypeDatetimePrecisionContext ctx) {
formatPrint("(");
@@ -663,7 +663,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(")");
return result.toString();
}
-
+
@Override
public String visitDataType(final DataTypeContext ctx) {
int childCount = ctx.getChildCount();
@@ -676,7 +676,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitStringList(final StringListContext ctx) {
int stringCount = ctx.textString().size();
@@ -692,23 +692,23 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
formatPrint(")");
return result.toString();
}
-
+
@Override
public String visitTerminal(final TerminalNode node) {
- if (isUpperCase()) {
+ if (upperCase) {
formatPrint(node.getText().toUpperCase());
} else {
formatPrint(node.getText().toLowerCase());
}
return result.toString();
}
-
+
@Override
public String visitIdentifier(final IdentifierContext ctx) {
formatPrint(ctx.getText());
return result.toString();
}
-
+
@Override
public String visitLiterals(final LiteralsContext ctx) {
if (parameterized) {
@@ -718,14 +718,14 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitTemporalLiterals(final TemporalLiteralsContext ctx) {
visit(ctx.getChild(0));
formatPrint(ctx.SINGLE_QUOTED_TEXT().getText());
return result.toString();
}
-
+
@Override
public String visitStringLiterals(final StringLiteralsContext ctx) {
if (parameterized) {
@@ -742,13 +742,13 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitString_(final String_Context ctx) {
formatPrint(ctx.getText());
return result.toString();
}
-
+
@Override
public String visitNumberLiterals(final NumberLiteralsContext ctx) {
if (parameterized) {
@@ -758,7 +758,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitWithClause(final WithClauseContext ctx) {
formatPrint("WITH ");
@@ -777,7 +777,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitCteClause(final CteClauseContext ctx) {
visit(ctx.identifier());
@@ -790,7 +790,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
visit(ctx.subquery());
return result.toString();
}
-
+
@Override
public String visitColumnNames(final ColumnNamesContext ctx) {
int columnCount = ctx.columnName().size();
@@ -803,11 +803,10 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
}
return result.toString();
}
-
+
@Override
public String visitChildren(final RuleNode node) {
String result = defaultResult();
-
int childCount = node.getChildCount();
for (int i = 0; i < childCount; i++) {
if (i != 0 && !"(".equals(node.getChild(i - 1).getText()) && !")".equals(node.getChild(i).getText()) && !"(".equals(node.getChild(i).getText())) {
@@ -816,28 +815,27 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
if (!shouldVisitNextChild(node, result)) {
break;
}
-
ParseTree child = node.getChild(i);
String childResult = child.accept(this);
result = aggregateResult(result, childResult);
}
return result;
}
-
+
private void formatPrint(final char value) {
if (null == result) {
return;
}
result.append(value);
}
-
+
private void formatPrint(final String text) {
if (null == result) {
return;
}
result.append(text);
}
-
+
protected void formatPrintIndent() {
if (null == result) {
return;
@@ -846,13 +844,13 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
result.append('\t');
}
}
-
+
private void formatPrintln() {
formatPrint('\n');
lines++;
formatPrintIndent();
}
-
+
private void formatPrintln(final String text) {
formatPrint(text);
formatPrint('\n');
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLRLFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLRLFormatSQLVisitor.java
index 6e1b9b9..921fb53 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLRLFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLRLFormatSQLVisitor.java
@@ -28,7 +28,7 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLRLFormatSQLVisitor extends MySQLFormatSQLVisitor implements RLSQLVisitor, SQLFormatVisitor {
-
+
public MySQLRLFormatSQLVisitor(final Properties props) {
super(props);
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLTCLFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLTCLFormatSQLVisitor.java
index ab709a1..cee5cfc 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLTCLFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLTCLFormatSQLVisitor.java
@@ -28,7 +28,7 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLTCLFormatSQLVisitor extends MySQLFormatSQLVisitor implements TCLSQLVisitor, SQLFormatVisitor {
-
+
public MySQLTCLFormatSQLVisitor(final Properties props) {
super(props);
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDALStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDALStatementSQLVisitor.java
index c20aeb4..0932b58 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDALStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDALStatementSQLVisitor.java
@@ -110,11 +110,11 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLDALStatementSQLVisitor extends MySQLStatementSQLVisitor implements DALSQLVisitor, SQLStatementVisitor {
-
+
public MySQLDALStatementSQLVisitor(final Properties props) {
super(props);
}
-
+
@Override
public ASTNode visitUninstallPlugin(final UninstallPluginContext ctx) {
return new MySQLUninstallPluginStatement();
@@ -291,22 +291,22 @@ public final class MySQLDALStatementSQLVisitor extends MySQLStatementSQLVisitor
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
return result;
}
-
+
@Override
public ASTNode visitShowVariables(final ShowVariablesContext ctx) {
return new MySQLShowOtherStatement();
}
-
+
@Override
public ASTNode visitShowCharacterSet(final ShowCharacterSetContext ctx) {
return new MySQLShowOtherStatement();
}
-
+
@Override
public ASTNode visitShowCollation(final ShowCollationContext ctx) {
return new MySQLShowOtherStatement();
}
-
+
@Override
public ASTNode visitSetVariable(final SetVariableContext ctx) {
MySQLSetStatement result = new MySQLSetStatement();
@@ -364,7 +364,7 @@ public final class MySQLDALStatementSQLVisitor extends MySQLStatementSQLVisitor
result.setVariable(ctx.internalVariableName().getText());
return result;
}
-
+
@Override
public ASTNode visitFromSchema(final FromSchemaContext ctx) {
return new FromSchemaSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex());
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDCLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDCLStatementSQLVisitor.java
index 778f63e..8f0817e 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDCLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDCLStatementSQLVisitor.java
@@ -55,11 +55,11 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor implements DCLSQLVisitor, SQLStatementVisitor {
-
+
public MySQLDCLStatementSQLVisitor(final Properties props) {
super(props);
}
-
+
@Override
public ASTNode visitGrant(final GrantContext ctx) {
MySQLGrantStatement result = new MySQLGrantStatement();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
index dcbf0d8..af24dce 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
@@ -145,11 +145,11 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLDDLStatementSQLVisitor extends MySQLStatementSQLVisitor implements DDLSQLVisitor, SQLStatementVisitor {
-
+
public MySQLDDLStatementSQLVisitor(final Properties props) {
super(props);
}
-
+
@Override
public ASTNode visitCreateView(final CreateViewContext ctx) {
MySQLCreateViewStatement result = new MySQLCreateViewStatement();
@@ -251,15 +251,13 @@ public final class MySQLDDLStatementSQLVisitor extends MySQLStatementSQLVisitor
}
return result;
}
-
+
private ColumnDefinitionSegment generateColumnDefinitionSegment(final ColumnSegment column, final FieldDefinitionContext ctx) {
DataTypeSegment dataTypeSegment = (DataTypeSegment) visit(ctx.dataType());
boolean isPrimaryKey = isPrimaryKey(ctx);
- ColumnDefinitionSegment result = new ColumnDefinitionSegment(
- column.getStartIndex(), dataTypeSegment.getStopIndex(), column, dataTypeSegment, isPrimaryKey);
- return result;
+ return new ColumnDefinitionSegment(column.getStartIndex(), dataTypeSegment.getStopIndex(), column, dataTypeSegment, isPrimaryKey);
}
-
+
@Override
public ASTNode visitAlterList(final AlterListContext ctx) {
CollectionValue<AlterDefinitionSegment> result = new CollectionValue<>();
@@ -301,7 +299,7 @@ public final class MySQLDDLStatementSQLVisitor extends MySQLStatementSQLVisitor
}
return result;
}
-
+
@Override
public ASTNode visitAddColumn(final AddColumnContext ctx) {
Collection<ColumnDefinitionSegment> columnDefinitions = new LinkedList<>();
@@ -322,7 +320,7 @@ public final class MySQLDDLStatementSQLVisitor extends MySQLStatementSQLVisitor
}
return result;
}
-
+
@Override
public ASTNode visitColumnDefinition(final ColumnDefinitionContext ctx) {
ColumnSegment column = new ColumnSegment(ctx.column_name.start.getStartIndex(), ctx.column_name.stop.getStopIndex(), (IdentifierValue) visit(ctx.column_name));
@@ -381,7 +379,7 @@ public final class MySQLDDLStatementSQLVisitor extends MySQLStatementSQLVisitor
}
return result;
}
-
+
private Collection<ColumnSegment> getKeyColumnsFromKeyListWithExpression(final KeyListWithExpressionContext ctx) {
Collection<ColumnSegment> result = new LinkedList<>();
for (MySQLStatementParser.KeyPartWithExpressionContext each : ctx.keyPartWithExpression()) {
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDMLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDMLStatementSQLVisitor.java
index 409d803..1d44635 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDMLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDMLStatementSQLVisitor.java
@@ -36,18 +36,18 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLDMLStatementSQLVisitor extends MySQLStatementSQLVisitor implements DMLSQLVisitor, SQLStatementVisitor {
-
+
public MySQLDMLStatementSQLVisitor(final Properties props) {
super(props);
}
-
+
@Override
public ASTNode visitCall(final CallContext ctx) {
List<ExpressionSegment> parameters = new ArrayList<>();
ctx.expr().forEach(each -> parameters.add((ExpressionSegment) visit(each)));
return new MySQLCallStatement(ctx.identifier().getText(), parameters);
}
-
+
@Override
public ASTNode visitDoStatement(final DoStatementContext ctx) {
return new MySQLDoStatement();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLRLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLRLStatementSQLVisitor.java
index f4d6709..1fae7bd 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLRLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLRLStatementSQLVisitor.java
@@ -35,11 +35,11 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLRLStatementSQLVisitor extends MySQLStatementSQLVisitor implements RLSQLVisitor, SQLStatementVisitor {
-
+
public MySQLRLStatementSQLVisitor(final Properties props) {
super(props);
}
-
+
@Override public ASTNode visitChangeMasterTo(final ChangeMasterToContext ctx) {
return new MySQLChangeMasterStatement();
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
index d938492..e2b2a49 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
@@ -195,10 +195,10 @@ import java.util.Properties;
public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor<ASTNode> {
private int currentParameterIndex;
-
+
public MySQLStatementSQLVisitor(final Properties props) {
}
-
+
@Override
public final ASTNode visitParameterMarker(final ParameterMarkerContext ctx) {
return new ParameterMarkerValue(currentParameterIndex++);
@@ -307,8 +307,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
@Override
public final ASTNode visitColumnName(final ColumnNameContext ctx) {
- ColumnSegment result = new ColumnSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), (IdentifierValue) visit(ctx.identifier()));
- return result;
+ return new ColumnSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), (IdentifierValue) visit(ctx.identifier()));
}
@Override
@@ -529,14 +528,14 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
return visitRemainSimpleExpr(ctx);
}
-
+
@Override
public ASTNode visitColumnRef(final ColumnRefContext ctx) {
- int idenCount = ctx.identifier().size();
+ int identifierCount = ctx.identifier().size();
ColumnSegment result;
- if (1 == idenCount) {
+ if (1 == identifierCount) {
result = new ColumnSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), (IdentifierValue) visit(ctx.identifier(0)));
- } else if (2 == idenCount) {
+ } else if (2 == identifierCount) {
result = new ColumnSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), (IdentifierValue) visit(ctx.identifier(1)));
result.setOwner(new OwnerSegment(ctx.identifier(0).start.getStartIndex(), ctx.identifier(0).stop.getStopIndex(), (IdentifierValue) visit(ctx.identifier(0))));
} else {
@@ -545,12 +544,12 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
return result;
}
-
+
@Override
public ASTNode visitSubquery(final SubqueryContext ctx) {
return visit(ctx.queryExpressionParens());
}
-
+
@Override
public ASTNode visitQueryExpressionParens(final QueryExpressionParensContext ctx) {
if (null != ctx.queryExpressionParens()) {
@@ -560,10 +559,10 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
if (null != ctx.lockClauseList()) {
result.setLock((LockSegment) visit(ctx.lockClauseList()));
}
- result.setParameterCount(getCurrentParameterIndex());
+ result.setParameterCount(currentParameterIndex);
return result;
}
-
+
@Override
public ASTNode visitLockClauseList(final LockClauseListContext ctx) {
LockSegment result = new LockSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex());
@@ -574,7 +573,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
return result;
}
-
+
@Override
public ASTNode visitQueryExpression(final QueryExpressionContext ctx) {
MySQLSelectStatement result;
@@ -591,7 +590,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
return result;
}
-
+
@Override
public ASTNode visitSelectWithInto(final SelectWithIntoContext ctx) {
if (null != ctx.selectWithInto()) {
@@ -603,7 +602,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
return result;
}
-
+
@Override
public ASTNode visitQueryExpressionBody(final QueryExpressionBodyContext ctx) {
if (1 == ctx.getChildCount() && ctx.getChild(0) instanceof QueryPrimaryContext) {
@@ -611,7 +610,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
throw new IllegalStateException("union select is not supported yet.");
}
-
+
@Override
public ASTNode visitQuerySpecification(final QuerySpecificationContext ctx) {
MySQLSelectStatement result = new MySQLSelectStatement();
@@ -631,7 +630,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
return result;
}
-
+
@Override
public final ASTNode visitIntervalExpression(final IntervalExpressionContext ctx) {
calculateParameterCount(Collections.singleton(ctx.intervalValue().expr()));
@@ -828,7 +827,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
return result;
}
-
+
@Override
public ASTNode visitFieldLength(final FieldLengthContext ctx) {
DataTypeLengthSegment result = new DataTypeLengthSegment();
@@ -837,7 +836,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
result.setPrecision(Integer.parseInt(ctx.length.getText()));
return result;
}
-
+
@Override
public ASTNode visitPrecision(final PrecisionContext ctx) {
DataTypeLengthSegment result = new DataTypeLengthSegment();
@@ -848,7 +847,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
result.setScale(Integer.parseInt(numbers.get(1).getText()));
return result;
}
-
+
@Override
public final ASTNode visitOrderByClause(final OrderByClauseContext ctx) {
Collection<OrderByItemSegment> items = new LinkedList<>();
@@ -860,7 +859,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
@Override
public final ASTNode visitOrderByItem(final OrderByItemContext ctx) {
- OrderDirection orderDirection = null;
+ OrderDirection orderDirection;
if (null != ctx.direction()) {
orderDirection = null != ctx.direction().DESC() ? OrderDirection.DESC : OrderDirection.ASC;
} else {
@@ -878,7 +877,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
}
}
-
+
@Override
public ASTNode visitInsert(final InsertContext ctx) {
// TODO :FIXME, since there is no segment for insertValuesClause, InsertStatement is created by sub rule.
@@ -895,7 +894,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
result.setOnDuplicateKeyColumns((OnDuplicateKeyColumnsSegment) visit(ctx.onDuplicateKeyClause()));
}
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.setParameterCount(getCurrentParameterIndex());
+ result.setParameterCount(currentParameterIndex);
return result;
}
@@ -969,7 +968,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
result.setParameterCount(getCurrentParameterIndex());
return result;
}
-
+
@Override
public ASTNode visitReplaceSelectClause(final ReplaceSelectClauseContext ctx) {
MySQLInsertStatement result = new MySQLInsertStatement();
@@ -1007,7 +1006,6 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
return result;
}
- @SuppressWarnings("unchecked")
private List<ColumnSegment> createInsertColumns(final FieldsContext fields) {
List<ColumnSegment> result = new LinkedList<>();
for (InsertIdentifierContext each : fields.insertIdentifier()) {
@@ -1015,7 +1013,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
return result;
}
-
+
private Collection<InsertValuesSegment> createReplaceValuesSegments(final Collection<MySQLStatementParser.AssignmentValuesContext> assignmentValuesContexts) {
Collection<InsertValuesSegment> result = new LinkedList<>();
for (MySQLStatementParser.AssignmentValuesContext each : assignmentValuesContexts) {
@@ -1039,7 +1037,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
if (null != ctx.limitClause()) {
result.setLimit((LimitSegment) visit(ctx.limitClause()));
}
- result.setParameterCount(getCurrentParameterIndex());
+ result.setParameterCount(currentParameterIndex);
return result;
}
@@ -1104,7 +1102,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
if (null != ctx.limitClause()) {
result.setLimit((LimitSegment) visit(ctx.limitClause()));
}
- result.setParameterCount(getCurrentParameterIndex());
+ result.setParameterCount(currentParameterIndex);
return result;
}
@@ -1148,7 +1146,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
} else {
result = (MySQLSelectStatement) visit(ctx.getChild(0));
}
- result.setParameterCount(getCurrentParameterIndex());
+ result.setParameterCount(currentParameterIndex);
return result;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLTCLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLTCLStatementSQLVisitor.java
index 7709bd3..f183560 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLTCLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLTCLStatementSQLVisitor.java
@@ -47,11 +47,11 @@ import java.util.Properties;
*/
@NoArgsConstructor
public final class MySQLTCLStatementSQLVisitor extends MySQLStatementSQLVisitor implements TCLSQLVisitor, SQLStatementVisitor {
-
+
public MySQLTCLStatementSQLVisitor(final Properties props) {
super(props);
}
-
+
@Override
public ASTNode visitSetTransaction(final SetTransactionContext ctx) {
MySQLSetTransactionStatement result = new MySQLSetTransactionStatement();
@@ -108,7 +108,7 @@ public final class MySQLTCLStatementSQLVisitor extends MySQLStatementSQLVisitor
public ASTNode visitSavepoint(final SavepointContext ctx) {
return new MySQLSavepointStatement();
}
-
+
@Override
public ASTNode visitXa(final XaContext ctx) {
return new MySQLXAStatement();