Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
1ea0e129
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,发现更多精彩内容 >>
提交
1ea0e129
编写于
6月 11, 2014
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use JSQLParser for semantic SQL analysis
上级
b9d65f7b
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
139 addition
and
25 deletion
+139
-25
contrib/plugins/net.sf.jsqlparser_0.9.1.jar
contrib/plugins/net.sf.jsqlparser_0.9.1.jar
+0
-0
features/org.jkiss.dbeaver.core/feature.xml
features/org.jkiss.dbeaver.core/feature.xml
+7
-0
plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
+2
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/sql/parser/SQLSemanticProcessor.java
.../jkiss/dbeaver/model/sql/parser/SQLSemanticProcessor.java
+109
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryJob.java
...r.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryJob.java
+17
-17
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
....core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+1
-7
product/build.xml
product/build.xml
+3
-0
未找到文件。
contrib/plugins/net.sf.jsqlparser_0.9.1.jar
0 → 100644
浏览文件 @
1ea0e129
文件已添加
features/org.jkiss.dbeaver.core/feature.xml
浏览文件 @
1ea0e129
...
...
@@ -62,4 +62,11 @@
version=
"0.0.0"
unpack=
"false"
/>
<plugin
id=
"net.sf.jsqlparser"
download-size=
"0"
install-size=
"0"
version=
"0.0.0"
unpack=
"false"
/>
</feature>
plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
浏览文件 @
1ea0e129
...
...
@@ -131,6 +131,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface,
org.eclipse.jface.text,
org.jkiss.utils;visibility:=reexport,
com.jcraft.jsch
com.jcraft.jsch,
net.sf.jsqlparser
Bundle-Vendor: JKISS
Bundle-Localization: plugin
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/sql/parser/SQLSemanticProcessor.java
0 → 100644
浏览文件 @
1ea0e129
/*
* Copyright (C) 2010-2014 Serge Rieder
* serge@jkiss.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package
org.jkiss.dbeaver.model.sql.parser
;
import
net.sf.jsqlparser.JSQLParserException
;
import
net.sf.jsqlparser.expression.Expression
;
import
net.sf.jsqlparser.expression.operators.conditional.AndExpression
;
import
net.sf.jsqlparser.parser.CCJSqlParserUtil
;
import
net.sf.jsqlparser.statement.Statement
;
import
net.sf.jsqlparser.statement.select.*
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.data.DBDDataFilter
;
import
org.jkiss.dbeaver.model.sql.SQLUtils
;
import
java.util.List
;
/**
* Semantic SQL processor
*/
public
class
SQLSemanticProcessor
{
private
static
final
String
NESTED_QUERY_AlIAS
=
"z_q"
;
public
static
String
wrapQuery
(
final
DBPDataSource
dataSource
,
String
sqlQuery
,
final
DBDDataFilter
dataFilter
)
throws
DBException
{
// Append filter conditions to query
StringBuilder
modifiedQuery
=
new
StringBuilder
(
sqlQuery
.
length
()
+
100
);
modifiedQuery
.
append
(
"SELECT * FROM (\n"
);
modifiedQuery
.
append
(
sqlQuery
);
modifiedQuery
.
append
(
"\n) "
).
append
(
NESTED_QUERY_AlIAS
);
if
(
dataFilter
.
hasConditions
())
{
modifiedQuery
.
append
(
" WHERE "
);
SQLUtils
.
appendConditionString
(
dataFilter
,
dataSource
,
NESTED_QUERY_AlIAS
,
modifiedQuery
,
true
);
}
if
(
dataFilter
.
hasOrdering
())
{
modifiedQuery
.
append
(
" ORDER BY "
);
//$NON-NLS-1$
SQLUtils
.
appendOrderString
(
dataFilter
,
dataSource
,
NESTED_QUERY_AlIAS
,
modifiedQuery
);
}
return
modifiedQuery
.
toString
();
}
public
static
String
patchQuery
(
final
DBPDataSource
dataSource
,
String
sql
,
final
DBDDataFilter
filter
)
throws
DBException
{
try
{
Statement
statement
=
CCJSqlParserUtil
.
parse
(
sql
);
if
(
statement
instanceof
Select
)
{
((
Select
)
statement
).
getSelectBody
().
accept
(
new
SelectVisitor
()
{
@Override
public
void
visit
(
PlainSelect
plainSelect
)
{
try
{
patchSelectQuery
(
dataSource
,
plainSelect
,
filter
);
}
catch
(
JSQLParserException
e
)
{
throw
new
RuntimeException
(
e
);
}
}
@Override
public
void
visit
(
SetOperationList
setOpList
)
{
}
@Override
public
void
visit
(
WithItem
withItem
)
{
}
});
}
return
statement
.
toString
();
}
catch
(
Exception
e
)
{
throw
new
DBException
(
"SQL parse error"
,
e
);
}
}
private
static
void
patchSelectQuery
(
DBPDataSource
dataSource
,
PlainSelect
select
,
DBDDataFilter
filter
)
throws
JSQLParserException
{
// WHERE
FromItem
fromItem
=
select
.
getFromItem
();
String
tableAlias
=
fromItem
.
getAlias
()
==
null
?
null
:
fromItem
.
getAlias
().
getName
();
StringBuilder
whereString
=
new
StringBuilder
();
SQLUtils
.
appendConditionString
(
filter
,
dataSource
,
tableAlias
,
whereString
,
true
);
Expression
filterWhere
=
CCJSqlParserUtil
.
parseCondExpression
(
whereString
.
toString
());
Expression
sourceWhere
=
select
.
getWhere
();
if
(
sourceWhere
==
null
)
{
select
.
setWhere
(
filterWhere
);
}
else
{
select
.
setWhere
(
new
AndExpression
(
select
.
getWhere
(),
filterWhere
));
}
// ORDER
StringBuilder
orderString
=
new
StringBuilder
();
SQLUtils
.
appendOrderString
(
filter
,
dataSource
,
tableAlias
,
orderString
);
List
<
OrderByElement
>
orderByElements
=
select
.
getOrderByElements
();
}
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryJob.java
浏览文件 @
1ea0e129
...
...
@@ -25,6 +25,7 @@ import org.eclipse.core.runtime.Status;
import
org.eclipse.jface.dialogs.IDialogConstants
;
import
org.eclipse.jface.preference.IPreferenceStore
;
import
org.eclipse.ui.IWorkbenchPartSite
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.model.DBPDataKind
;
...
...
@@ -36,7 +37,8 @@ import org.jkiss.dbeaver.model.exec.*;
import
org.jkiss.dbeaver.model.impl.local.LocalResultSet
;
import
org.jkiss.dbeaver.model.qm.QMUtils
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.SQLUtils
;
import
org.jkiss.dbeaver.model.sql.SQLDataSource
;
import
org.jkiss.dbeaver.model.sql.parser.SQLSemanticProcessor
;
import
org.jkiss.dbeaver.runtime.RunnableWithResult
;
import
org.jkiss.dbeaver.runtime.exec.ExecutionQueueErrorJob
;
import
org.jkiss.dbeaver.runtime.jobs.DataSourceJob
;
...
...
@@ -55,7 +57,6 @@ import java.util.List;
public
class
SQLQueryJob
extends
DataSourceJob
{
static
final
Log
log
=
LogFactory
.
getLog
(
SQLQueryJob
.
class
);
private
static
final
String
NESTED_QUERY_AlIAS
=
"z_q"
;
private
final
List
<
SQLStatementInfo
>
queries
;
private
final
SQLResultsConsumer
resultsConsumer
;
...
...
@@ -266,21 +267,20 @@ public class SQLQueryJob extends DataSourceJob
long
startTime
=
System
.
currentTimeMillis
();
String
sqlQuery
=
sqlStatement
.
getQuery
();
DBPDataSource
dataSource
=
getDataSource
();
if
(
dataFilter
!=
null
&&
dataFilter
.
hasFilters
())
{
// Append filter conditions to query
StringBuilder
modifiedQuery
=
new
StringBuilder
(
sqlQuery
.
length
()
+
100
);
modifiedQuery
.
append
(
"SELECT * FROM (\n"
);
modifiedQuery
.
append
(
sqlQuery
);
modifiedQuery
.
append
(
"\n) "
).
append
(
NESTED_QUERY_AlIAS
);
if
(
dataFilter
.
hasConditions
())
{
modifiedQuery
.
append
(
" WHERE "
);
SQLUtils
.
appendConditionString
(
dataFilter
,
getDataSource
(),
NESTED_QUERY_AlIAS
,
modifiedQuery
,
true
);
}
if
(
dataFilter
.
hasOrdering
())
{
modifiedQuery
.
append
(
" ORDER BY "
);
//$NON-NLS-1$
SQLUtils
.
appendOrderString
(
dataFilter
,
getDataSource
(),
NESTED_QUERY_AlIAS
,
modifiedQuery
);
try
{
if
(
dataSource
instanceof
SQLDataSource
&&
((
SQLDataSource
)
dataSource
).
getSQLDialect
().
supportsSubqueries
())
{
sqlQuery
=
SQLSemanticProcessor
.
wrapQuery
(
dataSource
,
sqlQuery
,
dataFilter
);
}
else
{
sqlQuery
=
SQLSemanticProcessor
.
patchQuery
(
dataSource
,
sqlQuery
,
dataFilter
);
}
}
catch
(
DBException
e
)
{
// Can't parse query semantics
lastError
=
e
;
return
false
;
}
sqlQuery
=
modifiedQuery
.
toString
();
}
statistics
.
setQueryText
(
sqlQuery
);
SQLQueryResult
curResult
=
new
SQLQueryResult
(
sqlStatement
);
...
...
@@ -296,8 +296,8 @@ public class SQLQueryJob extends DataSourceJob
closeStatement
();
// Check and invalidate connection
if
(!
connectionInvalidated
&&
getDataSource
()
.
getContainer
().
getPreferenceStore
().
getBoolean
(
DBeaverPreferences
.
STATEMENT_INVALIDATE_BEFORE_EXECUTE
))
{
getDataSource
()
.
invalidateContext
(
session
.
getProgressMonitor
());
if
(!
connectionInvalidated
&&
dataSource
.
getContainer
().
getPreferenceStore
().
getBoolean
(
DBeaverPreferences
.
STATEMENT_INVALIDATE_BEFORE_EXECUTE
))
{
dataSource
.
invalidateContext
(
session
.
getProgressMonitor
());
connectionInvalidated
=
true
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
浏览文件 @
1ea0e129
...
...
@@ -1140,13 +1140,7 @@ public class SQLEditor extends SQLEditorBase
int
features
=
DATA_SELECT
;
if
(
resultSetNumber
==
0
)
{
final
SQLQueryJob
job
=
queryProcessor
.
curJob
;
if
(
job
!=
null
)
{
DBPDataSource
dataSource
=
getDataSource
();
if
(
dataSource
instanceof
SQLDataSource
&&
((
SQLDataSource
)
dataSource
).
getSQLDialect
().
supportsSubqueries
())
{
features
|=
DATA_FILTER
;
}
}
features
|=
DATA_FILTER
;
}
return
features
;
}
...
...
product/build.xml
浏览文件 @
1ea0e129
...
...
@@ -70,6 +70,9 @@
<fileset
dir=
"../eclipse"
>
<include
name=
"**.jar"
/>
</fileset>
<fileset
dir=
"../contrib/plugins"
>
<include
name=
"**.jar"
/>
</fileset>
<fileset
dir=
"../contrib/drivers/plugins"
>
<include
name=
"**"
/>
</fileset>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录