Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
cc5da952
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,发现更多精彩内容 >>
提交
cc5da952
编写于
8月 29, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Defautl format generator fix (use session)
Former-commit-id:
d1a4ed8f
上级
88adaa38
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
8 deletion
+14
-8
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDValueDefaultGenerator.java
...rg/jkiss/dbeaver/model/data/DBDValueDefaultGenerator.java
+2
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/DateTimeValueHandler.java
...g/jkiss/dbeaver/model/impl/data/DateTimeValueHandler.java
+2
-2
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCBooleanValueHandler.java
...odel/impl/jdbc/data/handlers/JDBCBooleanValueHandler.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCNumberValueHandler.java
...model/impl/jdbc/data/handlers/JDBCNumberValueHandler.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCStringValueHandler.java
...model/impl/jdbc/data/handlers/JDBCStringValueHandler.java
+1
-1
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetHandlerMain.java
...s/dbeaver/ui/controls/resultset/ResultSetHandlerMain.java
+7
-2
未找到文件。
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDValueDefaultGenerator.java
浏览文件 @
cc5da952
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
package
org.jkiss.dbeaver.model.data
;
package
org.jkiss.dbeaver.model.data
;
import
org.jkiss.dbeaver.model.exec.DBCSession
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
/**
/**
...
@@ -26,6 +27,6 @@ public interface DBDValueDefaultGenerator
...
@@ -26,6 +27,6 @@ public interface DBDValueDefaultGenerator
{
{
String
getDefaultValueLabel
();
String
getDefaultValueLabel
();
Object
generateDefaultValue
(
DBSTypedObject
type
);
Object
generateDefaultValue
(
DB
CSession
session
,
DB
STypedObject
type
);
}
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/DateTimeValueHandler.java
浏览文件 @
cc5da952
...
@@ -67,9 +67,9 @@ public abstract class DateTimeValueHandler extends BaseValueHandler implements D
...
@@ -67,9 +67,9 @@ public abstract class DateTimeValueHandler extends BaseValueHandler implements D
}
}
@Override
@Override
public
Object
generateDefaultValue
(
DBSTypedObject
type
)
{
public
Object
generateDefaultValue
(
DB
CSession
session
,
DB
STypedObject
type
)
{
try
{
try
{
return
getValueFromObject
(
null
,
type
,
new
Date
(),
false
);
return
getValueFromObject
(
session
,
type
,
new
Date
(),
false
);
}
catch
(
DBCException
e
)
{
}
catch
(
DBCException
e
)
{
log
.
debug
(
"Error getting current time stamp"
,
e
);
log
.
debug
(
"Error getting current time stamp"
,
e
);
return
null
;
return
null
;
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCBooleanValueHandler.java
浏览文件 @
cc5da952
...
@@ -90,7 +90,7 @@ public class JDBCBooleanValueHandler extends JDBCAbstractValueHandler implements
...
@@ -90,7 +90,7 @@ public class JDBCBooleanValueHandler extends JDBCAbstractValueHandler implements
}
}
@Override
@Override
public
Object
generateDefaultValue
(
DBSTypedObject
type
)
{
public
Object
generateDefaultValue
(
DB
CSession
session
,
DB
STypedObject
type
)
{
return
false
;
return
false
;
}
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCNumberValueHandler.java
浏览文件 @
cc5da952
...
@@ -359,7 +359,7 @@ public class JDBCNumberValueHandler extends JDBCAbstractValueHandler implements
...
@@ -359,7 +359,7 @@ public class JDBCNumberValueHandler extends JDBCAbstractValueHandler implements
}
}
@Override
@Override
public
Object
generateDefaultValue
(
DBSTypedObject
type
)
{
public
Object
generateDefaultValue
(
DB
CSession
session
,
DB
STypedObject
type
)
{
switch
(
type
.
getTypeID
())
{
switch
(
type
.
getTypeID
())
{
case
Types
.
BIGINT
:
case
Types
.
BIGINT
:
return
0L
;
return
0L
;
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCStringValueHandler.java
浏览文件 @
cc5da952
...
@@ -96,7 +96,7 @@ public class JDBCStringValueHandler extends JDBCAbstractValueHandler implements
...
@@ -96,7 +96,7 @@ public class JDBCStringValueHandler extends JDBCAbstractValueHandler implements
}
}
@Override
@Override
public
Object
generateDefaultValue
(
DBSTypedObject
type
)
{
public
Object
generateDefaultValue
(
DB
CSession
session
,
DB
STypedObject
type
)
{
return
""
;
return
""
;
}
}
}
}
\ No newline at end of file
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetHandlerMain.java
浏览文件 @
cc5da952
...
@@ -49,8 +49,11 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
...
@@ -49,8 +49,11 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
import
org.jkiss.dbeaver.model.data.DBDDisplayFormat
;
import
org.jkiss.dbeaver.model.data.DBDDisplayFormat
;
import
org.jkiss.dbeaver.model.data.DBDValueDefaultGenerator
;
import
org.jkiss.dbeaver.model.data.DBDValueDefaultGenerator
;
import
org.jkiss.dbeaver.model.data.DBDValueHandler
;
import
org.jkiss.dbeaver.model.data.DBDValueHandler
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionPurpose
;
import
org.jkiss.dbeaver.model.exec.DBCSession
;
import
org.jkiss.dbeaver.model.runtime.AbstractJob
;
import
org.jkiss.dbeaver.model.runtime.AbstractJob
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
import
org.jkiss.dbeaver.tools.transfer.IDataTransferProducer
;
import
org.jkiss.dbeaver.tools.transfer.IDataTransferProducer
;
import
org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferProducer
;
import
org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferProducer
;
...
@@ -251,8 +254,10 @@ public class ResultSetHandlerMain extends AbstractHandler {
...
@@ -251,8 +254,10 @@ public class ResultSetHandlerMain extends AbstractHandler {
}
else
if
(
actionId
.
equals
(
CMD_CELL_SET_DEFAULT
))
{
}
else
if
(
actionId
.
equals
(
CMD_CELL_SET_DEFAULT
))
{
DBDValueHandler
valueHandler
=
valueController
.
getValueHandler
();
DBDValueHandler
valueHandler
=
valueController
.
getValueHandler
();
if
(
valueHandler
instanceof
DBDValueDefaultGenerator
)
{
if
(
valueHandler
instanceof
DBDValueDefaultGenerator
)
{
Object
defValue
=
((
DBDValueDefaultGenerator
)
valueHandler
).
generateDefaultValue
(
valueController
.
getValueType
());
try
(
DBCSession
session
=
rsv
.
getExecutionContext
().
openSession
(
new
VoidProgressMonitor
(),
DBCExecutionPurpose
.
UTIL
,
"Generate default value"
))
{
valueController
.
updateValue
(
defValue
,
false
);
Object
defValue
=
((
DBDValueDefaultGenerator
)
valueHandler
).
generateDefaultValue
(
session
,
valueController
.
getValueType
());
valueController
.
updateValue
(
defValue
,
false
);
}
}
}
}
else
{
}
else
{
rsv
.
getModel
().
resetCellValue
(
attr
,
row
);
rsv
.
getModel
().
resetCellValue
(
attr
,
row
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录