This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 b9475dd523f Make encrypt syntax consistent with upper and lower case
(#32115)
b9475dd523f is described below
commit b9475dd523f3ff9e7b6052651e2521bdb40d2283
Author: yx9o <[email protected]>
AuthorDate: Tue Jul 16 10:33:03 2024 +0800
Make encrypt syntax consistent with upper and lower case (#32115)
* Make encrypt syntax consistent with upper and lower case
* Update
---
.../handler/query/ShowEncryptRuleExecutor.java | 2 +-
.../handler/update/DropEncryptRuleExecutor.java | 2 +-
.../handler/query/ShowEncryptRuleExecutorTest.java | 24 ++++++++++++----------
.../update/DropEncryptRuleExecutorTest.java | 4 ++--
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
index ea0b5665d3e..b78e1a8e54f 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
@@ -52,7 +52,7 @@ public final class ShowEncryptRuleExecutor implements
DistSQLQueryExecutor<ShowE
@Override
public Collection<LocalDataQueryResultRow> getRows(final
ShowEncryptRulesStatement sqlStatement, final ContextManager contextManager) {
- return rule.getConfiguration().getTables().stream().filter(each ->
null == sqlStatement.getTableName() ||
each.getName().equals(sqlStatement.getTableName()))
+ return rule.getConfiguration().getTables().stream().filter(each ->
null == sqlStatement.getTableName() ||
each.getName().equalsIgnoreCase(sqlStatement.getTableName()))
.map(each -> buildColumnData(each,
rule.getConfiguration().getEncryptors())).flatMap(Collection::stream).collect(Collectors.toList());
}
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
index 173066f98fa..62b15525ef9 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
@@ -79,7 +79,7 @@ public final class DropEncryptRuleExecutor implements
DatabaseRuleDropExecutor<D
private void dropRule(final String ruleName) {
Optional<EncryptTableRuleConfiguration> encryptTableRuleConfig =
rule.getConfiguration().getTables().stream()
- .filter(each -> each.getName().equals(ruleName)).findAny();
+ .filter(each ->
each.getName().equalsIgnoreCase(ruleName)).findAny();
encryptTableRuleConfig.ifPresent(optional ->
rule.getConfiguration().getTables().remove(encryptTableRuleConfig.get()));
}
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java
index 66fa0aea953..d6e1d18fb1f 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java
@@ -51,17 +51,9 @@ class ShowEncryptRuleExecutorTest {
@BeforeEach
void setUp() {
- engine = new
DistSQLQueryExecuteEngine(mock(ShowEncryptRulesStatement.class), "foo_db",
mockContextManager(), mock(DistSQLConnectionContext.class));
- }
-
- private ContextManager mockContextManager() {
- ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
- when(result.getDatabase("foo_db")).thenReturn(database);
- EncryptRule rule = mock(EncryptRule.class);
- when(rule.getConfiguration()).thenReturn(getRuleConfiguration());
-
when(database.getRuleMetaData().findSingleRule(EncryptRule.class)).thenReturn(Optional.of(rule));
- return result;
+ ShowEncryptRulesStatement showEncryptRulesStatement =
mock(ShowEncryptRulesStatement.class);
+ when(showEncryptRulesStatement.getTableName()).thenReturn("T_ENCRYPT");
+ engine = new DistSQLQueryExecuteEngine(showEncryptRulesStatement,
"foo_db", mockContextManager(), mock(DistSQLConnectionContext.class));
}
@Test
@@ -84,6 +76,16 @@ class ShowEncryptRuleExecutorTest {
assertThat(row.getCell(11), is(""));
}
+ private ContextManager mockContextManager() {
+ ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
+ ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
+ when(result.getDatabase("foo_db")).thenReturn(database);
+ EncryptRule rule = mock(EncryptRule.class);
+ when(rule.getConfiguration()).thenReturn(getRuleConfiguration());
+
when(database.getRuleMetaData().findSingleRule(EncryptRule.class)).thenReturn(Optional.of(rule));
+ return result;
+ }
+
private EncryptRuleConfiguration getRuleConfiguration() {
EncryptColumnRuleConfiguration encryptColumnRuleConfig = new
EncryptColumnRuleConfiguration("user_id", new
EncryptColumnItemRuleConfiguration("user_cipher", "test"));
encryptColumnRuleConfig.setAssistedQuery(new
EncryptColumnItemRuleConfiguration("user_assisted",
"foo_assist_query_encryptor"));
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
index 63666e6a4ec..a5582ae7c3a 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
@@ -68,7 +68,7 @@ class DropEncryptRuleExecutorTest {
EncryptRule rule = mock(EncryptRule.class);
when(rule.getConfiguration()).thenReturn(ruleConfig);
executor.setRule(rule);
- EncryptRuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(createSQLStatement("t_encrypt"));
+ EncryptRuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(createSQLStatement("T_ENCRYPT"));
assertThat(toBeDroppedRuleConfig.getTables().size(), is(1));
assertThat(toBeDroppedRuleConfig.getEncryptors().size(), is(3));
}
@@ -79,7 +79,7 @@ class DropEncryptRuleExecutorTest {
EncryptRule rule = mock(EncryptRule.class);
when(rule.getConfiguration()).thenReturn(ruleConfig);
executor.setRule(rule);
- EncryptRuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(createSQLStatement("t_encrypt"));
+ EncryptRuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(createSQLStatement("T_ENCRYPT"));
assertThat(toBeDroppedRuleConfig.getTables().size(), is(1));
assertTrue(toBeDroppedRuleConfig.getEncryptors().isEmpty());
}
