Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
c231580f
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
c231580f
编写于
6月 03, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Disabling SQL parameters feature
上级
d438eb8a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
33 addition
and
8 deletion
+33
-8
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/DBeaverPreferences.java
...beaver.core/src/org/jkiss/dbeaver/DBeaverPreferences.java
+3
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java
...dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java
+1
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
....core/src/org/jkiss/dbeaver/core/CoreResources.properties
+1
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java
...org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java
+3
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
....core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+6
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
...e/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
+11
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageSQLExecute.java
.../org/jkiss/dbeaver/ui/preferences/PrefPageSQLExecute.java
+8
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/DBeaverPreferences.java
浏览文件 @
c231580f
...
...
@@ -49,6 +49,9 @@ public final class DBeaverPreferences
public
static
final
String
SCRIPT_AUTO_FOLDERS
=
"script.auto.folders"
;
//$NON-NLS-1$
public
static
final
String
SCRIPT_TITLE_PATTERN
=
"script.title.pattern"
;
//$NON-NLS-1$
public
static
final
String
SQL_PARAMETERS_ENABLED
=
"sql.parameter.enabled"
;
//$NON-NLS-1$
public
static
final
String
SQL_PARAMETERS_MARK
=
"sql.parameter.mark"
;
//$NON-NLS-1$
public
static
final
String
STATEMENT_INVALIDATE_BEFORE_EXECUTE
=
"statement.invalidate.before.execute"
;
//$NON-NLS-1$
public
static
final
String
STATEMENT_TIMEOUT
=
"statement.timeout"
;
//$NON-NLS-1$
public
static
final
String
MEMORY_CONTENT_MAX_SIZE
=
"content.memory.maxsize"
;
//$NON-NLS-1$
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java
浏览文件 @
c231580f
...
...
@@ -1255,6 +1255,7 @@ public class CoreMessages extends NLS {
public
static
String
pref_page_sql_editor_checkbox_fetch_resultsets
;
public
static
String
pref_page_sql_editor_text_statement_delimiter
;
public
static
String
pref_page_sql_editor_checkbox_ignore_native_delimiter
;
public
static
String
pref_page_sql_editor_checkbox_enable_sql_parameters
;
public
static
String
pref_page_sql_editor_title_pattern
;
public
static
String
pref_page_sql_editor_checkbox_put_new_scripts
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
浏览文件 @
c231580f
...
...
@@ -838,6 +838,7 @@ pref_page_query_manager_logs_folder=Log files folder
pref_page_sql_editor_checkbox_fetch_resultsets
=
Fetch resultsets
pref_page_sql_editor_text_statement_delimiter
=
Statements delimiter
pref_page_sql_editor_checkbox_ignore_native_delimiter
=
Ignore native delimiter
pref_page_sql_editor_checkbox_enable_sql_parameters
=
Enable SQL parameters
pref_page_sql_editor_checkbox_put_new_scripts
=
Put new scripts in folders
pref_page_sql_editor_title_pattern
=
Script title pattern
pref_page_sql_editor_combo_item_each_line_autocommit
=
After each line (autocommit)
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java
浏览文件 @
c231580f
...
...
@@ -92,6 +92,9 @@ public class DBeaverPreferencesInitializer extends AbstractPreferenceInitializer
RuntimeUtils
.
setDefaultPreferenceValue
(
store
,
DBeaverPreferences
.
SCRIPT_AUTO_FOLDERS
,
false
);
RuntimeUtils
.
setDefaultPreferenceValue
(
store
,
DBeaverPreferences
.
SCRIPT_TITLE_PATTERN
,
SQLEditorInput
.
DEFAULT_PATTERN
);
RuntimeUtils
.
setDefaultPreferenceValue
(
store
,
DBeaverPreferences
.
SQL_PARAMETERS_ENABLED
,
true
);
RuntimeUtils
.
setDefaultPreferenceValue
(
store
,
DBeaverPreferences
.
SQL_PARAMETERS_MARK
,
"?"
);
RuntimeUtils
.
setDefaultPreferenceValue
(
store
,
DBeaverPreferences
.
STATEMENT_INVALIDATE_BEFORE_EXECUTE
,
false
);
RuntimeUtils
.
setDefaultPreferenceValue
(
store
,
DBeaverPreferences
.
STATEMENT_TIMEOUT
,
10
*
1000
);
RuntimeUtils
.
setDefaultPreferenceValue
(
store
,
DBeaverPreferences
.
MEMORY_CONTENT_MAX_SIZE
,
10000
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
浏览文件 @
c231580f
...
...
@@ -235,7 +235,7 @@ public class SQLEditor extends SQLEditorBase implements
}
else
if
(
curDataSource
!=
dataSource
)
{
releaseExecutionContext
();
curDataSource
=
dataSource
;
if
(
dataSourceContainer
.
get
PreferenceStore
().
getBoolean
(
DBeaverPreferences
.
EDITOR_SEPARATE_CONNECTION
))
{
if
(
getActive
PreferenceStore
().
getBoolean
(
DBeaverPreferences
.
EDITOR_SEPARATE_CONNECTION
))
{
try
{
DBeaverUI
.
runInProgressDialog
(
new
DBRRunnableWithProgress
()
{
@Override
...
...
@@ -661,9 +661,11 @@ public class SQLEditor extends SQLEditorBase implements
queryOffset
=
query
.
getOffset
()
+
query
.
getLength
()
+
1
;
}
// Parse parameters
for
(
SQLQuery
query
:
queryList
)
{
query
.
parseParameters
(
getDocument
(),
getSyntaxManager
());
if
(
getActivePreferenceStore
().
getBoolean
(
DBeaverPreferences
.
SQL_PARAMETERS_ENABLED
))
{
// Parse parameters
for
(
SQLQuery
query
:
queryList
)
{
query
.
parseParameters
(
getDocument
(),
getSyntaxManager
());
}
}
return
queryList
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
浏览文件 @
c231580f
...
...
@@ -46,6 +46,7 @@ import org.eclipse.ui.texteditor.templates.ITemplatesPage;
import
org.eclipse.ui.themes.IThemeManager
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.core.DBeaverActivator
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
...
...
@@ -124,6 +125,11 @@ public abstract class SQLEditorBase extends BaseTextEditor {
return
context
==
null
?
null
:
context
.
getDataSource
();
}
public
IPreferenceStore
getActivePreferenceStore
()
{
DBPDataSource
dataSource
=
getDataSource
();
return
dataSource
==
null
?
DBeaverCore
.
getGlobalPreferenceStore
()
:
dataSource
.
getContainer
().
getPreferenceStore
();
}
public
boolean
hasAnnotations
()
{
return
false
;
...
...
@@ -169,7 +175,7 @@ public abstract class SQLEditorBase extends BaseTextEditor {
{
SQLSymbolInserter
symbolInserter
=
new
SQLSymbolInserter
(
this
);
IPreferenceStore
preferenceStore
=
DBeaverCore
.
getGlobal
PreferenceStore
();
IPreferenceStore
preferenceStore
=
getActive
PreferenceStore
();
boolean
closeSingleQuotes
=
preferenceStore
.
getBoolean
(
SQLPreferenceConstants
.
SQLEDITOR_CLOSE_SINGLE_QUOTES
);
boolean
closeDoubleQuotes
=
preferenceStore
.
getBoolean
(
SQLPreferenceConstants
.
SQLEDITOR_CLOSE_DOUBLE_QUOTES
);
boolean
closeBrackets
=
preferenceStore
.
getBoolean
(
SQLPreferenceConstants
.
SQLEDITOR_CLOSE_BRACKETS
);
...
...
@@ -185,7 +191,7 @@ public abstract class SQLEditorBase extends BaseTextEditor {
}
if
(
decorationSupport
!=
null
)
{
decorationSupport
.
install
(
getPreferenceStore
());
decorationSupport
.
install
(
get
Active
PreferenceStore
());
}
}
...
...
@@ -466,7 +472,9 @@ public abstract class SQLEditorBase extends BaseTextEditor {
if
(
sqlQuery
==
null
||
CommonUtils
.
isEmpty
(
sqlQuery
.
getQuery
()))
{
return
null
;
}
sqlQuery
.
parseParameters
(
getDocument
(),
getSyntaxManager
());
if
(
getActivePreferenceStore
().
getBoolean
(
DBeaverPreferences
.
SQL_PARAMETERS_ENABLED
))
{
sqlQuery
.
parseParameters
(
getDocument
(),
getSyntaxManager
());
}
return
sqlQuery
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageSQLExecute.java
浏览文件 @
c231580f
...
...
@@ -48,6 +48,7 @@ public class PrefPageSQLExecute extends TargetPrefPage
private
Button
fetchResultSetsCheck
;
private
Text
statementDelimiterText
;
private
Button
ignoreNativeDelimiter
;
private
Button
enableSQLParameters
;
public
PrefPageSQLExecute
()
{
...
...
@@ -66,7 +67,8 @@ public class PrefPageSQLExecute extends TargetPrefPage
store
.
contains
(
DBeaverPreferences
.
SCRIPT_COMMIT_LINES
)
||
store
.
contains
(
DBeaverPreferences
.
SCRIPT_FETCH_RESULT_SETS
)
||
store
.
contains
(
DBeaverPreferences
.
SCRIPT_STATEMENT_DELIMITER
)
||
store
.
contains
(
DBeaverPreferences
.
SCRIPT_IGNORE_NATIVE_DELIMITER
)
store
.
contains
(
DBeaverPreferences
.
SCRIPT_IGNORE_NATIVE_DELIMITER
)
||
store
.
contains
(
DBeaverPreferences
.
SQL_PARAMETERS_ENABLED
)
;
}
...
...
@@ -133,6 +135,7 @@ public class PrefPageSQLExecute extends TargetPrefPage
fetchResultSetsCheck
=
UIUtils
.
createLabelCheckbox
(
scriptsGroup
,
CoreMessages
.
pref_page_sql_editor_checkbox_fetch_resultsets
,
false
);
statementDelimiterText
=
UIUtils
.
createLabelText
(
scriptsGroup
,
CoreMessages
.
pref_page_sql_editor_text_statement_delimiter
,
""
);
ignoreNativeDelimiter
=
UIUtils
.
createLabelCheckbox
(
scriptsGroup
,
CoreMessages
.
pref_page_sql_editor_checkbox_ignore_native_delimiter
,
false
);
enableSQLParameters
=
UIUtils
.
createLabelCheckbox
(
scriptsGroup
,
CoreMessages
.
pref_page_sql_editor_checkbox_enable_sql_parameters
,
true
);
}
return
composite
;
...
...
@@ -151,6 +154,7 @@ public class PrefPageSQLExecute extends TargetPrefPage
fetchResultSetsCheck
.
setSelection
(
store
.
getBoolean
(
DBeaverPreferences
.
SCRIPT_FETCH_RESULT_SETS
));
statementDelimiterText
.
setText
(
store
.
getString
(
DBeaverPreferences
.
SCRIPT_STATEMENT_DELIMITER
));
ignoreNativeDelimiter
.
setSelection
(
store
.
getBoolean
(
DBeaverPreferences
.
SCRIPT_IGNORE_NATIVE_DELIMITER
));
enableSQLParameters
.
setSelection
(
store
.
getBoolean
(
DBeaverPreferences
.
SQL_PARAMETERS_ENABLED
));
}
catch
(
Exception
e
)
{
log
.
warn
(
e
);
}
...
...
@@ -169,6 +173,7 @@ public class PrefPageSQLExecute extends TargetPrefPage
store
.
setValue
(
DBeaverPreferences
.
SCRIPT_FETCH_RESULT_SETS
,
fetchResultSetsCheck
.
getSelection
());
store
.
setValue
(
DBeaverPreferences
.
SCRIPT_STATEMENT_DELIMITER
,
statementDelimiterText
.
getText
());
store
.
setValue
(
DBeaverPreferences
.
SCRIPT_IGNORE_NATIVE_DELIMITER
,
ignoreNativeDelimiter
.
getSelection
());
store
.
setValue
(
DBeaverPreferences
.
SQL_PARAMETERS_ENABLED
,
enableSQLParameters
.
getSelection
());
}
catch
(
Exception
e
)
{
log
.
warn
(
e
);
}
...
...
@@ -187,6 +192,8 @@ public class PrefPageSQLExecute extends TargetPrefPage
store
.
setToDefault
(
DBeaverPreferences
.
SCRIPT_FETCH_RESULT_SETS
);
store
.
setToDefault
(
DBeaverPreferences
.
SCRIPT_STATEMENT_DELIMITER
);
store
.
setToDefault
(
DBeaverPreferences
.
SCRIPT_IGNORE_NATIVE_DELIMITER
);
store
.
setToDefault
(
DBeaverPreferences
.
SQL_PARAMETERS_ENABLED
);
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录