[shardingsphere] branch master updated (d02698a -> ae57dac)

[pa...@apache.org]

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

panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.


    from d02698a  Fix exception when execute select statement with traffic rule (#15425)
     add ae57dac  Fix NPE when rewrite parameter with schema base EncryptAlgorithm (#15430)

No new revisions were added by this update.

Summary of changes:
 .../context/EncryptSQLRewriteContextDecorator.java    |  3 +--
 ...e.java => SchemaBasedEncryptAlgorithmFixture.java} | 19 ++++++++++++++-----
 .../scenario/EncryptSQLRewriterParameterizedTest.java |  4 ++++
 ...apache.shardingsphere.encrypt.spi.EncryptAlgorithm |  1 +
 .../test/resources/scenario/encrypt/case/insert.xml   | 10 ++++++++++
 .../encrypt/case/select_for_query_with_cipher.xml     | 10 ++++++++++
 .../encrypt/case/select_for_query_with_plain.xml      | 10 ++++++++++
 .../scenario/encrypt/config/query-with-cipher.yaml    |  8 ++++++++
 .../scenario/encrypt/config/query-with-plain.yaml     |  8 ++++++++
 9 files changed, 66 insertions(+), 7 deletions(-)
 copy shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/{NormalEncryptAlgorithmFixture.java => SchemaBasedEncryptAlgorithmFixture.java} (62%)