[shardingsphere] branch master updated: Fix lower case like query error in PG. (#23771)

[sunnianjun]

This is an automated email from the ASF dual-hosted git repository.

sunnianjun 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 39177553546 Fix lower case like query error in PG. (#23771)
39177553546 is described below

commit 391775535467036b782ffcccf198570be501e07e
Author: Chuxin Chen <chuxinche...@qq.com>
AuthorDate: Sat Jan 28 15:31:00 2023 +0800

    Fix lower case like query error in PG. (#23771)
---
 .../token/generator/EncryptPredicateRightValueTokenGenerator.java    | 4 ++--
 .../src/test/resources/cases/dql/dql-integration-test-cases.xml      | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
index 9ae8f08b092..967aa207fd4 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
@@ -21,13 +21,13 @@ import lombok.Setter;
 import 
org.apache.shardingsphere.encrypt.exception.syntax.UnsupportedEncryptSQLException;
 import org.apache.shardingsphere.encrypt.rewrite.aware.DatabaseNameAware;
 import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptConditionsAware;
+import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptRuleAware;
 import org.apache.shardingsphere.encrypt.rewrite.condition.EncryptCondition;
 import 
org.apache.shardingsphere.encrypt.rewrite.condition.impl.EncryptBinaryCondition;
 import 
org.apache.shardingsphere.encrypt.rewrite.condition.impl.EncryptInCondition;
 import 
org.apache.shardingsphere.encrypt.rewrite.token.pojo.EncryptPredicateEqualRightValueToken;
 import 
org.apache.shardingsphere.encrypt.rewrite.token.pojo.EncryptPredicateInRightValueToken;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
-import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptRuleAware;
 import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.infra.binder.type.WhereAvailable;
 import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
@@ -96,7 +96,7 @@ public final class EncryptPredicateRightValueTokenGenerator
     }
     
     private List<Object> getEncryptedValues(final String schemaName, final 
EncryptCondition encryptCondition, final List<Object> originalValues) {
-        if (encryptCondition instanceof EncryptBinaryCondition && 
"LIKE".equals(((EncryptBinaryCondition) encryptCondition).getOperator())) {
+        if (encryptCondition instanceof EncryptBinaryCondition && 
"LIKE".equalsIgnoreCase(((EncryptBinaryCondition) 
encryptCondition).getOperator())) {
             Optional<String> likeQueryColumn = 
encryptRule.findLikeQueryColumn(encryptCondition.getTableName(), 
encryptCondition.getColumnName());
             if (!likeQueryColumn.isPresent()) {
                 throw new UnsupportedEncryptSQLException("LIKE");
diff --git 
a/test/e2e/suite/src/test/resources/cases/dql/dql-integration-test-cases.xml 
b/test/e2e/suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
index 255bf88316e..1ca0e3bd40f 100644
--- a/test/e2e/suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
+++ b/test/e2e/suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
@@ -1237,6 +1237,11 @@
         <assertion expected-data-source-name="read_dataset" />
     </test-case>
 
+    <test-case sql="SELECT * FROM t_merchant WHERE business_code like '%18'" 
db-types="MySQL,PostgreSQL,openGauss" scenario-types="db,encrypt"
+               scenario-comments="Test single table's lower case like operator 
percentage wildcard in simple select statement when use sharding feature.|Test 
encrypt table's lower case like operator percentage wildcard in simple select 
statement when use encrypt feature.">
+        <assertion expected-data-source-name="read_dataset" />
+    </test-case>
+
     <test-case sql="SELECT * FROM t_merchant WHERE business_code LIKE 
'_1000018'" db-types="MySQL,PostgreSQL,openGauss" scenario-types="db,encrypt" 
                scenario-comments="Test single table's LIKE operator underscore 
wildcard in simple select statement when use sharding feature.|Test encrypt 
table's LIKE operator underscore wildcard in simple select statement when use 
encrypt feature.">
         <assertion expected-data-source-name="read_dataset" />