Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
d8d5365d
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
d8d5365d
编写于
4月 02, 2021
作者:
S
ShadelessFox
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#10858 Fix matching of fully-qualified table names
Former-commit-id:
6818f837
上级
f8406cd0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
22 addition
and
8 deletion
+22
-8
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java
...s/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java
+22
-8
未找到文件。
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java
浏览文件 @
d8d5365d
...
...
@@ -47,7 +47,7 @@ import org.jkiss.dbeaver.model.struct.*;
import
org.jkiss.dbeaver.model.text.TextUtils
;
import
org.jkiss.dbeaver.model.text.parser.TPRuleBasedScanner
;
import
org.jkiss.dbeaver.model.text.parser.TPToken
;
import
org.jkiss.dbeaver.model.text.parser.TPToken
Defaul
t
;
import
org.jkiss.dbeaver.model.text.parser.TPToken
Abstrac
t
;
import
org.jkiss.utils.ArrayUtils
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.Pair
;
...
...
@@ -828,8 +828,10 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres
We use "state machine" to process such sequences. The transition table is listed below:
UNMATCHED -> TABLE_NAME ; if found starting token (FROM, UPDATE, JOIN, INTO, etc.).
TABLE_NAME -> ALIAS_AS ; if found string token, and the alias is known.
TABLE_NAME -> MATCHED ; if found string token, and the alias is unknown.
TABLE_NAME -> TABLE_DOT ; if found string token.
TABLE_DOT -> TABLE_NAME ; if found structure separator (dot).
TABLE_DOT -> MATCHED ; if found space, and the alias is unknown.
TABLE_DOT -> ALIAS_AS ; if found space, and the alias is known.
ALIAS_AS -> ALIAS_NAME ; if found 'as' token.
ALIAS_NAME -> MATCHED ; if found string token.
*/
...
...
@@ -837,20 +839,23 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres
try
{
final
int
STATE_UNMATCHED
=
0
;
final
int
STATE_TABLE_NAME
=
1
;
final
int
STATE_ALIAS_AS
=
2
;
final
int
STATE_ALIAS_NAME
=
3
;
final
int
STATE_MATCHED
=
4
;
final
int
STATE_TABLE_DOT
=
2
;
final
int
STATE_ALIAS_AS
=
3
;
final
int
STATE_ALIAS_NAME
=
4
;
final
int
STATE_MATCHED
=
5
;
int
state
=
STATE_UNMATCHED
;
String
matchedTableName
=
null
;
String
matchedTableAlias
=
null
;
final
char
structSeparator
=
request
.
getContext
().
getSyntaxManager
().
getStructSeparator
();
while
(
true
)
{
final
TPToken
tok
=
scanner
.
nextToken
();
if
(
tok
.
isEOF
())
{
break
;
}
if
(!(
tok
instanceof
TPToken
Defaul
t
))
{
if
(!(
tok
instanceof
TPToken
Abstrac
t
))
{
continue
;
}
final
String
value
=
document
.
get
(
scanner
.
getTokenOffset
(),
scanner
.
getTokenLength
());
...
...
@@ -863,7 +868,16 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres
continue
;
}
if
(
state
==
STATE_TABLE_NAME
&&
(
tok
.
getData
()
==
SQLTokenType
.
T_QUOTED
||
tok
.
getData
()
==
SQLTokenType
.
T_OTHER
))
{
matchedTableName
=
value
;
matchedTableName
=
CommonUtils
.
notEmpty
(
matchedTableName
)
+
value
;
state
=
STATE_TABLE_DOT
;
continue
;
}
if
(
state
==
STATE_TABLE_DOT
&&
value
.
indexOf
(
structSeparator
)
>=
0
)
{
matchedTableName
+=
value
;
state
=
STATE_TABLE_NAME
;
continue
;
}
if
(
state
==
STATE_TABLE_DOT
)
{
if
(
CommonUtils
.
isEmpty
(
tableAlias
))
{
state
=
STATE_MATCHED
;
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录