This is an automated email from the ASF dual-hosted git repository.
panjuan 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 875fa790394 Remove EncryptTable.getCipherColumn() (#26504)
875fa790394 is described below
commit 875fa7903941af62aea3ad2924b4afd8c5e47e72
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jun 22 22:39:08 2023 +0800
Remove EncryptTable.getCipherColumn() (#26504)
---
.../merge/dal/show/EncryptShowCreateTableMergedResult.java | 2 +-
.../token/generator/EncryptAlterTableTokenGenerator.java | 12 ++++++------
.../token/generator/EncryptAssignmentTokenGenerator.java | 4 ++--
.../token/generator/EncryptCreateTableTokenGenerator.java | 4 ++--
.../EncryptForUseDefaultInsertColumnsTokenGenerator.java | 2 +-
.../token/generator/EncryptIndexColumnTokenGenerator.java | 2 +-
.../token/generator/EncryptOrderByItemTokenGenerator.java | 2 +-
.../generator/EncryptPredicateColumnTokenGenerator.java | 3 +--
.../token/generator/EncryptProjectionTokenGenerator.java | 8 ++++----
.../insert/EncryptInsertOnUpdateTokenGenerator.java | 6 +++---
.../token/generator/EncryptAlterTableTokenGeneratorTest.java | 6 +++---
.../generator/EncryptCreateTableTokenGeneratorTest.java | 4 ++--
.../insert/EncryptInsertOnUpdateTokenGeneratorTest.java | 4 ++--
.../apache/shardingsphere/encrypt/rule/EncryptTableTest.java | 5 -----
14 files changed, 29 insertions(+), 35 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
index f80cc9c703d..c00a882265d 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
@@ -81,7 +81,7 @@ public abstract class EncryptShowCreateTableMergedResult
implements MergedResult
}
private Optional<String> findLogicColumnDefinition(final String
columnDefinition, final EncryptTable encryptTable) {
- Collection<String> cipherColumns =
encryptTable.getLogicColumns().stream().map(encryptTable::getCipherColumn).collect(Collectors.toList());
+ Collection<String> cipherColumns =
encryptTable.getLogicColumns().stream().map(each ->
encryptTable.getEncryptColumn(each).getCipher().getName()).collect(Collectors.toList());
for (String each : cipherColumns) {
if (columnDefinition.contains(each)) {
return Optional.of(columnDefinition.replace(each,
encryptTable.getLogicColumnByCipherColumn(each)));
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
index aa9806fded2..b0631a0476b 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
@@ -106,7 +106,7 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
Collection<SQLToken> result = new LinkedList<>();
result.add(new RemoveToken(columnDefinitionSegment.getStartIndex(),
columnDefinitionSegment.getColumnName().getStopIndex()));
result.add(new
EncryptAlterTableToken(columnDefinitionSegment.getColumnName().getStopIndex() +
1, columnDefinitionSegment.getColumnName().getStopIndex(),
- encryptTable.getCipherColumn(columnName), null));
+
encryptTable.getEncryptColumn(columnName).getCipher().getName(), null));
encryptTable.findAssistedQueryColumn(columnName).map(optional -> new
EncryptAlterTableToken(
addColumnDefinitionSegment.getStopIndex() + 1,
columnDefinitionSegment.getColumnName().getStopIndex(), optional, ", ADD
COLUMN")).ifPresent(result::add);
encryptTable.findLikeQueryColumn(columnName).map(optional -> new
EncryptAlterTableToken(
@@ -142,7 +142,7 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
ColumnDefinitionSegment columnDefinitionSegment =
modifyColumnDefinitionSegment.getColumnDefinition();
result.add(new
RemoveToken(columnDefinitionSegment.getColumnName().getStartIndex(),
columnDefinitionSegment.getColumnName().getStopIndex()));
result.add(new
EncryptAlterTableToken(columnDefinitionSegment.getColumnName().getStopIndex() +
1, columnDefinitionSegment.getColumnName().getStopIndex(),
- encryptTable.getCipherColumn(columnName), null));
+
encryptTable.getEncryptColumn(columnName).getCipher().getName(), null));
encryptTable.findAssistedQueryColumn(columnName).map(optional -> new
EncryptAlterTableToken(modifyColumnDefinitionSegment.getStopIndex() + 1,
columnDefinitionSegment.getColumnName().getStopIndex(),
optional, ", MODIFY COLUMN")).ifPresent(result::add);
encryptTable.findLikeQueryColumn(columnName).map(optional -> new
EncryptAlterTableToken(modifyColumnDefinitionSegment.getStopIndex() + 1,
@@ -152,7 +152,7 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
private EncryptAlterTableToken getPositionColumnToken(final EncryptTable
encryptTable, final ColumnPositionSegment positionSegment) {
return new
EncryptAlterTableToken(positionSegment.getColumnName().getStartIndex(),
positionSegment.getStopIndex(),
-
encryptTable.getCipherColumn(positionSegment.getColumnName().getIdentifier().getValue()),
null);
+
encryptTable.getEncryptColumn(positionSegment.getColumnName().getIdentifier().getValue()).getCipher().getName(),
null);
}
private Optional<SQLToken> getColumnPositionToken(final EncryptTable
encryptTable, final ColumnPositionSegment columnPositionSegment) {
@@ -209,7 +209,7 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
Collection<SQLToken> result = new LinkedList<>();
result.add(new
RemoveToken(segment.getColumnDefinition().getColumnName().getStartIndex(),
segment.getColumnDefinition().getColumnName().getStopIndex()));
result.add(new
EncryptAlterTableToken(segment.getColumnDefinition().getColumnName().getStopIndex()
+ 1, segment.getColumnDefinition().getColumnName().getStopIndex(),
-
encryptTable.getCipherColumn(segment.getColumnDefinition().getColumnName().getIdentifier().getValue()),
null));
+
encryptTable.getEncryptColumn(segment.getColumnDefinition().getColumnName().getIdentifier().getValue()).getCipher().getName(),
null));
String previousColumnName =
segment.getPreviousColumn().getIdentifier().getValue();
EncryptColumn encryptColumn =
encryptTable.getEncryptColumn(segment.getColumnDefinition().getColumnName().getIdentifier().getValue());
encryptTable.findAssistedQueryColumn(previousColumnName)
@@ -227,7 +227,7 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
Collection<SQLToken> result = new LinkedList<>();
result.add(new
RemoveToken(segment.getPreviousColumn().getStartIndex(),
segment.getPreviousColumn().getStopIndex()));
result.add(new
EncryptAlterTableToken(segment.getPreviousColumn().getStopIndex() + 1,
segment.getPreviousColumn().getStopIndex(),
-
encryptTable.getCipherColumn(segment.getPreviousColumn().getIdentifier().getValue()),
null));
+
encryptTable.getEncryptColumn(segment.getPreviousColumn().getIdentifier().getValue()).getCipher().getName(),
null));
return result;
}
@@ -254,7 +254,7 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
final ColumnSegment
columnSegment, final DropColumnDefinitionSegment dropColumnDefinitionSegment) {
Collection<SQLToken> result = new LinkedList<>();
result.add(new RemoveToken(columnSegment.getStartIndex(),
columnSegment.getStopIndex()));
- result.add(new EncryptAlterTableToken(columnSegment.getStopIndex() +
1, columnSegment.getStopIndex(), encryptTable.getCipherColumn(columnName),
null));
+ result.add(new EncryptAlterTableToken(columnSegment.getStopIndex() +
1, columnSegment.getStopIndex(),
encryptTable.getEncryptColumn(columnName).getCipher().getName(), null));
encryptTable.findAssistedQueryColumn(columnName).map(optional -> new
EncryptAlterTableToken(dropColumnDefinitionSegment.getStopIndex() + 1,
dropColumnDefinitionSegment.getStopIndex(), optional, ", DROP
COLUMN")).ifPresent(result::add);
encryptTable.findLikeQueryColumn(columnName).map(optional -> new
EncryptAlterTableToken(dropColumnDefinitionSegment.getStopIndex() + 1,
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
index 0e622b201a0..211fa41585f 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
@@ -102,7 +102,7 @@ public final class EncryptAssignmentTokenGenerator
implements CollectionSQLToken
private EncryptAssignmentToken generateParameterSQLToken(final
EncryptTable encryptTable, final AssignmentSegment assignmentSegment) {
EncryptParameterAssignmentToken result = new
EncryptParameterAssignmentToken(assignmentSegment.getColumns().get(0).getStartIndex(),
assignmentSegment.getStopIndex());
String columnName =
assignmentSegment.getColumns().get(0).getIdentifier().getValue();
- result.addColumnName(encryptTable.getCipherColumn(columnName));
+
result.addColumnName(encryptTable.getEncryptColumn(columnName).getCipher().getName());
encryptTable.findAssistedQueryColumn(columnName).ifPresent(result::addColumnName);
encryptTable.findLikeQueryColumn(columnName).ifPresent(result::addColumnName);
return result;
@@ -121,7 +121,7 @@ public final class EncryptAssignmentTokenGenerator
implements CollectionSQLToken
Object originalValue = ((LiteralExpressionSegment)
assignmentSegment.getValue()).getLiterals();
Object cipherValue = encryptColumn.getCipher().encrypt(databaseName,
schemaName, encryptTable.getTable(),
assignmentSegment.getColumns().get(0).getIdentifier().getValue(),
Collections.singletonList(originalValue)).iterator().next();
-
token.addAssignment(encryptTable.getCipherColumn(assignmentSegment.getColumns().get(0).getIdentifier().getValue()),
cipherValue);
+
token.addAssignment(encryptTable.getEncryptColumn(assignmentSegment.getColumns().get(0).getIdentifier().getValue()).getCipher().getName(),
cipherValue);
}
private void addAssistedQueryAssignment(final String schemaName, final
EncryptTable encryptTable, final EncryptColumn encryptColumn,
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGenerator.java
index 46b0160dd68..841541f55c3 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGenerator.java
@@ -81,8 +81,8 @@ public final class EncryptCreateTableTokenGenerator
implements CollectionSQLToke
}
private SQLToken getCipherColumnToken(final EncryptTable encryptTable,
final String columnName, final ColumnDefinitionSegment column, final int
stopIndex) {
- return new SubstitutableColumnNameToken(stopIndex + 1,
column.getColumnName().getStopIndex(), getColumnProjections(new
IdentifierValue(encryptTable.getCipherColumn(columnName),
- column.getColumnName().getIdentifier().getQuoteCharacter())));
+ return new SubstitutableColumnNameToken(stopIndex + 1,
column.getColumnName().getStopIndex(),
+ getColumnProjections(new
IdentifierValue(encryptTable.getEncryptColumn(columnName).getCipher().getName(),
column.getColumnName().getIdentifier().getQuoteCharacter())));
}
private Optional<? extends SQLToken> getAssistedQueryColumnToken(final
EncryptTable encryptTable, final String columnName, final
ColumnDefinitionSegment column,
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGenerator.java
index 724c4ea8c9e..6ec287fe551 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGenerator.java
@@ -113,6 +113,6 @@ public final class
EncryptForUseDefaultInsertColumnsTokenGenerator implements Op
}
private void setCipherColumn(final List<String> columnNames, final
EncryptTable encryptTable, final String columnName, final int columnIndex) {
- columnNames.set(columnIndex, encryptTable.getCipherColumn(columnName));
+ columnNames.set(columnIndex,
encryptTable.getEncryptColumn(columnName).getCipher().getName());
}
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptIndexColumnTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptIndexColumnTokenGenerator.java
index 3a9af83048a..494113fee3c 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptIndexColumnTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptIndexColumnTokenGenerator.java
@@ -83,7 +83,7 @@ public final class EncryptIndexColumnTokenGenerator
implements CollectionSQLToke
}
private Optional<SQLToken> getCipherColumnToken(final EncryptTable
encryptTable, final int startIndex, final int stopIndex, final String
columnName, final QuoteCharacter quoteCharacter) {
- String cipherColumn = encryptTable.getCipherColumn(columnName);
+ String cipherColumn =
encryptTable.getEncryptColumn(columnName).getCipher().getName();
Collection<Projection> columnProjections =
getColumnProjections(cipherColumn, quoteCharacter);
return Optional.of(new SubstitutableColumnNameToken(startIndex,
stopIndex, columnProjections, quoteCharacter));
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
index e49662969ed..1e59c6bf6ed 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
@@ -89,7 +89,7 @@ public final class EncryptOrderByItemTokenGenerator
implements CollectionSQLToke
Optional<String> assistedQueryColumn =
encryptTable.get().findAssistedQueryColumn(column.getIdentifier().getValue());
SubstitutableColumnNameToken encryptColumnNameToken =
assistedQueryColumn.map(optional -> new
SubstitutableColumnNameToken(startIndex, stopIndex,
createColumnProjections(optional,
column.getIdentifier().getQuoteCharacter()))).orElseGet(() -> new
SubstitutableColumnNameToken(startIndex, stopIndex,
-
createColumnProjections(encryptTable.get().getCipherColumn(column.getIdentifier().getValue()),
column.getIdentifier().getQuoteCharacter())));
+
createColumnProjections(encryptTable.get().getEncryptColumn(column.getIdentifier().getValue()).getCipher().getName(),
column.getIdentifier().getQuoteCharacter())));
result.add(encryptColumnNameToken);
}
return result;
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java
index ae769607a4b..907afa35180 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java
@@ -104,8 +104,7 @@ public final class EncryptPredicateColumnTokenGenerator
implements CollectionSQL
}
Collection<Projection> columnProjections =
encryptTable.findAssistedQueryColumn(logicColumn).map(optional
-> createColumnProjections(optional,
columnSegment.getIdentifier().getQuoteCharacter()))
- .orElseGet(() ->
createColumnProjections(encryptTable.getCipherColumn(logicColumn),
-
columnSegment.getIdentifier().getQuoteCharacter()));
+ .orElseGet(() ->
createColumnProjections(encryptTable.getEncryptColumn(logicColumn).getCipher().getName(),
columnSegment.getIdentifier().getQuoteCharacter()));
return new SubstitutableColumnNameToken(startIndex, stopIndex,
columnProjections);
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
index 8a0948571fe..21e1041d936 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
@@ -179,13 +179,13 @@ public final class EncryptProjectionTokenGenerator
implements CollectionSQLToken
if (assistedQueryColumn.isPresent()) {
return new ColumnProjection(column.getOwnerIdentifier(), new
IdentifierValue(assistedQueryColumn.get(),
column.getNameIdentifier().getQuoteCharacter()), null);
}
- String cipherColumn = encryptTable.getCipherColumn(column.getName());
+ String cipherColumn =
encryptTable.getEncryptColumn(column.getName()).getCipher().getName();
return new ColumnProjection(column.getOwnerIdentifier(), new
IdentifierValue(cipherColumn, column.getNameIdentifier().getQuoteCharacter()),
null);
}
private Collection<ColumnProjection>
generateTableSubqueryProjections(final EncryptTable encryptTable, final
ColumnProjection column, final boolean shorthand) {
Collection<ColumnProjection> result = new LinkedList<>();
- result.add(distinctOwner(new
ColumnProjection(column.getOwnerIdentifier(), new
IdentifierValue(encryptTable.getCipherColumn(column.getName()),
+ result.add(distinctOwner(new
ColumnProjection(column.getOwnerIdentifier(), new
IdentifierValue(encryptTable.getEncryptColumn(column.getName()).getCipher().getName(),
column.getNameIdentifier().getQuoteCharacter()), null),
shorthand));
Optional<String> assistedQueryColumn =
encryptTable.findAssistedQueryColumn(column.getName());
assistedQueryColumn.ifPresent(optional -> result.add(new
ColumnProjection(column.getOwnerIdentifier(), new IdentifierValue(optional,
column.getNameIdentifier().getQuoteCharacter()), null)));
@@ -194,13 +194,13 @@ public final class EncryptProjectionTokenGenerator
implements CollectionSQLToken
private Collection<ColumnProjection>
generateExistsSubqueryProjections(final EncryptTable encryptTable, final
ColumnProjection column, final boolean shorthand) {
Collection<ColumnProjection> result = new LinkedList<>();
- result.add(distinctOwner(new
ColumnProjection(column.getOwnerIdentifier(), new
IdentifierValue(encryptTable.getCipherColumn(column.getName()),
+ result.add(distinctOwner(new
ColumnProjection(column.getOwnerIdentifier(), new
IdentifierValue(encryptTable.getEncryptColumn(column.getName()).getCipher().getName(),
column.getNameIdentifier().getQuoteCharacter()), null),
shorthand));
return result;
}
private ColumnProjection generateCommonProjection(final EncryptTable
encryptTable, final ColumnProjection column, final ShorthandProjectionSegment
segment) {
- String encryptColumnName =
encryptTable.getCipherColumn(column.getName());
+ String encryptColumnName =
encryptTable.getEncryptColumn(column.getName()).getCipher().getName();
IdentifierValue owner = (null == segment ||
!segment.getOwner().isPresent()) ? column.getOwnerIdentifier() :
segment.getOwner().get().getIdentifier();
return new ColumnProjection(owner, new
IdentifierValue(encryptColumnName,
column.getNameIdentifier().getQuoteCharacter()), column.getAlias().isPresent()
? column.getAliasIdentifier()
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
index 3e5ed2b3c93..73fa050dc66 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
@@ -111,7 +111,7 @@ public final class EncryptInsertOnUpdateTokenGenerator
implements CollectionSQLT
private EncryptAssignmentToken generateParameterSQLToken(final
EncryptTable encryptTable, final AssignmentSegment assignmentSegment) {
EncryptParameterAssignmentToken result = new
EncryptParameterAssignmentToken(assignmentSegment.getColumns().get(0).getStartIndex(),
assignmentSegment.getStopIndex());
String columnName =
assignmentSegment.getColumns().get(0).getIdentifier().getValue();
- result.addColumnName(encryptTable.getCipherColumn(columnName));
+
result.addColumnName(encryptTable.getEncryptColumn(columnName).getCipher().getName());
encryptTable.findAssistedQueryColumn(columnName).ifPresent(result::addColumnName);
encryptTable.findLikeQueryColumn(columnName).ifPresent(result::addColumnName);
return result;
@@ -135,8 +135,8 @@ public final class EncryptInsertOnUpdateTokenGenerator
implements CollectionSQLT
boolean isEncryptColumn = encryptTable.isEncryptColumn(column);
boolean isEncryptValueColumn =
encryptTable.isEncryptColumn(valueColumn);
if (isEncryptColumn && isEncryptValueColumn) {
- String cipherColumn = encryptTable.getCipherColumn(column);
- String cipherValueColumn =
encryptTable.getCipherColumn(valueColumn);
+ String cipherColumn =
encryptTable.getEncryptColumn(column).getCipher().getName();
+ String cipherValueColumn =
encryptTable.getEncryptColumn(valueColumn).getCipher().getName();
result.addAssignment(cipherColumn, "VALUES(" + cipherValueColumn +
")");
} else if (isEncryptColumn != isEncryptValueColumn) {
throw new
UnsupportedEncryptSQLException(String.format("%s=VALUES(%s)", column,
valueColumn));
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGeneratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGeneratorTest.java
index df4573f3e19..df5a963b5b2 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGeneratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGeneratorTest.java
@@ -69,16 +69,16 @@ class EncryptAlterTableTokenGeneratorTest {
}
private EncryptTable mockEncryptTable() {
- EncryptTable result = mock(EncryptTable.class);
+ EncryptTable result = mock(EncryptTable.class, RETURNS_DEEP_STUBS);
when(result.getTable()).thenReturn("t_encrypt");
when(result.isEncryptColumn("certificate_number")).thenReturn(true);
-
when(result.getCipherColumn("certificate_number")).thenReturn("cipher_certificate_number");
+
when(result.getEncryptColumn("certificate_number").getCipher().getName()).thenReturn("cipher_certificate_number");
when(result.findAssistedQueryColumn("certificate_number")).thenReturn(Optional.of("assisted_certificate_number"));
when(result.findLikeQueryColumn("certificate_number")).thenReturn(Optional.of("like_certificate_number"));
when(result.getLogicColumns()).thenReturn(Collections.singleton("t_encrypt"));
when(result.getEncryptColumn("certificate_number")).thenReturn(mockEncryptColumn());
when(result.isEncryptColumn("certificate_number_new")).thenReturn(true);
-
when(result.getCipherColumn("certificate_number_new")).thenReturn("cipher_certificate_number_new");
+
when(result.getEncryptColumn("certificate_number_new").getCipher().getName()).thenReturn("cipher_certificate_number_new");
when(result.getEncryptColumn("certificate_number_new")).thenReturn(mockNewEncryptColumn());
return result;
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGeneratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGeneratorTest.java
index f86e145b033..8b49c9ea50b 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGeneratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGeneratorTest.java
@@ -66,10 +66,10 @@ class EncryptCreateTableTokenGeneratorTest {
}
private EncryptTable mockEncryptTable() {
- EncryptTable result = mock(EncryptTable.class);
+ EncryptTable result = mock(EncryptTable.class, RETURNS_DEEP_STUBS);
EncryptColumn column = mockEncryptColumn();
when(result.isEncryptColumn("certificate_number")).thenReturn(true);
-
when(result.getCipherColumn("certificate_number")).thenReturn(column.getCipher().getName());
+
when(result.getEncryptColumn("certificate_number").getCipher().getName()).thenReturn(column.getCipher().getName());
when(result.findAssistedQueryColumn("certificate_number")).thenReturn(column.getAssistedQuery().map(AssistedQueryColumnItem::getName));
when(result.findLikeQueryColumn("certificate_number")).thenReturn(column.getLikeQuery().map(LikeQueryColumnItem::getName));
return result;
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGeneratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGeneratorTest.java
index 2a4e644d28d..52ed21e5aa8 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGeneratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGeneratorTest.java
@@ -78,10 +78,10 @@ class EncryptInsertOnUpdateTokenGeneratorTest {
}
private static EncryptTable mockEncryptTable() {
- EncryptTable result = mock(EncryptTable.class);
+ EncryptTable result = mock(EncryptTable.class, RETURNS_DEEP_STUBS);
when(result.getTable()).thenReturn("t_user");
when(result.isEncryptColumn("mobile")).thenReturn(true);
- when(result.getCipherColumn("mobile")).thenReturn("cipher_mobile");
+
when(result.getEncryptColumn("mobile").getCipher().getName()).thenReturn("cipher_mobile");
return result;
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptTableTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptTableTest.java
index c99c9b258f2..4305f4a47b4 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptTableTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptTableTest.java
@@ -84,11 +84,6 @@ class EncryptTableTest {
assertFalse(encryptTable.isCipherColumn("logicColumn"));
}
- @Test
- void assertGetCipherColumn() {
- assertThat(encryptTable.getCipherColumn("LogicColumn"),
is("cipherColumn"));
- }
-
@Test
void assertGetAssistedQueryColumns() {
assertThat(encryptTable.getAssistedQueryColumns(),
is(Collections.singletonList("assistedQueryColumn")));
