You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2021/03/22 08:29:54 UTC
[shardingsphere] branch master updated (51d8c02 -> dc96405)

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

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


    from 51d8c02  Always remove logic column from alter table for encrypt (#9766)
     add dc96405  Fix issues#9510 , support rewrite SQL correctly when using sharding and encrypt together (#9749)

No new revisions were added by this update.

Summary of changes:
 .../impl/EncryptPredicateColumnTokenGenerator.java |  32 +++---
 .../impl/EncryptProjectionTokenGenerator.java      |  39 ++++----
 .../impl/InsertCipherNameTokenGenerator.java       |  24 +++--
 .../resources/mix/select_for_query_with_cipher.xml |  20 ++--
 .../resources/mix/select_for_query_with_plain.xml  |  34 +++----
 .../src/test/resources/sharding/select.xml         | 100 ++++++++++---------
 .../infra/rewrite/sql/impl/AbstractSQLBuilder.java |  35 ++++++-
 .../token/pojo/generic/SubstitutableColumn.java    |  37 ++++---
 .../pojo/generic/SubstitutableColumnNameToken.java |  46 ---------
 .../pojo/generic/SubstitutableColumnsToken.java    | 108 +++++++++++++++++++++
 .../generic/SubstitutableColumnNameTokenTest.java  |   5 +-
 .../segment/dml/item/ColumnProjectionSegment.java  |   4 +-
 .../main/resources/case/dml/select-expression.xml  |   2 +-
 .../main/resources/case/dml/select-group-by.xml    |   4 +-
 .../main/resources/case/dml/select-order-by.xml    |   6 +-
 .../dml/select-pagination-group-by-order-by.xml    |  80 +++++++--------
 .../main/resources/case/dml/select-pagination.xml  |  60 ++++++------
 .../src/main/resources/case/dml/select.xml         |   6 +-
 18 files changed, 385 insertions(+), 257 deletions(-)
 copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/order/item/OrderByItemSegment.java => shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumn.java (60%)
 delete mode 100644 shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnNameToken.java
 create mode 100644 shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-engine/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnsToken.java