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 2020/12/29 03:46:36 UTC
[shardingsphere] branch master updated: Fixes #8789 (#8799)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 572090f Fixes #8789 (#8799)
572090f is described below
commit 572090f98d16d0a065f193dbc8b1c2736ee28751
Author: Liang Zhang <te...@163.com>
AuthorDate: Tue Dec 29 11:46:15 2020 +0800
Fixes #8789 (#8799)
---
.../driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java | 3 +--
.../proxy/backend/communication/DatabaseCommunicationEngine.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java
index 363192d..363421e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java
@@ -114,8 +114,7 @@ public final class ShardingSphereResultSetMetaData extends WrapperAdapter implem
}
private boolean isHasSelectExpandProjections() {
- return sqlStatementContext instanceof SelectStatementContext
- && !((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().isEmpty();
+ return sqlStatementContext instanceof SelectStatementContext && !((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().isEmpty();
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
index 4884494..f54a806 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
@@ -175,7 +175,7 @@ public final class DatabaseCommunicationEngine {
}
private int getColumnCount(final ExecutionContext executionContext, final QueryResult queryResultSample) throws SQLException {
- return executionContext.getSqlStatementContext() instanceof SelectStatementContext
+ return hasSelectExpandProjections(executionContext.getSqlStatementContext())
? ((SelectStatementContext) executionContext.getSqlStatementContext()).getProjectionsContext().getExpandProjections().size() : queryResultSample.getMetaData().getColumnCount();
}