Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
e885c6a9
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,发现更多精彩内容 >>
提交
e885c6a9
编写于
12月 27, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#6026 Treat empty strings as NULL datetime/number
上级
0b2845a0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
30 addition
and
19 deletion
+30
-19
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/data/OracleTimestampValueHandler.java
.../dbeaver/ext/oracle/data/OracleTimestampValueHandler.java
+2
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/DateTimeCustomValueHandler.java
...s/dbeaver/model/impl/data/DateTimeCustomValueHandler.java
+5
-2
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCDateTimeValueHandler.java
...del/impl/jdbc/data/handlers/JDBCDateTimeValueHandler.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
+6
-1
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
...s/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
+16
-14
未找到文件。
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/data/OracleTimestampValueHandler.java
浏览文件 @
e885c6a9
...
...
@@ -16,6 +16,7 @@
*/
package
org.jkiss.dbeaver.ext.oracle.data
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ext.oracle.model.OracleConstants
;
...
...
@@ -50,7 +51,7 @@ public class OracleTimestampValueHandler extends JDBCDateTimeValueHandler {
}
@Override
public
Object
getValueFromObject
(
DBCSession
session
,
DBSTypedObject
type
,
Object
object
,
boolean
copy
)
throws
DBCException
{
public
Object
getValueFromObject
(
@NotNull
DBCSession
session
,
@NotNull
DBSTypedObject
type
,
Object
object
,
boolean
copy
)
throws
DBCException
{
if
(
object
!=
null
)
{
String
className
=
object
.
getClass
().
getName
();
if
(
className
.
startsWith
(
OracleConstants
.
TIMESTAMP_CLASS_NAME
))
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/DateTimeCustomValueHandler.java
浏览文件 @
e885c6a9
...
...
@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.exec.DBCSession;
import
org.jkiss.dbeaver.model.impl.data.formatters.DefaultDataFormatter
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
import
java.sql.SQLException
;
import
java.text.ParseException
;
import
java.util.Date
;
...
...
@@ -54,12 +53,16 @@ public abstract class DateTimeCustomValueHandler extends DateTimeValueHandler {
}
else
if
(
object
instanceof
Date
)
{
return
copy
?
((
Date
)
object
).
clone
()
:
object
;
}
else
if
(
object
instanceof
String
)
{
String
strValue
=
(
String
)
object
;
if
(
strValue
.
isEmpty
())
{
// NULL date
return
null
;
}
if
(
session
!=
null
&&
session
.
getDataSource
().
getContainer
().
getPreferenceStore
().
getBoolean
(
ModelPreferences
.
RESULT_NATIVE_DATETIME_FORMAT
))
{
// Do not use formatter for native format
return
object
;
}
String
strValue
=
(
String
)
object
;
try
{
return
getFormatter
(
type
).
parseValue
(
strValue
,
null
);
}
catch
(
ParseException
e
)
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCDateTimeValueHandler.java
浏览文件 @
e885c6a9
...
...
@@ -56,7 +56,7 @@ public class JDBCDateTimeValueHandler extends DateTimeCustomValueHandler {
}
@Override
public
Object
getValueFromObject
(
DBCSession
session
,
DBSTypedObject
type
,
Object
object
,
boolean
copy
)
throws
DBCException
{
public
Object
getValueFromObject
(
@NotNull
DBCSession
session
,
@NotNull
DBSTypedObject
type
,
Object
object
,
boolean
copy
)
throws
DBCException
{
Object
value
=
super
.
getValueFromObject
(
session
,
type
,
object
,
copy
);
if
(
value
instanceof
Date
)
{
switch
(
type
.
getTypeID
())
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCNumberValueHandler.java
浏览文件 @
e885c6a9
...
...
@@ -313,7 +313,12 @@ public class JDBCNumberValueHandler extends JDBCAbstractValueHandler implements
}
else
if
(
object
instanceof
Number
)
{
return
object
;
}
else
if
(
object
instanceof
String
)
{
return
DBValueFormatting
.
convertStringToNumber
((
String
)
object
,
getNumberType
(
type
),
formatter
);
String
strValue
=
(
String
)
object
;
if
(
strValue
.
isEmpty
())
{
// Empty string means NULL value
return
null
;
}
return
DBValueFormatting
.
convertStringToNumber
(
strValue
,
getNumberType
(
type
),
formatter
);
}
else
if
(
object
instanceof
Boolean
)
{
return
(
Boolean
)
object
?
1
:
0
;
}
else
{
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
浏览文件 @
e885c6a9
...
...
@@ -381,21 +381,23 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
{
String
displayName
=
getActiveSourceQuery
();
if
(
prevQuery
==
null
||
!
prevQuery
.
equals
(
displayName
))
{
loadFiltersHistory
(
displayName
);
prevQuery
=
displayName
;
}
Pattern
mlCommentsPattern
=
Pattern
.
compile
(
"/\\*.*\\*/"
,
Pattern
.
DOTALL
);
Matcher
m
=
mlCommentsPattern
.
matcher
(
displayName
);
if
(
m
.
find
())
{
displayName
=
m
.
replaceAll
(
""
);
}
if
(
displayName
!=
null
)
{
if
(
prevQuery
==
null
||
!
prevQuery
.
equals
(
displayName
))
{
loadFiltersHistory
(
displayName
);
prevQuery
=
displayName
;
}
Pattern
mlCommentsPattern
=
Pattern
.
compile
(
"/\\*.*\\*/"
,
Pattern
.
DOTALL
);
Matcher
m
=
mlCommentsPattern
.
matcher
(
displayName
);
if
(
m
.
find
())
{
displayName
=
m
.
replaceAll
(
""
);
}
displayName
=
displayName
.
replaceAll
(
"--.+"
,
""
);
displayName
=
CommonUtils
.
compactWhiteSpaces
(
displayName
);
activeDisplayName
=
CommonUtils
.
notEmpty
(
CommonUtils
.
truncateString
(
displayName
,
200
));
if
(
CommonUtils
.
isEmpty
(
activeDisplayName
))
{
activeDisplayName
=
ResultSetViewer
.
DEFAULT_QUERY_TEXT
;
displayName
=
displayName
.
replaceAll
(
"--.+"
,
""
);
displayName
=
CommonUtils
.
compactWhiteSpaces
(
displayName
);
activeDisplayName
=
CommonUtils
.
notEmpty
(
CommonUtils
.
truncateString
(
displayName
,
200
));
if
(
CommonUtils
.
isEmpty
(
activeDisplayName
))
{
activeDisplayName
=
ResultSetViewer
.
DEFAULT_QUERY_TEXT
;
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录