You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by xi...@apache.org on 2020/10/16 13:06:54 UTC
[shardingsphere] branch master updated: fix #7809 (#7816)
This is an automated email from the ASF dual-hosted git repository.
xiaoyu 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 815f59e fix #7809 (#7816)
815f59e is described below
commit 815f59e4d5460124cfa90d81240992e44ff4c62e
Author: kimmking <ki...@163.com>
AuthorDate: Fri Oct 16 21:06:20 2020 +0800
fix #7809 (#7816)
---
.../impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java
index 0dc926c..5ae9adf 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java
@@ -55,9 +55,10 @@ public final class GeneratedKeyInsertValuesTokenGenerator extends BaseGeneratedK
Preconditions.checkState(generatedKey.isPresent());
Iterator<Comparable<?>> generatedValues = generatedKey.get().getGeneratedValues().iterator();
int count = 0;
+ List<List<Object>> parameters = insertStatementContext.getGroupedParameters();
for (InsertValueContext each : insertStatementContext.getInsertValueContexts()) {
InsertValue insertValueToken = result.get().getInsertValues().get(count);
- DerivedSimpleExpressionSegment expressionSegment = isToAddDerivedLiteralExpression(insertStatementContext, count)
+ DerivedSimpleExpressionSegment expressionSegment = isToAddDerivedLiteralExpression(parameters, count)
? new DerivedLiteralExpressionSegment(generatedValues.next()) : new DerivedParameterMarkerExpressionSegment(each.getParameterCount());
insertValueToken.getValues().add(expressionSegment);
count++;
@@ -74,7 +75,7 @@ public final class GeneratedKeyInsertValuesTokenGenerator extends BaseGeneratedK
return Optional.empty();
}
- private boolean isToAddDerivedLiteralExpression(final InsertStatementContext insertStatementContext, final int insertValueCount) {
- return insertStatementContext.getGroupedParameters().get(insertValueCount).isEmpty();
+ private boolean isToAddDerivedLiteralExpression(final List<List<Object>> parameters, final int insertValueCount) {
+ return parameters.get(insertValueCount).isEmpty();
}
}