(shardingsphere) branch master updated: Fix duplicated like rewrite columns (#33799)

[duanzhengqiang]

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 4d263d5b4b9 Fix duplicated like rewrite columns (#33799)
4d263d5b4b9 is described below

commit 4d263d5b4b989ae0facfed9d157687c2ab2962f1
Author: ZhangCheng <chengzh...@apache.org>
AuthorDate: Mon Nov 25 19:34:03 2024 +0800

    Fix duplicated like rewrite columns (#33799)
---
 .../generator/projection/EncryptProjectionTokenGenerator.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptProjectionTokenGenerator.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptProjectionTokenGenerator.java
index 1afb0c57aea..a05860fa1df 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptProjectionTokenGenerator.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptProjectionTokenGenerator.java
@@ -244,12 +244,12 @@ public final class EncryptProjectionTokenGenerator {
         result.add(new 
ColumnProjection(columnProjection.getOwner().orElse(null), cipherColumnName, 
alias, databaseType, leftParentheses, rightParentheses));
         if (newAddedColumn) {
             result.add(new 
ColumnProjection(columnProjection.getOwner().orElse(null), cipherColumnName, 
null, databaseType));
+            IdentifierValue assistedColumOwner = 
columnProjection.getOwner().orElse(null);
+            encryptColumn.getAssistedQuery().ifPresent(
+                    optional -> result.add(new 
ColumnProjection(assistedColumOwner, new IdentifierValue(optional.getName(), 
quoteCharacter), null, databaseType, leftParentheses, rightParentheses)));
+            encryptColumn.getLikeQuery().ifPresent(
+                    optional -> result.add(new 
ColumnProjection(assistedColumOwner, new IdentifierValue(optional.getName(), 
quoteCharacter), null, databaseType, leftParentheses, rightParentheses)));
         }
-        IdentifierValue assistedColumOwner = 
columnProjection.getOwner().orElse(null);
-        encryptColumn.getAssistedQuery().ifPresent(
-                optional -> result.add(new 
ColumnProjection(assistedColumOwner, new IdentifierValue(optional.getName(), 
quoteCharacter), null, databaseType, leftParentheses, rightParentheses)));
-        encryptColumn.getLikeQuery().ifPresent(
-                optional -> result.add(new 
ColumnProjection(assistedColumOwner, new IdentifierValue(optional.getName(), 
quoteCharacter), null, databaseType, leftParentheses, rightParentheses)));
         return result;
     }