You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2022/08/23 06:15:21 UTC
[shardingsphere] branch master updated: fix navicat throw "There is no primary key here." (#20437) (#20444)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 ec46d13d09a fix navicat throw "There is no primary key here." (#20437) (#20444)
ec46d13d09a is described below
commit ec46d13d09a19be3ff95d3eb43e690e3cf6e97ae
Author: mingyifei <96...@qq.com>
AuthorDate: Tue Aug 23 14:15:11 2022 +0800
fix navicat throw "There is no primary key here." (#20437) (#20444)
* fix navicat throw "There is no primary key here." (#20437)
.Verify whether the column is a primary key. The field list should be obtained from the real table
* test case modify.
Co-authored-by: mingyifei <mi...@accesscorporate.com.cn>
---
.../backend/response/header/query/impl/MySQLQueryHeaderBuilder.java | 2 +-
.../backend/response/header/query/impl/MySQLQueryHeaderBuilderTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/MySQLQueryHeaderBuilder.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/MySQLQueryHeaderBuilder.java
index 16708fdb940..11c4ecbceb0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/MySQLQueryHeaderBuilder.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/MySQLQueryHeaderBuilder.java
@@ -66,7 +66,7 @@ public final class MySQLQueryHeaderBuilder implements QueryHeaderBuilder {
return logicTable.get();
}
}
- return "";
+ return actualTableName;
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/MySQLQueryHeaderBuilderTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/MySQLQueryHeaderBuilderTest.java
index 4a85070f181..ac6306a934e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/MySQLQueryHeaderBuilderTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/MySQLQueryHeaderBuilderTest.java
@@ -94,7 +94,7 @@ public final class MySQLQueryHeaderBuilderTest {
QueryHeader actual = new MySQLQueryHeaderBuilder().build(
queryResultMetaData, mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS), queryResultMetaData.getColumnName(1), queryResultMetaData.getColumnLabel(1), 1);
assertFalse(actual.isPrimaryKey());
- assertThat(actual.getTable(), is(""));
+ assertThat(actual.getTable(), is(actual.getTable()));
}
private ShardingSphereDatabase createDatabase() {