You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/06/20 06:40:07 UTC
(shardingsphere) branch master updated: Refactor EncryptShowColumnsMergedResult (#35761)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 b0f5431e318 Refactor EncryptShowColumnsMergedResult (#35761)
b0f5431e318 is described below
commit b0f5431e318615afc00e6e95191ecb0eb4bac357
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Jun 20 14:40:01 2025 +0800
Refactor EncryptShowColumnsMergedResult (#35761)
---
.../merge/dal/show/EncryptShowColumnsMergedResult.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
index 1dccd8ce5bc..74e555c3c2d 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
@@ -78,17 +78,17 @@ public final class EncryptShowColumnsMergedResult implements MergedResult {
@Override
public Object getValue(final int columnIndex, final Class<?> type) throws SQLException {
if (COLUMN_FIELD_INDEX == columnIndex) {
- String columnName = mergedResult.getValue(COLUMN_FIELD_INDEX, type).toString();
- Optional<EncryptTable> encryptTable = rule.findEncryptTable(tableName);
- if (!encryptTable.isPresent()) {
- return columnName;
- }
- Optional<String> logicColumn = encryptTable.get().isCipherColumn(columnName) ? Optional.of(encryptTable.get().getLogicColumnByCipherColumn(columnName)) : Optional.empty();
- return logicColumn.orElse(columnName);
+ return getColumnNameValue(type);
}
return mergedResult.getValue(columnIndex, type);
}
+ private String getColumnNameValue(final Class<?> type) throws SQLException {
+ String columnName = mergedResult.getValue(COLUMN_FIELD_INDEX, type).toString();
+ Optional<EncryptTable> encryptTable = rule.findEncryptTable(tableName);
+ return encryptTable.isPresent() && encryptTable.get().isCipherColumn(columnName) ? encryptTable.get().getLogicColumnByCipherColumn(columnName) : columnName;
+ }
+
@Override
public Object getCalendarValue(final int columnIndex, final Class<?> type, @SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) throws SQLException {
throw new SQLFeatureNotSupportedException("");