Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
375be0a3
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
375be0a3
编写于
5月 17, 2019
作者:
A
Andrew Khitrin
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'devel' into 5878_oracle_constraints_lag
上级
a047aeb3
fd5a0338
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
27 addition
and
19 deletion
+27
-19
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
.../org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
+1
-1
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleStructureAssistant.java
...ss/dbeaver/ext/oracle/model/OracleStructureAssistant.java
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/data/PostgreRefCursorValueHandler.java
...t/postgresql/model/data/PostgreRefCursorValueHandler.java
+10
-15
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/dialogs/ComplexObjectEditor.java
...rg/jkiss/dbeaver/ui/data/dialogs/ComplexObjectEditor.java
+4
-2
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/dialogs/CursorViewDialog.java
...c/org/jkiss/dbeaver/ui/data/dialogs/CursorViewDialog.java
+11
-1
未找到文件。
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
浏览文件 @
375be0a3
...
...
@@ -94,7 +94,7 @@ public class OracleDataSource extends JDBCDataSource
return
super
.
getDataSourceFeature
(
featureId
);
}
public
boolean
isViewAvailable
(
@NotNull
DBRProgressMonitor
monitor
,
@N
otNull
String
schemaName
,
@NotNull
String
viewName
)
{
public
boolean
isViewAvailable
(
@NotNull
DBRProgressMonitor
monitor
,
@N
ullable
String
schemaName
,
@NotNull
String
viewName
)
{
viewName
=
viewName
.
toUpperCase
();
Boolean
available
;
synchronized
(
availableViews
)
{
...
...
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleStructureAssistant.java
浏览文件 @
375be0a3
...
...
@@ -287,6 +287,7 @@ public class OracleStructureAssistant implements DBSStructureAssistant
return
object
;
}
@NotNull
@Override
public
String
getFullyQualifiedName
(
DBPEvaluationContext
context
)
{
if
(
objectType
==
OracleObjectType
.
SYNONYM
&&
OracleConstants
.
USER_PUBLIC
.
equals
(
schemaName
))
{
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/data/PostgreRefCursorValueHandler.java
浏览文件 @
375be0a3
...
...
@@ -16,30 +16,18 @@
*/
package
org.jkiss.dbeaver.ext.postgresql.model.data
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.ext.postgresql.PostgreUtils
;
import
org.jkiss.dbeaver.ext.postgresql.model.PostgreDataSource
;
import
org.jkiss.dbeaver.ext.postgresql.model.PostgreDataType
;
import
org.jkiss.dbeaver.ext.postgresql.model.PostgreDataTypeAttribute
;
import
org.jkiss.dbeaver.model.data.DBDComposite
;
import
org.jkiss.dbeaver.model.exec.DBCException
;
import
org.jkiss.dbeaver.model.exec.DBCSession
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCStructImpl
;
import
org.jkiss.dbeaver.model.impl.jdbc.data.JDBCComposite
;
import
org.jkiss.dbeaver.model.impl.jdbc.data.JDBCCompositeStatic
;
import
org.jkiss.dbeaver.model.impl.jdbc.data.JDBCCursor
;
import
org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCStructValueHandler
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
import
java.sql.ResultSet
;
import
java.sql.SQLException
;
import
java.sql.Struct
;
import
java.sql.Types
;
import
java.util.Collection
;
import
java.util.Iterator
;
/**
* PostgreArrayValueHandler
...
...
@@ -52,7 +40,14 @@ public class PostgreRefCursorValueHandler extends JDBCStructValueHandler {
protected
Object
fetchColumnValue
(
DBCSession
session
,
JDBCResultSet
resultSet
,
DBSTypedObject
type
,
int
index
)
throws
DBCException
,
SQLException
{
// Fetch as string (#1735)
// Fetching cursor as object will close it so it won;'t be possible to use cursor in consequent queries
return
resultSet
.
getString
(
index
);
Object
object
=
resultSet
.
getObject
(
index
);
if
(
object
instanceof
ResultSet
)
{
return
new
JDBCCursor
(
(
JDBCSession
)
session
,
(
ResultSet
)
object
,
type
.
getTypeName
());
}
return
object
;
}
@Override
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/dialogs/ComplexObjectEditor.java
浏览文件 @
375be0a3
...
...
@@ -673,9 +673,11 @@ public class ComplexObjectEditor extends TreeViewer {
children
[
i
]
=
new
CollItem
(
i
,
iterator
.
next
());
}
}
if
(
children
!
=
null
)
{
children
Map
.
put
(
parent
,
children
)
;
if
(
children
=
=
null
)
{
children
=
new
ComplexElement
[
0
]
;
}
childrenMap
.
put
(
parent
,
children
);
return
children
;
}
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/dialogs/CursorViewDialog.java
浏览文件 @
375be0a3
...
...
@@ -179,7 +179,12 @@ public class CursorViewDialog extends ValueViewDialog implements IResultSetConta
@Override
public
IResultSetDecorator
createResultSetDecorator
()
{
return
new
QueryResultsDecorator
();
return
new
QueryResultsDecorator
()
{
@Override
public
long
getDecoratorFeatures
()
{
return
FEATURE_PANELS
|
FEATURE_STATUS_BAR
;
}
};
}
private
class
CursorDataContainer
implements
DBSDataContainer
{
...
...
@@ -197,6 +202,11 @@ public class CursorViewDialog extends ValueViewDialog implements IResultSetConta
{
DBCStatistics
statistics
=
new
DBCStatistics
();
DBRProgressMonitor
monitor
=
session
.
getProgressMonitor
();
try
{
value
.
moveTo
((
int
)
firstRow
);
}
catch
(
DBCException
e
)
{
log
.
debug
(
e
);
}
DBCResultSet
dbResult
=
value
;
try
{
long
startTime
=
System
.
currentTimeMillis
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录