Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
-学无止境
dbeaver
提交
e7e436d8
D
dbeaver
项目概览
-学无止境
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
18
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,发现更多精彩内容 >>
提交
e7e436d8
编写于
3月 18, 2020
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#7847 Disable SQL assistant for table aliases
上级
58907234
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
5 deletion
+9
-5
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java
...s/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java
+9
-5
未找到文件。
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java
浏览文件 @
e7e436d8
...
...
@@ -94,7 +94,7 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres
request
.
setQueryType
(
null
);
SQLWordPartDetector
wordDetector
=
request
.
getWordDetector
();
SQLSyntaxManager
syntaxManager
=
request
.
getContext
().
getSyntaxManager
();
String
prevKeyWord
=
request
.
getWordDetector
()
.
getPrevKeyWord
();
String
prevKeyWord
=
wordDetector
.
getPrevKeyWord
();
{
if
(!
CommonUtils
.
isEmpty
(
prevKeyWord
))
{
if
(
syntaxManager
.
getDialect
().
isEntityQueryWord
(
prevKeyWord
))
{
...
...
@@ -102,13 +102,17 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres
if
(
SQLConstants
.
KEYWORD_DELETE
.
equals
(
prevKeyWord
))
{
request
.
setQueryType
(
null
);
}
else
if
(
SQLConstants
.
KEYWORD_INTO
.
equals
(
prevKeyWord
)
&&
!
CommonUtils
.
isEmpty
(
request
.
getWordDetector
()
.
getPrevWords
())
&&
(
"("
.
equals
(
request
.
getWordDetector
()
.
getPrevDelimiter
())
||
","
.
equals
(
wordDetector
.
getPrevDelimiter
())))
!
CommonUtils
.
isEmpty
(
wordDetector
.
getPrevWords
())
&&
(
"("
.
equals
(
wordDetector
.
getPrevDelimiter
())
||
","
.
equals
(
wordDetector
.
getPrevDelimiter
())))
{
request
.
setQueryType
(
SQLCompletionRequest
.
QueryType
.
COLUMN
);
}
else
if
(
SQLConstants
.
KEYWORD_JOIN
.
equals
(
prevKeyWord
))
{
request
.
setQueryType
(
SQLCompletionRequest
.
QueryType
.
JOIN
);
}
else
{
if
(!
CommonUtils
.
isEmpty
(
wordDetector
.
getPrevWords
())
&&
CommonUtils
.
isEmpty
(
wordDetector
.
getPrevDelimiter
()))
{
// Seems to be table alias
return
;
}
request
.
setQueryType
(
SQLCompletionRequest
.
QueryType
.
TABLE
);
}
}
else
if
(
syntaxManager
.
getDialect
().
isAttributeQueryWord
(
prevKeyWord
))
{
...
...
@@ -215,7 +219,7 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres
sqlDialect
.
getCatalogSeparator
(),
sqlDialect
.
getIdentifierQuoteStrings
(),
false
);
rootObject
=
SQLSearchUtils
.
findObjectByFQN
(
monitor
,
sc
,
request
.
getContext
().
getExecutionContext
(),
Arrays
.
asList
(
allNames
),
!
request
.
isSimpleMode
(),
request
.
getWordDetector
()
);
rootObject
=
SQLSearchUtils
.
findObjectByFQN
(
monitor
,
sc
,
request
.
getContext
().
getExecutionContext
(),
Arrays
.
asList
(
allNames
),
!
request
.
isSimpleMode
(),
wordDetector
);
}
}
if
(
rootObject
!=
null
)
{
...
...
@@ -263,7 +267,7 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres
}
else
if
(
ArrayUtils
.
contains
(
sqlDialect
.
getQueryKeywords
(),
prevKeyWord
.
toUpperCase
(
Locale
.
ENGLISH
)))
{
// SELECT ..
// Limit with FROM if we already have some expression
String
delimiter
=
request
.
getWordDetector
()
.
getPrevDelimiter
();
String
delimiter
=
wordDetector
.
getPrevDelimiter
();
if
(!
CommonUtils
.
isEmpty
(
wordDetector
.
getPrevWords
())
&&
(
CommonUtils
.
isEmpty
(
delimiter
)
||
delimiter
.
endsWith
(
")"
)))
{
// last expression ends with space or with ")"
allowedKeywords
=
new
HashSet
<>();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录