(shardingsphere) branch master updated: Refactor EncryptProjectionTokenGenerator (#32329)

[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 a68257f29e4 Refactor EncryptProjectionTokenGenerator (#32329)
a68257f29e4 is described below

commit a68257f29e42210521ffeec09cdca56ad3b086a4
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Jul 30 15:21:14 2024 +0800

    Refactor EncryptProjectionTokenGenerator (#32329)
---
 .../generator/projection/EncryptProjectionTokenGenerator.java    | 9 ++++-----
 1 file changed, 4 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 09a15c320fb..69ec9740e0d 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
@@ -155,9 +155,8 @@ public final class EncryptProjectionTokenGenerator {
     
     private ColumnProjection generateProjection(final EncryptColumn 
encryptColumn, final ColumnProjection columnProjection, final boolean 
shorthandProjection) {
         IdentifierValue encryptColumnOwner = shorthandProjection ? 
columnProjection.getOwner().orElse(null) : null;
-        String encryptColumnName = encryptColumn.getCipher().getName();
-        return new ColumnProjection(encryptColumnOwner, new 
IdentifierValue(encryptColumnName, 
columnProjection.getName().getQuoteCharacter()),
-                
columnProjection.getAlias().orElse(columnProjection.getName()), databaseType);
+        IdentifierValue cipherColumnName = new 
IdentifierValue(encryptColumn.getCipher().getName(), 
columnProjection.getName().getQuoteCharacter());
+        return new ColumnProjection(encryptColumnOwner, cipherColumnName, 
columnProjection.getAlias().orElse(columnProjection.getName()), databaseType);
     }
     
     private Collection<Projection> 
generateProjectionsInTableSegmentSubquery(final EncryptColumn encryptColumn, 
final ColumnProjection columnProjection,
@@ -165,9 +164,9 @@ public final class EncryptProjectionTokenGenerator {
         Collection<Projection> result = new LinkedList<>();
         IdentifierValue encryptColumnOwner = shorthandProjection ? 
columnProjection.getOwner().orElse(null) : null;
         QuoteCharacter quoteCharacter = 
columnProjection.getName().getQuoteCharacter();
-        IdentifierValue columnName = new 
IdentifierValue(encryptColumn.getCipher().getName(), quoteCharacter);
+        IdentifierValue cipherColumnName = new 
IdentifierValue(encryptColumn.getCipher().getName(), quoteCharacter);
         IdentifierValue alias = SubqueryType.JOIN == subqueryType ? null : 
columnProjection.getAlias().orElse(columnProjection.getName());
-        result.add(new ColumnProjection(encryptColumnOwner, columnName, alias, 
databaseType));
+        result.add(new ColumnProjection(encryptColumnOwner, cipherColumnName, 
alias, databaseType));
         IdentifierValue assistedColumOwner = 
columnProjection.getOwner().orElse(null);
         encryptColumn.getAssistedQuery().ifPresent(optional -> result.add(new 
ColumnProjection(assistedColumOwner, new IdentifierValue(optional.getName(), 
quoteCharacter), null, databaseType)));
         encryptColumn.getLikeQuery().ifPresent(optional -> result.add(new 
ColumnProjection(assistedColumOwner, new IdentifierValue(optional.getName(), 
quoteCharacter), null, databaseType)));