Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
a86630a6
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,发现更多精彩内容 >>
提交
a86630a6
编写于
1月 10, 2020
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
NPE fixes
上级
730f93eb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
12 deletion
+33
-12
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLParserContext.java
.../org/jkiss/dbeaver/model/sql/parser/SQLParserContext.java
+15
-7
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
...eaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
+2
-2
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
...l/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
+16
-3
未找到文件。
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLParserContext.java
浏览文件 @
a86630a6
...
...
@@ -19,12 +19,16 @@ package org.jkiss.dbeaver.model.sql.parser;
import
org.eclipse.jface.text.IDocument
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.model.DBPContextProvider
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionContext
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.sql.SQLDialect
;
import
org.jkiss.dbeaver.model.sql.SQLSyntaxManager
;
import
org.jkiss.dbeaver.model.sql.SQLUtils
;
import
org.jkiss.dbeaver.model.text.parser.TPRuleBasedScanner
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
/**
* Parser context
...
...
@@ -32,7 +36,7 @@ import org.jkiss.dbeaver.model.text.parser.TPRuleBasedScanner;
public
class
SQLParserContext
{
@NotNull
private
final
DBP
DataSource
dataSource
;
private
final
DBP
ContextProvider
contextProvider
;
@NotNull
private
final
SQLSyntaxManager
syntaxManager
;
@NotNull
...
...
@@ -41,16 +45,17 @@ public class SQLParserContext {
private
final
IDocument
document
;
private
TPRuleBasedScanner
scanner
;
public
SQLParserContext
(
@NotNull
DBP
DataSource
dataSource
,
@NotNull
SQLSyntaxManager
syntaxManager
,
@NotNull
SQLRuleManager
ruleManager
,
@NotNull
IDocument
document
)
{
this
.
dataSource
=
dataSource
;
public
SQLParserContext
(
@NotNull
DBP
ContextProvider
contextProvider
,
@NotNull
SQLSyntaxManager
syntaxManager
,
@NotNull
SQLRuleManager
ruleManager
,
@NotNull
IDocument
document
)
{
this
.
contextProvider
=
contextProvider
;
this
.
syntaxManager
=
syntaxManager
;
this
.
ruleManager
=
ruleManager
;
this
.
document
=
document
;
}
@N
otNull
@N
ullable
public
DBPDataSource
getDataSource
()
{
return
dataSource
;
DBCExecutionContext
executionContext
=
contextProvider
.
getExecutionContext
();
return
executionContext
==
null
?
null
:
executionContext
.
getDataSource
();
}
@NotNull
...
...
@@ -69,7 +74,7 @@ public class SQLParserContext {
}
public
SQLDialect
getDialect
()
{
return
SQLUtils
.
getDialectFromDataSource
(
dataSource
);
return
SQLUtils
.
getDialectFromDataSource
(
getDataSource
()
);
}
public
TPRuleBasedScanner
getScanner
()
{
...
...
@@ -81,7 +86,10 @@ public class SQLParserContext {
}
public
DBPPreferenceStore
getPreferenceStore
()
{
return
dataSource
.
getContainer
().
getPreferenceStore
();
DBPDataSource
dataSource
=
getDataSource
();
return
dataSource
==
null
?
DBWorkbench
.
getPlatform
().
getPreferenceStore
()
:
dataSource
.
getContainer
().
getPreferenceStore
();
}
void
startScriptEvaluation
()
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
浏览文件 @
a86630a6
...
...
@@ -410,8 +410,8 @@ public final class SQLUtils {
}
@NotNull
public
static
SQLDialect
getDialectFromDataSource
(
@N
otNull
DBPDataSource
dataSource
)
{
return
dataSource
.
getSQLDialect
();
public
static
SQLDialect
getDialectFromDataSource
(
@N
ullable
DBPDataSource
dataSource
)
{
return
dataSource
==
null
?
BasicSQLDialect
.
INSTANCE
:
dataSource
.
getSQLDialect
();
}
public
static
void
appendConditionString
(
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
浏览文件 @
a86630a6
...
...
@@ -98,6 +98,7 @@ public abstract class SQLEditorBase extends BaseTextEditor implements DBPContext
private
final
SQLSyntaxManager
syntaxManager
;
@NotNull
private
final
SQLRuleScanner
ruleScanner
;
@Nullable
private
SQLParserContext
parserContext
;
private
ProjectionSupport
projectionSupport
;
...
...
@@ -555,7 +556,7 @@ public abstract class SQLEditorBase extends BaseTextEditor implements DBPContext
ruleManager
.
loadRules
(
getDataSource
(),
SQLEditorBase
.
isBigScript
(
getEditorInput
()));
ruleScanner
.
refreshRules
(
getDataSource
(),
ruleManager
);
parserContext
=
new
SQLParserContext
(
getDataSource
()
,
syntaxManager
,
ruleManager
,
document
!=
null
?
document
:
new
Document
());
parserContext
=
new
SQLParserContext
(
SQLEditorBase
.
this
,
syntaxManager
,
ruleManager
,
document
!=
null
?
document
:
new
Document
());
if
(
document
instanceof
IDocumentExtension3
)
{
IDocumentPartitioner
partitioner
=
new
FastPartitioner
(
...
...
@@ -631,21 +632,30 @@ public abstract class SQLEditorBase extends BaseTextEditor implements DBPContext
@Nullable
public
SQLScriptElement
extractActiveQuery
()
{
if
(
parserContext
==
null
)
{
return
null
;
}
ITextSelection
selection
=
(
ITextSelection
)
getSelectionProvider
().
getSelection
();
return
SQLScriptParser
.
extractActiveQuery
(
parserContext
,
selection
.
getOffset
(),
selection
.
getLength
());
}
public
SQLScriptElement
extractQueryAtPos
(
int
currentPos
)
{
return
SQLScriptParser
.
extractQueryAtPos
(
parserContext
,
currentPos
);
return
parserContext
==
null
?
null
:
SQLScriptParser
.
extractQueryAtPos
(
parserContext
,
currentPos
);
}
public
SQLScriptElement
extractNextQuery
(
boolean
next
)
{
if
(
parserContext
==
null
)
{
return
null
;
}
ITextSelection
selection
=
(
ITextSelection
)
getSelectionProvider
().
getSelection
();
int
offset
=
selection
.
getOffset
();
return
SQLScriptParser
.
extractNextQuery
(
parserContext
,
offset
,
next
);
}
public
List
<
SQLScriptElement
>
extractScriptQueries
(
int
startOffset
,
int
length
,
boolean
scriptMode
,
boolean
keepDelimiters
,
boolean
parseParameters
)
{
if
(
parserContext
==
null
)
{
return
null
;
}
return
SQLScriptParser
.
extractScriptQueries
(
parserContext
,
startOffset
,
length
,
scriptMode
,
keepDelimiters
,
parseParameters
);
}
...
...
@@ -654,7 +664,10 @@ public abstract class SQLEditorBase extends BaseTextEditor implements DBPContext
}
List
<
SQLQueryParameter
>
parseQueryParameters
(
SQLQuery
query
)
{
SQLParserContext
context
=
new
SQLParserContext
(
getDataSource
(),
parserContext
.
getSyntaxManager
(),
parserContext
.
getRuleManager
(),
new
Document
(
query
.
getText
()));
if
(
parserContext
==
null
)
{
return
null
;
}
SQLParserContext
context
=
new
SQLParserContext
(
SQLEditorBase
.
this
,
parserContext
.
getSyntaxManager
(),
parserContext
.
getRuleManager
(),
new
Document
(
query
.
getText
()));
return
SQLScriptParser
.
parseParameters
(
context
,
0
,
query
.
getLength
());
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录