From 8d8d59e45c083df9252e8ef111ef61f599be9f51 Mon Sep 17 00:00:00 2001 From: Cong Hu Date: Wed, 23 Oct 2024 14:14:25 +0800 Subject: [PATCH 1/2] Refactor EncryptProjectionTokenGenerator. (#33360) --- .../generator/projection/EncryptProjectionTokenGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b870cf68eb5f1..9b321eda5b876 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 @@ -176,8 +176,8 @@ private ColumnProjection generateProjection(final EncryptColumn encryptColumn, f private Collection generateProjectionsInTableSegmentSubquery(final EncryptColumn encryptColumn, final ColumnProjection columnProjection, final SubqueryType subqueryType) { Collection result = new LinkedList<>(); QuoteCharacter quoteCharacter = columnProjection.getName().getQuoteCharacter(); - IdentifierValue cipherColumnName = new IdentifierValue(encryptColumn.getCipher().getName(), quoteCharacter); IdentifierValue alias = SubqueryType.JOIN == subqueryType ? null : columnProjection.getAlias().orElse(columnProjection.getName()); + IdentifierValue cipherColumnName = new IdentifierValue(encryptColumn.getCipher().getName(), quoteCharacter); ParenthesesSegment leftParentheses = columnProjection.getLeftParentheses().orElse(null); ParenthesesSegment rightParentheses = columnProjection.getRightParentheses().orElse(null); result.add(new ColumnProjection(columnProjection.getOwner().orElse(null), cipherColumnName, alias, databaseType, leftParentheses, rightParentheses)); From 025e9b2d146c2d0cb020c7061dd133a61c86972c Mon Sep 17 00:00:00 2001 From: ZhangCheng Date: Wed, 23 Oct 2024 14:29:55 +0800 Subject: [PATCH 2/2] Add release note for #33357 (#33362) --- RELEASE-NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index ccf21e3cdb13d..97fbe89bb631b 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -15,6 +15,7 @@ 1. Mode: Fixes `JDBCRepository` improper handling of H2-database in memory mode - [#33281](https://github.com/apache/shardingsphere/issues/33281) 1. SQL Binder: Use Multimap and CaseInsensitiveString to replace CaseInsensitiveMap for supporting mysql multi table join with same table alias - [#33303](https://github.com/apache/shardingsphere/pull/33303) +1. Fix the combine statement cannot find the outer table when bind - [#33357](https://github.com/apache/shardingsphere/pull/33357) ### Change Logs