Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
02bd3f9c
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,发现更多精彩内容 >>
提交
02bd3f9c
编写于
5月 12, 2014
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Quote identifier handle fix
SQLite SQL editor fix
上级
743ce2ae
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
19 addition
and
5 deletion
+19
-5
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java
...iss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java
+4
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java
...src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java
+2
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/JDBCSQLDialect.java
.../src/org/jkiss/dbeaver/model/impl/sql/JDBCSQLDialect.java
+5
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/sql/SQLDialect.java
...aver.core/src/org/jkiss/dbeaver/model/sql/SQLDialect.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java
...dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java
+5
-2
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDialect.java
...r.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDialect.java
+2
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java
浏览文件 @
02bd3f9c
...
...
@@ -82,7 +82,7 @@ public final class DBUtils {
{
if
(
dataSource
instanceof
SQLDataSource
)
{
final
String
quote
=
((
SQLDataSource
)
dataSource
).
getSQLDialect
().
getIdentifierQuoteString
();
return
str
.
startsWith
(
quote
)
&&
str
.
endsWith
(
quote
);
return
quote
!=
null
&&
str
.
startsWith
(
quote
)
&&
str
.
endsWith
(
quote
);
}
else
{
return
false
;
}
...
...
@@ -101,6 +101,9 @@ public final class DBUtils {
{
final
SQLDialect
sqlDialect
=
dataSource
.
getSQLDialect
();
String
quoteString
=
sqlDialect
.
getIdentifierQuoteString
();
if
(
quoteString
==
null
)
{
return
str
;
}
if
(
str
.
startsWith
(
quoteString
)
&&
str
.
endsWith
(
quoteString
))
{
// Already quoted
return
str
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java
浏览文件 @
02bd3f9c
...
...
@@ -21,6 +21,7 @@ package org.jkiss.dbeaver.model.impl.sql;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.model.DBPIdentifierCase
;
import
org.jkiss.dbeaver.model.DBPKeywordType
;
import
org.jkiss.dbeaver.model.sql.SQLDialect
;
...
...
@@ -61,7 +62,7 @@ public class BasicSQLDialect implements SQLDialect {
return
"SQL"
;
}
@N
otNull
@N
ullable
@Override
public
String
getIdentifierQuoteString
()
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/JDBCSQLDialect.java
浏览文件 @
02bd3f9c
...
...
@@ -21,6 +21,7 @@ package org.jkiss.dbeaver.model.impl.sql;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.model.DBPIdentifierCase
;
import
org.jkiss.dbeaver.model.DBPKeywordType
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCDatabaseMetaData
;
...
...
@@ -74,6 +75,9 @@ public class JDBCSQLDialect extends BasicSQLDialect {
}
if
(
identifierQuoteString
!=
null
)
{
identifierQuoteString
=
identifierQuoteString
.
trim
();
if
(
identifierQuoteString
.
isEmpty
())
{
identifierQuoteString
=
null
;
}
}
try
{
...
...
@@ -195,6 +199,7 @@ public class JDBCSQLDialect extends BasicSQLDialect {
return
name
;
}
@Nullable
@NotNull
@Override
public
String
getIdentifierQuoteString
()
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/sql/SQLDialect.java
浏览文件 @
02bd3f9c
...
...
@@ -60,7 +60,7 @@ public interface SQLDialect extends ICommentsSupport {
*
* @return the quoting string or a space if quoting is not supported
*/
@N
otNull
@N
ullable
String
getIdentifierQuoteString
();
/**
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java
浏览文件 @
02bd3f9c
...
...
@@ -347,7 +347,10 @@ public class SQLCompletionProcessor implements IContentAssistProcessor
Pattern
aliasPattern
;
SQLDialect
sqlDialect
=
dataSource
.
getSQLDialect
();
String
quoteString
=
sqlDialect
.
getIdentifierQuoteString
();
String
quote
=
SQLConstants
.
STR_QUOTE_DOUBLE
.
equals
(
quoteString
)
?
quoteString
:
Pattern
.
quote
(
quoteString
);
String
quote
=
quoteString
==
null
?
SQLConstants
.
STR_QUOTE_DOUBLE
:
SQLConstants
.
STR_QUOTE_DOUBLE
.
equals
(
quoteString
)
?
quoteString
:
Pattern
.
quote
(
quoteString
);
String
catalogSeparator
=
sqlDialect
.
getCatalogSeparator
();
while
(
token
.
endsWith
(
catalogSeparator
))
token
=
token
.
substring
(
0
,
token
.
length
()
-
1
);
...
...
@@ -378,7 +381,7 @@ public class SQLCompletionProcessor implements IContentAssistProcessor
if
(!
CommonUtils
.
isEmpty
(
group
))
{
String
[]
allNames
=
group
.
split
(
Pattern
.
quote
(
catalogSeparator
));
for
(
String
name
:
allNames
)
{
if
(
name
.
startsWith
(
quoteString
)
&&
name
.
endsWith
(
quoteString
))
{
if
(
quoteString
!=
null
&&
name
.
startsWith
(
quoteString
)
&&
name
.
endsWith
(
quoteString
))
{
name
=
name
.
substring
(
1
,
name
.
length
()
-
1
);
}
nameList
.
add
(
name
);
...
...
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDialect.java
浏览文件 @
02bd3f9c
...
...
@@ -19,6 +19,7 @@
package
org.jkiss.dbeaver.ext.wmi.model
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.model.impl.sql.BasicSQLDialect
;
import
org.jkiss.dbeaver.model.sql.SQLStateType
;
...
...
@@ -37,6 +38,7 @@ public class WMIDialect extends BasicSQLDialect {
return
"WMI"
;
}
@Nullable
@NotNull
@Override
public
String
getIdentifierQuoteString
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录