Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
6b33677a
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6b33677a
编写于
8月 09, 2020
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#9457 Table columns recognition fix (PG-specific)
上级
0f78f186
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
29 addition
and
5 deletion
+29
-5
plugins/org.jkiss.dbeaver.ext.greenplum/src/org/jkiss/dbeaver/ext/greenplum/model/PostgreServerGreenplum.java
...s/dbeaver/ext/greenplum/model/PostgreServerGreenplum.java
+5
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSourceInfo.java
...s/dbeaver/ext/postgresql/model/PostgreDataSourceInfo.java
+2
-2
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreServerExtension.java
.../dbeaver/ext/postgresql/model/PostgreServerExtension.java
+4
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerEdb.java
.../dbeaver/ext/postgresql/model/impls/PostgreServerEdb.java
+5
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerExtensionBase.java
...xt/postgresql/model/impls/PostgreServerExtensionBase.java
+5
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerPostgreSQL.java
...r/ext/postgresql/model/impls/PostgreServerPostgreSQL.java
+5
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceInfo.java
....model/src/org/jkiss/dbeaver/model/DBPDataSourceInfo.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBExecUtils.java
...r.model/src/org/jkiss/dbeaver/model/exec/DBExecUtils.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractDataSourceInfo.java
.../org/jkiss/dbeaver/model/impl/AbstractDataSourceInfo.java
+1
-1
未找到文件。
plugins/org.jkiss.dbeaver.ext.greenplum/src/org/jkiss/dbeaver/ext/greenplum/model/PostgreServerGreenplum.java
浏览文件 @
6b33677a
...
...
@@ -90,6 +90,11 @@ public class PostgreServerGreenplum extends PostgreServerExtensionBase {
"LOG"
,
"ERRORS"
);
}
@Override
public
boolean
supportsEntityMetadataInResults
()
{
return
true
;
}
@Override
public
boolean
supportsExplainPlanXML
()
{
return
false
;
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSourceInfo.java
浏览文件 @
6b33677a
...
...
@@ -44,8 +44,8 @@ class PostgreDataSourceInfo extends JDBCDataSourceInfo {
}
@Override
public
boolean
supportsDuplicateColumnsInResults
()
{
return
true
;
public
boolean
needsTableMetaForColumnResolution
()
{
return
dataSource
.
getServerType
().
supportsEntityMetadataInResults
()
;
}
@Override
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreServerExtension.java
浏览文件 @
6b33677a
...
...
@@ -121,4 +121,8 @@ public interface PostgreServerExtension
Map
<
String
,
String
>
getDataTypeAliases
();
boolean
supportsTableStatistics
();
// True if driver returns source table name in ResultSetMetaData.
// It works for original PG driver but doesn't work for many forks (e.g. Redshift).
boolean
supportsEntityMetadataInResults
();
}
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerEdb.java
浏览文件 @
6b33677a
...
...
@@ -29,6 +29,11 @@ public class PostgreServerEdb extends PostgreServerExtensionBase {
super
(
dataSource
);
}
@Override
public
boolean
supportsEntityMetadataInResults
()
{
return
true
;
}
@Override
public
String
getServerTypeName
()
{
return
"EnterpriseDB"
;
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerExtensionBase.java
浏览文件 @
6b33677a
...
...
@@ -338,6 +338,11 @@ public abstract class PostgreServerExtensionBase implements PostgreServerExtensi
return
true
;
}
@Override
public
boolean
supportsEntityMetadataInResults
()
{
return
false
;
}
@Override
public
boolean
supportsExplainPlan
()
{
return
true
;
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerPostgreSQL.java
浏览文件 @
6b33677a
...
...
@@ -29,6 +29,11 @@ public class PostgreServerPostgreSQL extends PostgreServerExtensionBase {
super
(
dataSource
);
}
@Override
public
boolean
supportsEntityMetadataInResults
()
{
return
true
;
}
@Override
public
String
getServerTypeName
()
{
return
"PostgreSQL"
;
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceInfo.java
浏览文件 @
6b33677a
...
...
@@ -172,5 +172,5 @@ public interface DBPDataSourceInfo
DBSObjectType
[]
getSupportedObjectTypes
();
boolean
supportsDuplicateColumnsInResults
();
boolean
needsTableMetaForColumnResolution
();
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBExecUtils.java
浏览文件 @
6b33677a
...
...
@@ -704,7 +704,7 @@ public class DBExecUtils {
// - We use some explicit entity (e.g. table data editor)
// - Table metadata was specified for column
// - Database doesn't support column name collisions (default)
(
sourceEntity
!=
null
||
bindingMeta
.
getMetaAttribute
().
getEntityMetaData
()
!=
null
||
!
bindingMeta
.
getDataSource
().
getInfo
().
supportsDuplicateColumnsInResults
())
&&
(
sourceEntity
!=
null
||
bindingMeta
.
getMetaAttribute
().
getEntityMetaData
()
!=
null
||
!
bindingMeta
.
getDataSource
().
getInfo
().
needsTableMetaForColumnResolution
())
&&
bindingMeta
.
setEntityAttribute
(
tableColumn
,
((
sqlQuery
==
null
||
tableColumn
.
getTypeID
()
!=
attrMeta
.
getTypeID
())
&&
rows
!=
null
)))
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractDataSourceInfo.java
浏览文件 @
6b33677a
...
...
@@ -116,7 +116,7 @@ public abstract class AbstractDataSourceInfo implements DBPDataSourceInfo
}
@Override
public
boolean
supportsDuplicateColumnsInResults
()
{
public
boolean
needsTableMetaForColumnResolution
()
{
return
false
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录