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 cf2839510b6 Refactor EncryptProjectionTokenGenerator (#32312)
cf2839510b6 is described below
commit cf2839510b6ccdefa99cdc922a983d982b353df7
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jul 29 00:23:32 2024 +0800
Refactor EncryptProjectionTokenGenerator (#32312)
---
.../projection/EncryptProjectionTokenGenerator.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 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 beae37eed05..6e1d5fbf500 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
@@ -124,14 +124,6 @@ public final class EncryptProjectionTokenGenerator {
: new ColumnSegmentBoundInfo(new
IdentifierValue(projection.getColumnLabel()));
}
- private ColumnProjection buildColumnProjection(final
ColumnProjectionSegment segment) {
- IdentifierValue owner =
segment.getColumn().getOwner().map(OwnerSegment::getIdentifier).orElse(null);
- ColumnProjection result = new ColumnProjection(owner,
segment.getColumn().getIdentifier(), segment.getAliasName().isPresent() ?
segment.getAlias().orElse(null) : null, databaseType);
-
result.setOriginalColumn(segment.getColumn().getColumnBoundInfo().getOriginalColumn());
-
result.setOriginalTable(segment.getColumn().getColumnBoundInfo().getOriginalTable());
- return result;
- }
-
private Optional<SubstitutableColumnNameToken> generateSQLToken(final
SelectStatementContext selectStatementContext, final ColumnProjectionSegment
columnSegment) {
ColumnProjection columnProjection =
buildColumnProjection(columnSegment);
String columnName = columnProjection.getOriginalColumn().getValue();
@@ -166,6 +158,14 @@ public final class EncryptProjectionTokenGenerator {
return new SubstitutableColumnNameToken(startIndex,
segment.getStopIndex(), projections, selectStatementContext.getDatabaseType());
}
+ private ColumnProjection buildColumnProjection(final
ColumnProjectionSegment segment) {
+ IdentifierValue owner =
segment.getColumn().getOwner().map(OwnerSegment::getIdentifier).orElse(null);
+ ColumnProjection result = new ColumnProjection(owner,
segment.getColumn().getIdentifier(), segment.getAliasName().isPresent() ?
segment.getAlias().orElse(null) : null, databaseType);
+
result.setOriginalColumn(segment.getColumn().getColumnBoundInfo().getOriginalColumn());
+
result.setOriginalTable(segment.getColumn().getColumnBoundInfo().getOriginalTable());
+ return result;
+ }
+
private Collection<Projection> generateProjections(final EncryptColumn
encryptColumn, final ColumnProjection columnProjection,
final SubqueryType
subqueryType, final boolean shorthandProjection) {
if (null == subqueryType || SubqueryType.PROJECTION == subqueryType) {
