(shardingsphere) branch master updated: Refactor EncryptSQLRewriteContextDecorator (#32252)

[zhangliang]

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 4d7749675cf Refactor EncryptSQLRewriteContextDecorator (#32252)
4d7749675cf is described below

commit 4d7749675cfab1698a29869e1eafe2c68aea3ea7
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Jul 24 21:43:10 2024 +0800

    Refactor EncryptSQLRewriteContextDecorator (#32252)
---
 .../encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
index de73dd67176..38ee7e74010 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
@@ -31,6 +31,7 @@ import 
org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
 import org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContext;
 import 
org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContextDecorator;
 import 
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
+import 
org.apache.shardingsphere.infra.rewrite.sql.token.generator.SQLTokenGenerator;
 import org.apache.shardingsphere.infra.route.context.RouteContext;
 import 
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
 import 
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment;
@@ -57,7 +58,8 @@ public final class EncryptSQLRewriteContextDecorator 
implements SQLRewriteContex
                     new EncryptParameterRewriterBuilder(encryptRule, 
databaseName, sqlRewriteContext.getDatabase().getSchemas(), 
sqlStatementContext, encryptConditions).getParameterRewriters();
             rewriteParameters(sqlRewriteContext, parameterRewriters);
         }
-        sqlRewriteContext.addSQLTokenGenerators(new 
EncryptTokenGenerateBuilder(encryptRule, sqlStatementContext, 
encryptConditions, databaseName).getSQLTokenGenerators());
+        Collection<SQLTokenGenerator> sqlTokenGenerators = new 
EncryptTokenGenerateBuilder(encryptRule, sqlStatementContext, 
encryptConditions, databaseName).getSQLTokenGenerators();
+        sqlRewriteContext.addSQLTokenGenerators(sqlTokenGenerators);
     }
     
     private boolean containsEncryptTable(final EncryptRule encryptRule, final 
SQLStatementContext sqlStatementContext) {