This is an automated email from the ASF dual-hosted git repository.
dongzonglei 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 5d7ca41 Fix checkstyle (#8001)
5d7ca41 is described below
commit 5d7ca41942d298dad2cc0d8efc5fc5c6872e2aec
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Nov 1 14:32:14 2020 +0800
Fix checkstyle (#8001)
---
.../example/core/jpa/entity/ShadowUserEntity.java | 1 -
.../application-encrypt-databases.properties | 2 +-
.../api/sharding/hint/HintShardingAlgorithm.java | 4 +--
.../shardingsphere/sharding/rule/TableRule.java | 4 +--
.../dml/ShardingDMLStatementValidator.java | 2 +-
.../namespace/ShardingSpringNamespaceTest.java | 6 ++--
.../statement/impl/SelectStatementContextTest.java | 4 +--
.../jdbc/adapter/AbstractConnectionAdapter.java | 2 +-
.../jdbc/adapter/AbstractStatementAdapter.java | 14 ++++----
.../jdbc/datasource/JDBCBackendDataSource.java | 2 +-
.../jdbc/datasource/JDBCBackendDataSourceTest.java | 2 +-
.../statement/impl/MySQLStatementSQLVisitor.java | 37 +++++++---------------
.../statement/impl/OracleStatementSQLVisitor.java | 28 ++++++----------
.../impl/PostgreSQLDMLStatementSQLVisitor.java | 4 +--
.../impl/PostgreSQLStatementSQLVisitor.java | 19 ++++-------
.../statement/impl/SQL92StatementSQLVisitor.java | 28 ++++++----------
.../impl/SQLServerStatementSQLVisitor.java | 28 ++++++----------
17 files changed, 72 insertions(+), 115 deletions(-)
diff --git
a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/ShadowUserEntity.java
b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/ShadowUserEntity.java
index 521965d..d287b7b 100644
---
a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/ShadowUserEntity.java
+++
b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/ShadowUserEntity.java
@@ -49,7 +49,6 @@ public final class ShadowUserEntity extends ShadowUser {
return super.getPwd();
}
-
@Column(name = "shadow")
@Override
public boolean isShadow() {
diff --git
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/application-encrypt-databases.properties
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/application-encrypt-databases.properties
index 0651c21..cdc916d 100644
---
a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/application-encrypt-databases.properties
+++
b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-spring-boot-example/src/main/resources/application-encrypt-databases.properties
@@ -33,4 +33,4 @@
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.encryptor-name=pwd_encryptor
spring.shardingsphere.props.query-with-cipher-comlum=true
-spring.shardingsphere.props.sql-show=true
\ No newline at end of file
+spring.shardingsphere.props.sql-show=true
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/hint/HintShardingAlgorithm.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/hint/HintShardingAlgorithm.java
index 594e278..7bfba9f 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/hint/HintShardingAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/hint/HintShardingAlgorithm.java
@@ -33,9 +33,9 @@ public interface HintShardingAlgorithm<T extends
Comparable<?>> extends Sharding
*
* <p>sharding value injected by hint, not in SQL.</p>
*
- * @param availableTargetNames available data sources or tables's names
+ * @param availableTargetNames available data sources or table names
* @param shardingValue sharding value
- * @return sharding result for data sources or tables's names
+ * @return sharding result for data sources or table names
*/
Collection<String> doSharding(Collection<String> availableTargetNames,
HintShardingValue<T> shardingValue);
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
index 0c4c307..b149473 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
@@ -121,10 +121,10 @@ public final class TableRule {
}
List<String> dataSources =
Strings.isNullOrEmpty(tableRuleConfig.getActualDataSources()) ? new
LinkedList<>(dataSourceNames)
: new
InlineExpressionParser(tableRuleConfig.getActualDataSources()).splitAndEvaluate();
- return fillDataSouceNames(shardingAlgorithm.getAutoTablesAmount(),
dataSources);
+ return fillDataSourceNames(shardingAlgorithm.getAutoTablesAmount(),
dataSources);
}
- private List<String> fillDataSouceNames(final int amount, final
List<String> dataSources) {
+ private List<String> fillDataSourceNames(final int amount, final
List<String> dataSources) {
List<String> result = new LinkedList<>();
Iterator<String> iterator = dataSources.iterator();
for (int i = 0; i < amount; i++) {
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
index 8d611e1..57fe45a 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
@@ -50,6 +50,6 @@ public abstract class ShardingDMLStatementValidator<T extends
SQLStatement> impl
allTableNames.removeAll(shardingRule.getShardingLogicTableNames(tableNames));
allTableNames.removeAll(shardingRule.getBroadcastTables());
// TODO validate other single table scenario
- return 0 == allTableNames.size();
+ return allTableNames.isEmpty();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/ShardingSpringNamespaceTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/ShardingSpringNamespaceTest.java
index d2d5107..3d9ead7 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/ShardingSpringNamespaceTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/ShardingSpringNamespaceTest.java
@@ -207,9 +207,9 @@ public final class ShardingSpringNamespaceTest extends
AbstractJUnit4SpringConte
@Test
public void assertBindingRule() {
- Collection<ShardingTableRuleConfiguration>
actualBindingTableRuleConfigus = bindingRule.getTables();
- assertThat(actualBindingTableRuleConfigus.size(), is(4));
- Iterator<ShardingTableRuleConfiguration> actualIterator =
actualBindingTableRuleConfigus.iterator();
+ Collection<ShardingTableRuleConfiguration>
actualBindingTableRuleConfigs = bindingRule.getTables();
+ assertThat(actualBindingTableRuleConfigs.size(), is(4));
+ Iterator<ShardingTableRuleConfiguration> actualIterator =
actualBindingTableRuleConfigs.iterator();
assertThat(actualIterator.next().getLogicTable(), is("t_order"));
assertThat(actualIterator.next().getLogicTable(), is("t_order_item"));
assertThat(actualIterator.next().getLogicTable(), is("t_user"));
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/SelectStatementContextTest.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/SelectStatementContextTest.java
index 78ea055..c2396dc 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/SelectStatementContextTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/SelectStatementContextTest.java
@@ -411,8 +411,8 @@ public final class SelectStatementContextTest {
when(projectionSegment.getSubquery()).thenReturn(subquery);
SelectStatement select = mock(SelectStatement.class);
when(subquery.getSelect()).thenReturn(select);
- WhereSegment subwhere = mock(WhereSegment.class);
- when(select.getWhere()).thenReturn(Optional.of(subwhere));
+ WhereSegment subWhere = mock(WhereSegment.class);
+ when(select.getWhere()).thenReturn(Optional.of(subWhere));
when(projectionSegment.getSubquery().getSelect().getWhere()).thenReturn(Optional.of(mock(WhereSegment.class)));
WhereSegment whereSegment = new WhereSegment(0, 0, null);
subSelectStatement.setWhere(whereSegment);
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractConnectionAdapter.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractConnectionAdapter.java
index 14a6c23..6c73050 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractConnectionAdapter.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractConnectionAdapter.java
@@ -145,7 +145,7 @@ public abstract class AbstractConnectionAdapter extends
AbstractUnsupportedOpera
for (Connection each : result) {
each.close();
}
- throw new SQLException(String.format("Could't get %d
connections one time, partition succeed connection(%d) have released!",
connectionSize, result.size()), ex);
+ throw new SQLException(String.format("Can not get %d
connections one time, partition succeed connection(%d) have released!",
connectionSize, result.size()), ex);
}
}
return result;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
index 5698b3a..19960c0 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
@@ -39,8 +39,8 @@ public abstract class AbstractStatementAdapter extends
AbstractUnsupportedOperat
private boolean poolable;
private int fetchSize;
-
- private int fecthDirection;
+
+ private int fetchDirection;
private final ForceExecuteTemplate<Statement> forceExecuteTemplate = new
ForceExecuteTemplate<>();
@@ -85,15 +85,15 @@ public abstract class AbstractStatementAdapter extends
AbstractUnsupportedOperat
recordMethodInvocation(targetClass, "setFetchSize", new Class[]
{int.class}, new Object[] {rows});
forceExecuteTemplate.execute((Collection) getRoutedStatements(),
statement -> statement.setFetchSize(rows));
}
-
+
@Override
- public int getFetchDirection() throws SQLException {
- return fecthDirection;
+ public int getFetchDirection() {
+ return fetchDirection;
}
-
+
@Override
public void setFetchDirection(final int direction) throws SQLException {
- this.fecthDirection = direction;
+ fetchDirection = direction;
recordMethodInvocation(targetClass, "setFetchDirection", new Class[]
{int.class}, new Object[] {direction});
forceExecuteTemplate.execute((Collection) getRoutedStatements(),
statement -> statement.setFetchDirection(direction));
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
index ededbce..a86ab47 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
@@ -99,7 +99,7 @@ public final class JDBCBackendDataSource implements
BackendDataSource {
for (Connection each : result) {
each.close();
}
- throw new SQLException(String.format("Could't get %d
connections one time, partition succeed connection(%d) have released!",
connectionSize, result.size()), ex);
+ throw new SQLException(String.format("Can not get %d
connections one time, partition succeed connection(%d) have released!",
connectionSize, result.size()), ex);
}
}
return result;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
index 10f195e..509151c 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
@@ -134,7 +134,7 @@ public final class JDBCBackendDataSourceTest {
try {
actual.addAll(each.get());
} catch (final InterruptedException | ExecutionException ex) {
- assertThat(ex.getMessage(), containsString("Could't get 6
connections one time, partition succeed connection(5) have released!"));
+ assertThat(ex.getMessage(), containsString("Can not get 6
connections one time, partition succeed connection(5) have released!"));
}
}
assertTrue(actual.isEmpty());
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 67c18d9..21d30c6 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
@@ -306,19 +306,14 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
String operator = "XOR";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
-
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
if (null != ctx.logicalOperator()) {
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
(ExpressionSegment) visit(ctx.expr(0)),
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)),
(ExpressionSegment) visit(ctx.expr(1)),
ctx.logicalOperator().getText(), text);
-
- return result;
}
- NotExpression result = new NotExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
- return result;
+ return new NotExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
}
@Override
@@ -329,8 +324,7 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
ctx.stop.getStopIndex()));
String operator = "IS";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
if (null != ctx.comparisonOperator() || null != ctx.SAFE_EQ_()) {
return createCompareSegment(ctx);
@@ -348,8 +342,7 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
}
String operator = null != ctx.SAFE_EQ_() ? ctx.SAFE_EQ_().getText() :
ctx.comparisonOperator().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@Override
@@ -370,7 +363,7 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
}
private InExpression createInSegment(final PredicateContext ctx) {
- boolean not = null != ctx.NOT() ? true : false;
+ boolean not = null != ctx.NOT();
ExpressionSegment left = (ExpressionSegment) visit(ctx.bitExpr(0));
ExpressionSegment right;
if (null != ctx.subquery()) {
@@ -381,8 +374,7 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
((ListExpression) right).getItems().add((ExpressionSegment)
visit(each));
}
}
- InExpression result = new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
- return result;
+ return new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
}
private BinaryOperationExpression
createBinaryOperationExpressionFromLike(final PredicateContext ctx) {
@@ -401,8 +393,7 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
operator = null != ctx.NOT() ? "NOT LIKE" : "LIKE";
}
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
private BinaryOperationExpression
createBinaryOperationExpressionFromRegexp(final PredicateContext ctx) {
@@ -410,18 +401,15 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
ExpressionSegment right = (ExpressionSegment) visit(ctx.bitExpr(1));
String operator = null != ctx.NOT() ? "NOT REGEXP" : "REGEXP";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
-
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
private BetweenExpression createBetweenSegment(final PredicateContext ctx)
{
ExpressionSegment left = (ExpressionSegment) visit(ctx.bitExpr(0));
ExpressionSegment between = (ExpressionSegment) visit(ctx.bitExpr(1));
ExpressionSegment and = (ExpressionSegment) visit(ctx.predicate());
- boolean not = null != ctx.NOT() ? true : false;
- BetweenExpression result = new
BetweenExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left,
between, and, not);
- return result;
+ boolean not = null != ctx.NOT();
+ return new BetweenExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, between, and, not);
}
@Override
@@ -433,8 +421,7 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
ExpressionSegment right = (ExpressionSegment) visit(ctx.getChild(2));
String operator = ctx.getChild(1).getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
private ExpressionSegment createLiteralExpression(final LiteralsContext
context) {
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
index 1b35ef9..f95b1f3 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
@@ -242,11 +242,9 @@ public abstract class OracleStatementSQLVisitor extends
OracleStatementBaseVisit
ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
String operator = ctx.logicalOperator().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
- NotExpression result = new NotExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
- return result;
+ return new NotExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
}
@Override
@@ -257,8 +255,7 @@ public abstract class OracleStatementSQLVisitor extends
OracleStatementBaseVisit
ctx.stop.getStopIndex()));
String operator = "IS";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
if (null != ctx.comparisonOperator() || null != ctx.SAFE_EQ_()) {
return createCompareSegment(ctx);
@@ -276,8 +273,7 @@ public abstract class OracleStatementSQLVisitor extends
OracleStatementBaseVisit
}
String operator = null != ctx.SAFE_EQ_() ? ctx.SAFE_EQ_().getText() :
ctx.comparisonOperator().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@Override
@@ -306,9 +302,8 @@ public abstract class OracleStatementSQLVisitor extends
OracleStatementBaseVisit
}
right = listExpression;
}
- boolean not = null != ctx.NOT() ? true : false;
- InExpression result = new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
- return result;
+ boolean not = null != ctx.NOT();
+ return new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
}
private BinaryOperationExpression
createBinaryOperationExpressionFromLike(final PredicateContext ctx) {
@@ -319,17 +314,15 @@ public abstract class OracleStatementSQLVisitor extends
OracleStatementBaseVisit
}
String operator = null != ctx.NOT() ? "NOT LIKE" : "LIKE";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
private BetweenExpression createBetweenSegment(final PredicateContext ctx)
{
ExpressionSegment left = (ExpressionSegment) visit(ctx.bitExpr(0));
ExpressionSegment between = (ExpressionSegment) visit(ctx.bitExpr(1));
ExpressionSegment and = (ExpressionSegment) visit(ctx.predicate());
- boolean not = null != ctx.NOT() ? true : false;
- BetweenExpression result = new
BetweenExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left,
between, and, not);
- return result;
+ boolean not = null != ctx.NOT();
+ return new BetweenExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, between, and, not);
}
@Override
@@ -341,8 +334,7 @@ public abstract class OracleStatementSQLVisitor extends
OracleStatementBaseVisit
ExpressionSegment right = (ExpressionSegment) visit(ctx.getChild(2));
String operator = ctx.getChild(1).getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
private ASTNode createExpressionSegment(final ASTNode astNode, final
ParserRuleContext context) {
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
index 7360a6c..d567169 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
@@ -395,8 +395,8 @@ public final class PostgreSQLDMLStatementSQLVisitor extends
PostgreSQLStatementS
public ASTNode visitTargetList(final TargetListContext ctx) {
ProjectionsSegment result = new
ProjectionsSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex());
if (null != ctx.targetList()) {
- ProjectionsSegment projecs = (ProjectionsSegment)
visit(ctx.targetList());
- result.getProjections().addAll(projecs.getProjections());
+ ProjectionsSegment projections = (ProjectionsSegment)
visit(ctx.targetList());
+ result.getProjections().addAll(projections.getProjections());
}
ProjectionSegment projection = (ProjectionSegment)
visit(ctx.targetEl());
result.getProjections().add(projection);
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
index c422c5c..034a4ba 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
@@ -187,16 +187,14 @@ public abstract class PostgreSQLStatementSQLVisitor
extends PostgreSQLStatementB
ExpressionSegment right = (ExpressionSegment) visit(ctx.aExpr(1));
String operator = ctx.comparisonOperator().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
if (null != ctx.logicalOperator()) {
ExpressionSegment left = (ExpressionSegment) visit(ctx.aExpr(0));
ExpressionSegment right = (ExpressionSegment) visit(ctx.aExpr(1));
String operator = ctx.logicalOperator().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
super.visitAExpr(ctx);
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
@@ -257,9 +255,8 @@ public abstract class PostgreSQLStatementSQLVisitor extends
PostgreSQLStatementB
private InExpression createInSegment(final AExprContext ctx) {
ExpressionSegment left = (ExpressionSegment) visit(ctx.aExpr(0));
ExpressionSegment right = visitInExpression(ctx.inExpr());
- boolean not = null != ctx.NOT() ? true : false;
- InExpression result = new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
- return result;
+ boolean not = null != ctx.NOT();
+ return new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
}
private ExpressionSegment visitInExpression(final InExprContext ctx) {
@@ -285,9 +282,8 @@ public abstract class PostgreSQLStatementSQLVisitor extends
PostgreSQLStatementB
ExpressionSegment left = (ExpressionSegment) visit(ctx.aExpr(0));
ExpressionSegment between = (ExpressionSegment) visit(ctx.bExpr());
ExpressionSegment and = (ExpressionSegment) visit(ctx.aExpr(1));
- boolean not = null != ctx.NOT() ? true : false;
- BetweenExpression result = new
BetweenExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left,
between, and, not);
- return result;
+ boolean not = null != ctx.NOT();
+ return new BetweenExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, between, and, not);
}
@Override
@@ -307,8 +303,7 @@ public abstract class PostgreSQLStatementSQLVisitor extends
PostgreSQLStatementB
right = (ExpressionSegment) visit(ctx.bExpr(1));
}
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
for (BExprContext each : ctx.bExpr()) {
visit(each);
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92StatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92StatementSQLVisitor.java
index 9119962..3a7a75a 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92StatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92StatementSQLVisitor.java
@@ -235,11 +235,9 @@ public abstract class SQL92StatementSQLVisitor extends
SQL92StatementBaseVisitor
ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
String operator = ctx.logicalOperator().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
- NotExpression result = new NotExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
- return result;
+ return new NotExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
}
@Override
@@ -250,8 +248,7 @@ public abstract class SQL92StatementSQLVisitor extends
SQL92StatementBaseVisitor
ctx.stop.getStopIndex()));
String operator = "IS";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
if (null != ctx.comparisonOperator() || null != ctx.SAFE_EQ_()) {
return createCompareSegment(ctx);
@@ -269,8 +266,7 @@ public abstract class SQL92StatementSQLVisitor extends
SQL92StatementBaseVisitor
}
String operator = null != ctx.SAFE_EQ_() ? ctx.SAFE_EQ_().getText() :
ctx.comparisonOperator().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@Override
@@ -295,8 +291,7 @@ public abstract class SQL92StatementSQLVisitor extends
SQL92StatementBaseVisitor
}
String operator = null != ctx.NOT() ? "NOT LIKE" : "LIKE";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
private InExpression createInSegment(final PredicateContext ctx) {
@@ -311,18 +306,16 @@ public abstract class SQL92StatementSQLVisitor extends
SQL92StatementBaseVisitor
}
right = listExpression;
}
- boolean not = null != ctx.NOT() ? true : false;
- InExpression result = new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
- return result;
+ boolean not = null != ctx.NOT();
+ return new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
}
private BetweenExpression createBetweenSegment(final PredicateContext ctx)
{
ExpressionSegment left = (ExpressionSegment) visit(ctx.bitExpr(0));
ExpressionSegment between = (ExpressionSegment) visit(ctx.bitExpr(1));
ExpressionSegment and = (ExpressionSegment) visit(ctx.predicate());
- boolean not = null != ctx.NOT() ? true : false;
- BetweenExpression result = new
BetweenExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left,
between, and, not);
- return result;
+ boolean not = null != ctx.NOT();
+ return new BetweenExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, between, and, not);
}
@Override
@@ -334,8 +327,7 @@ public abstract class SQL92StatementSQLVisitor extends
SQL92StatementBaseVisitor
ExpressionSegment right = (ExpressionSegment) visit(ctx.getChild(2));
String operator = ctx.getChild(1).getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
private ASTNode createExpressionSegment(final ASTNode astNode, final
ParserRuleContext context) {
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
index 0fb5894..aafade4 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
@@ -249,11 +249,9 @@ public abstract class SQLServerStatementSQLVisitor extends
SQLServerStatementBas
ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
String operator = ctx.logicalOperator().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
- NotExpression result = new NotExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
- return result;
+ return new NotExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
}
@Override
@@ -264,8 +262,7 @@ public abstract class SQLServerStatementSQLVisitor extends
SQLServerStatementBas
ctx.stop.getStopIndex()));
String operator = "IS";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
if (null != ctx.comparisonOperator() || null != ctx.SAFE_EQ_()) {
return createCompareSegment(ctx);
@@ -283,8 +280,7 @@ public abstract class SQLServerStatementSQLVisitor extends
SQLServerStatementBas
}
String operator = null != ctx.SAFE_EQ_() ? ctx.SAFE_EQ_().getText() :
ctx.comparisonOperator().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@Override
@@ -309,8 +305,7 @@ public abstract class SQLServerStatementSQLVisitor extends
SQLServerStatementBas
}
String operator = null != ctx.NOT() ? "NOT LIKE" : "LIKE";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
private InExpression createInSegment(final PredicateContext ctx) {
@@ -325,18 +320,16 @@ public abstract class SQLServerStatementSQLVisitor
extends SQLServerStatementBas
}
right = listExpression;
}
- boolean not = null != ctx.NOT() ? true : false;
- InExpression result = new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
- return result;
+ boolean not = null != ctx.NOT();
+ return new InExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, not);
}
private BetweenExpression createBetweenSegment(final PredicateContext ctx)
{
ExpressionSegment left = (ExpressionSegment) visit(ctx.bitExpr(0));
ExpressionSegment between = (ExpressionSegment) visit(ctx.bitExpr(1));
ExpressionSegment and = (ExpressionSegment) visit(ctx.predicate());
- boolean not = null != ctx.NOT() ? true : false;
- BetweenExpression result = new
BetweenExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left,
between, and, not);
- return result;
+ boolean not = null != ctx.NOT();
+ return new BetweenExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, between, and, not);
}
@Override
@@ -348,8 +341,7 @@ public abstract class SQLServerStatementSQLVisitor extends
SQLServerStatementBas
ExpressionSegment right = (ExpressionSegment) visit(ctx.getChild(2));
String operator = ctx.getChild(1).getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- BinaryOperationExpression result = new
BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
left, right, operator, text);
- return result;
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
private ASTNode createExpressionSegment(final ASTNode astNode, final
ParserRuleContext context) {
