You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/07/09 07:28:11 UTC
[shardingsphere] branch master updated: Fix sonar issue on EncryptMergedResult (#26853)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 d6cc56e1e16 Fix sonar issue on EncryptMergedResult (#26853)
d6cc56e1e16 is described below
commit d6cc56e1e1633ef6ed563078ca14f63948e86c93
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Jul 9 15:28:04 2023 +0800
Fix sonar issue on EncryptMergedResult (#26853)
---
.../apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java
index a700d62bdf2..f5366a687c6 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java
@@ -66,10 +66,10 @@ public final class EncryptMergedResult implements MergedResult {
ColumnProjection originalColumn = new ColumnProjection(columnProjection.get().getOriginalOwner(), columnProjection.get().getOriginalName(), null);
Map<String, String> expressionTableNames = tablesContext.findTableNamesByColumnProjection(Collections.singletonList(originalColumn), database.getSchema(schemaName));
Optional<String> tableName = findTableName(originalColumn, expressionTableNames);
- String originalColumnName = originalColumn.getName();
if (!tableName.isPresent()) {
return mergedResult.getValue(columnIndex, type);
}
+ String originalColumnName = originalColumn.getName();
if (!encryptRule.findEncryptTable(tableName.get()).map(optional -> optional.isEncryptColumn(originalColumnName)).orElse(false)) {
return mergedResult.getValue(columnIndex, type);
}