[shardingsphere] branch master updated (226f093 -> 222aeb5)

[zh...@apache.org]

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 226f093  revert part of PR #10840 to ensure GlobalRule load order (#11717)
     add 222aeb5  JDBC-core module delete getDefaultMetaData() (#11714)

No new revisions were added by this update.

Summary of changes:
 .../impl/StandardMetaDataContextsTest.java         |  2 +-
 .../core/metadata/FederateSchemaMetadatas.java     | 10 -----
 .../driver/executor/DriverJDBCExecutor.java        |  9 +++--
 .../driver/executor/JDBCLockEngine.java            | 14 ++++---
 .../batch/BatchPreparedStatementExecutor.java      |  9 +++--
 .../jdbc/adapter/AbstractResultSetAdapter.java     |  2 +-
 .../core/connection/ShardingSphereConnection.java  |  9 ++++-
 .../core/datasource/ShardingSphereDataSource.java  |  4 +-
 .../metadata/ShardingSphereDatabaseMetaData.java   |  6 +--
 .../statement/ShardingSpherePreparedStatement.java | 42 ++++++++++-----------
 .../core/statement/ShardingSphereStatement.java    | 44 +++++++++++-----------
 .../driver/executor/AbstractBaseExecutorTest.java  |  7 ++--
 .../batch/BatchPreparedStatementExecutorTest.java  |  3 +-
 .../driver/jdbc/adapter/ConnectionAdapterTest.java |  5 ++-
 .../jdbc/adapter/PreparedStatementAdapterTest.java |  4 +-
 .../driver/jdbc/adapter/StatementAdapterTest.java  |  3 +-
 .../connection/ShardingSphereConnectionTest.java   | 11 +++---
 .../datasource/ShardingSphereDataSourceTest.java   |  3 +-
 .../ShardingSphereDatabaseMetaDataTest.java        |  4 +-
 .../UnsupportedOperationConnectionTest.java        |  5 ++-
 .../UnsupportedOperationPreparedStatementTest.java |  4 +-
 .../internal/state/impl/OKDriverState.java         |  4 +-
 22 files changed, 111 insertions(+), 93 deletions(-)