Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
21fd13b3
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,发现更多精彩内容 >>
未验证
提交
21fd13b3
编写于
6月 29, 2021
作者:
S
ShadelessFox
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#12182 Move word start/part checks to dialect; proposals fix
上级
3a19d45d
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
38 addition
and
10 deletion
+38
-10
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDialect.java
...c/org/jkiss/dbeaver/ext/mssql/model/SQLServerDialect.java
+10
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLRuleManager.java
...rc/org/jkiss/dbeaver/model/sql/parser/SQLRuleManager.java
+1
-1
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/rules/SQLWordRule.java
...org/jkiss/dbeaver/model/sql/parser/rules/SQLWordRule.java
+13
-9
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/AbstractSQLDialect.java
.../org/jkiss/dbeaver/model/impl/sql/AbstractSQLDialect.java
+10
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLDialect.java
...ver.model/src/org/jkiss/dbeaver/model/sql/SQLDialect.java
+4
-0
未找到文件。
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDialect.java
浏览文件 @
21fd13b3
...
@@ -293,6 +293,16 @@ public class SQLServerDialect extends JDBCSQLDialect implements TPRuleProvider {
...
@@ -293,6 +293,16 @@ public class SQLServerDialect extends JDBCSQLDialect implements TPRuleProvider {
return
super
.
getUnquotedString
(
string
);
return
super
.
getUnquotedString
(
string
);
}
}
@Override
public
boolean
isWordStart
(
int
ch
)
{
return
super
.
isWordStart
(
ch
)
||
ch
==
'#'
;
}
@Override
public
boolean
isWordPart
(
int
ch
)
{
return
super
.
isWordPart
(
ch
)
||
ch
==
'#'
;
}
@Override
@Override
public
String
[]
getSingleLineComments
()
{
public
String
[]
getSingleLineComments
()
{
if
(!
isSqlServer
)
{
if
(!
isSqlServer
)
{
...
...
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLRuleManager.java
浏览文件 @
21fd13b3
...
@@ -202,7 +202,7 @@ public class SQLRuleManager {
...
@@ -202,7 +202,7 @@ public class SQLRuleManager {
if
(!
minimalRules
)
{
if
(!
minimalRules
)
{
// Add word rule for keywords, functions, types, and constants.
// Add word rule for keywords, functions, types, and constants.
SQLWordRule
wordRule
=
new
SQLWordRule
(
delimRule
,
typeToken
,
otherToken
);
SQLWordRule
wordRule
=
new
SQLWordRule
(
delimRule
,
typeToken
,
otherToken
,
dialect
);
for
(
String
reservedWord
:
dialect
.
getReservedWords
())
{
for
(
String
reservedWord
:
dialect
.
getReservedWords
())
{
DBPKeywordType
keywordType
=
dialect
.
getKeywordType
(
reservedWord
);
DBPKeywordType
keywordType
=
dialect
.
getKeywordType
(
reservedWord
);
// Functions without parentheses has type 'DBPKeywordType.OTHER' (#8710)
// Functions without parentheses has type 'DBPKeywordType.OTHER' (#8710)
...
...
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/rules/SQLWordRule.java
浏览文件 @
21fd13b3
...
@@ -16,6 +16,8 @@
...
@@ -16,6 +16,8 @@
*/
*/
package
org.jkiss.dbeaver.model.sql.parser.rules
;
package
org.jkiss.dbeaver.model.sql.parser.rules
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.model.sql.SQLDialect
;
import
org.jkiss.dbeaver.model.text.parser.TPCharacterScanner
;
import
org.jkiss.dbeaver.model.text.parser.TPCharacterScanner
;
import
org.jkiss.dbeaver.model.text.parser.TPRule
;
import
org.jkiss.dbeaver.model.text.parser.TPRule
;
import
org.jkiss.dbeaver.model.text.parser.TPToken
;
import
org.jkiss.dbeaver.model.text.parser.TPToken
;
...
@@ -32,18 +34,20 @@ import java.util.Set;
...
@@ -32,18 +34,20 @@ import java.util.Set;
*/
*/
public
class
SQLWordRule
implements
TPRule
{
public
class
SQLWordRule
implements
TPRule
{
private
SQLDelimiterRule
delimRule
;
private
final
SQLDelimiterRule
delimRule
;
private
TPToken
functionToken
;
private
final
TPToken
functionToken
;
private
TPToken
defaultToken
;
private
final
TPToken
defaultToken
;
private
Map
<
String
,
TPToken
>
words
=
new
HashMap
<>();
private
final
Map
<
String
,
TPToken
>
words
=
new
HashMap
<>();
private
Set
<
String
>
functions
=
new
HashSet
<>();
private
final
Set
<
String
>
functions
=
new
HashSet
<>();
private
StringBuilder
buffer
=
new
StringBuilder
();
private
final
StringBuilder
buffer
=
new
StringBuilder
();
private
final
SQLDialect
dialect
;
private
char
[][]
delimiters
;
private
char
[][]
delimiters
;
public
SQLWordRule
(
SQLDelimiterRule
delimRule
,
TPToken
functionToken
,
TPToken
defaultToken
)
{
public
SQLWordRule
(
SQLDelimiterRule
delimRule
,
TPToken
functionToken
,
TPToken
defaultToken
,
@NotNull
SQLDialect
dialect
)
{
this
.
delimRule
=
delimRule
;
this
.
delimRule
=
delimRule
;
this
.
functionToken
=
functionToken
;
this
.
functionToken
=
functionToken
;
this
.
defaultToken
=
defaultToken
;
this
.
defaultToken
=
defaultToken
;
this
.
dialect
=
dialect
;
}
}
public
boolean
hasWord
(
String
word
)
{
public
boolean
hasWord
(
String
word
)
{
...
@@ -65,7 +69,7 @@ public class SQLWordRule implements TPRule {
...
@@ -65,7 +69,7 @@ public class SQLWordRule implements TPRule {
@Override
@Override
public
TPToken
evaluate
(
TPCharacterScanner
scanner
)
{
public
TPToken
evaluate
(
TPCharacterScanner
scanner
)
{
int
c
=
scanner
.
read
();
int
c
=
scanner
.
read
();
if
(
c
!=
TPCharacterScanner
.
EOF
&&
Character
.
isUnicodeIdentifier
Start
(
c
))
{
if
(
c
!=
TPCharacterScanner
.
EOF
&&
dialect
.
isWord
Start
(
c
))
{
buffer
.
setLength
(
0
);
buffer
.
setLength
(
0
);
delimiters
=
delimRule
.
getDelimiters
();
delimiters
=
delimRule
.
getDelimiters
();
char
prevC
;
char
prevC
;
...
@@ -108,7 +112,7 @@ public class SQLWordRule implements TPRule {
...
@@ -108,7 +112,7 @@ public class SQLWordRule implements TPRule {
}
}
private
boolean
isWordPart
(
char
c
,
char
prevC
,
TPCharacterScanner
scanner
)
{
private
boolean
isWordPart
(
char
c
,
char
prevC
,
TPCharacterScanner
scanner
)
{
if
(!
Character
.
isUnicodeIdentifier
Part
(
c
)
&&
c
!=
'$'
)
{
if
(!
dialect
.
isWord
Part
(
c
)
&&
c
!=
'$'
)
{
return
false
;
return
false
;
}
}
if
(
c
==
'$'
&&
prevC
==
'$'
)
{
if
(
c
==
'$'
&&
prevC
==
'$'
)
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/AbstractSQLDialect.java
浏览文件 @
21fd13b3
...
@@ -298,6 +298,16 @@ public abstract class AbstractSQLDialect implements SQLDialect {
...
@@ -298,6 +298,16 @@ public abstract class AbstractSQLDialect implements SQLDialect {
return
null
;
return
null
;
}
}
@Override
public
boolean
isWordStart
(
int
ch
)
{
return
Character
.
isUnicodeIdentifierStart
(
ch
);
}
@Override
public
boolean
isWordPart
(
int
ch
)
{
return
Character
.
isUnicodeIdentifierPart
(
ch
);
}
@Override
@Override
public
boolean
validIdentifierStart
(
char
c
)
{
public
boolean
validIdentifierStart
(
char
c
)
{
return
Character
.
isLetter
(
c
);
return
Character
.
isLetter
(
c
);
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLDialect.java
浏览文件 @
21fd13b3
...
@@ -233,6 +233,10 @@ public interface SQLDialect {
...
@@ -233,6 +233,10 @@ public interface SQLDialect {
@NotNull
@NotNull
SQLStateType
getSQLStateType
();
SQLStateType
getSQLStateType
();
boolean
isWordStart
(
int
ch
);
boolean
isWordPart
(
int
ch
);
boolean
validIdentifierStart
(
char
c
);
boolean
validIdentifierStart
(
char
c
);
/**
/**
* Checks that specified character is a valid identifier part. Non-valid characters should be quoted in queries.
* Checks that specified character is a valid identifier part. Non-valid characters should be quoted in queries.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录