[shardingsphere] branch master updated: Refactor EncryptShowCreateTableMergedResult (#26520)

[sunnianjun]

This is an automated email from the ASF dual-hosted git repository.

sunnianjun 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 832a150db01 Refactor EncryptShowCreateTableMergedResult (#26520)
832a150db01 is described below

commit 832a150db01f452c162c09eef4c5a51ab6a3d827
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Jun 24 19:28:20 2023 +0800

    Refactor EncryptShowCreateTableMergedResult (#26520)
---
 .../merge/dal/show/EncryptShowCreateTableMergedResult.java       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
index 033466e2873..a95472b00f6 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
@@ -87,15 +87,16 @@ public abstract class EncryptShowCreateTableMergedResult 
implements MergedResult
         if (encryptTable.isCipherColumn(columnName)) {
             return Optional.of(columnDefinition.replace(columnName, 
encryptTable.getLogicColumnByCipherColumn(columnName)));
         }
-        if (encryptTable.isAssistedQueryColumn(columnName)) {
-            return Optional.empty();
-        }
-        if (encryptTable.isLikeQueryColumn(columnName)) {
+        if (isDerivedColumn(encryptTable, columnName)) {
             return Optional.empty();
         }
         return Optional.of(columnDefinition);
     }
     
+    private boolean isDerivedColumn(final EncryptTable encryptTable, final 
String columnName) {
+        return encryptTable.isAssistedQueryColumn(columnName) || 
encryptTable.isLikeQueryColumn(columnName);
+    }
+    
     @Override
     public final Object getCalendarValue(final int columnIndex, final Class<?> 
type, final Calendar calendar) throws SQLException {
         throw new SQLFeatureNotSupportedException("");