Merge 935d407 into eb8b6ac

apache · Dec 13, 2019 · 1d83546 · 1d83546
2 parents eb8b6ac + 935d407
commit 1d83546
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/...ewrite/feature/encrypt/token/generator/impl/EncryptPredicateRightValueTokenGenerator.java b/...ewrite/feature/encrypt/token/generator/impl/EncryptPredicateRightValueTokenGenerator.java
@@ -19,6 +19,7 @@
 
 import com.google.common.base.Optional;
 import lombok.Setter;
+import org.apache.shardingsphere.core.constant.ShardingOperator;
 import org.apache.shardingsphere.core.metadata.table.TableMetas;
 import org.apache.shardingsphere.sql.parser.sql.statement.generic.WhereSegmentAvailable;
 import org.apache.shardingsphere.sql.parser.relation.statement.SQLStatementContext;
@@ -79,8 +80,9 @@ private EncryptPredicateRightValueToken generateSQLToken(final EncryptCondition
 
     private EncryptPredicateRightValueToken generateSQLTokenForQueryWithCipherColumn(final EncryptCondition encryptCondition, final List<Object> originalValues) {
         List<Object> encryptedValues = getEncryptedValues(encryptCondition, originalValues);
-        return new EncryptPredicateRightValueToken(encryptCondition.getStartIndex(), encryptCondition.getStopIndex(),  
-                getPositionValues(encryptCondition.getPositionValueMap().keySet(), encryptedValues), encryptCondition.getPositionIndexMap().keySet(), encryptCondition.getOperator());
+        int startIndex = encryptCondition.getOperator().equals(ShardingOperator.IN) ? encryptCondition.getStartIndex() - 1 : encryptCondition.getStartIndex();
+        return new EncryptPredicateRightValueToken(startIndex, encryptCondition.getStopIndex(), getPositionValues(encryptCondition.getPositionValueMap().keySet(), encryptedValues),
+                encryptCondition.getPositionIndexMap().keySet(), encryptCondition.getOperator());
     }
 
     private List<Object> getEncryptedValues(final EncryptCondition encryptCondition, final List<Object> originalValues) {

diff --git a/...ing-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/sql/SQLBuilder.java b/...ing-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/sql/SQLBuilder.java
@@ -82,7 +82,7 @@ private String getConjunctionText(final SQLToken sqlToken) {
 
     private int getStartIndex(final SQLToken sqlToken) {
         int startIndex = sqlToken instanceof Substitutable ? ((Substitutable) sqlToken).getStopIndex() + 1 : sqlToken.getStartIndex();
-        return startIndex > logicSQL.length() ? logicSQL.length() : startIndex;
+        return Math.min(startIndex, logicSQL.length());
     }
 
     private int getStopIndex(final SQLToken sqlToken) {

diff --git a/.../apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatementTest.java b/.../apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatementTest.java
@@ -54,6 +54,8 @@ public final class EncryptPreparedStatementTest extends AbstractEncryptJDBCDatab
 
     private static final String SELECT_FULL_SQL = "select id, cipher_pwd, plain_pwd, assist_pwd from t_query_and_plain_encrypt";
 
+    private static final String SELECT_SQL_WITH_IN_OPERATOR = "select * from t_query_encrypt where pwd IN (?)";
+
     @Test
     public void assertSqlShow() throws SQLException {
         assertTrue(getEncryptConnectionWithProps().getRuntimeContext().getProps().<Boolean>getValue(ShardingPropertiesConstant.SQL_SHOW));
@@ -220,4 +222,17 @@ public void assertQueryWithEmptyString() throws SQLException {
             statement.executeQuery();
         }
     }
+
+    @Test
+    public void assertSelectWithInOperator() throws SQLException {
+        try (PreparedStatement statement = getEncryptConnection().prepareStatement(SELECT_SQL_WITH_IN_OPERATOR)) {
+            statement.setObject(1, 'a');
+            ResultSetMetaData metaData = statement.executeQuery().getMetaData();
+            assertThat(metaData.getColumnCount(), is(2));
+            for (int i = 0; i < metaData.getColumnCount(); i++) {
+                assertThat(metaData.getColumnLabel(1), is("id"));
+                assertThat(metaData.getColumnLabel(2), is("pwd"));
+            }
+        }
+    }
 }