Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
31b0c854
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,发现更多精彩内容 >>
提交
31b0c854
编写于
10月 17, 2014
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Mongo auth & connection test improvement
上级
6ced9a78
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
1 deletion
+5
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBConstants.java
...dbeaver.core/src/org/jkiss/dbeaver/model/DBConstants.java
+1
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
...jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
+4
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBConstants.java
浏览文件 @
31b0c854
...
@@ -36,6 +36,7 @@ public class DBConstants {
...
@@ -36,6 +36,7 @@ public class DBConstants {
public
static
final
String
PROP_ID_TYPE_NAME
=
"typeName"
;
//NON-NLS-1
public
static
final
String
PROP_ID_TYPE_NAME
=
"typeName"
;
//NON-NLS-1
public
static
final
String
PROP_ID_MAX_LENGTH
=
"maxLength"
;
//NON-NLS-1
public
static
final
String
PROP_ID_MAX_LENGTH
=
"maxLength"
;
//NON-NLS-1
public
static
final
String
PROP_ID_NOT_NULL
=
"notNull"
;
//NON-NLS-1
public
static
final
String
PROP_ID_NOT_NULL
=
"notNull"
;
//NON-NLS-1
public
static
final
String
PARAM_INIT_ON_TEST
=
"initOnTest"
;
//NON-NLS-1
public
static
final
String
INTERNAL_PROP_PREFIX
=
"@dbeaver-"
;
//NON-NLS-1
public
static
final
String
INTERNAL_PROP_PREFIX
=
"@dbeaver-"
;
//NON-NLS-1
public
static
final
String
DEFAULT_DRIVER_PROP_PREFIX
=
INTERNAL_PROP_PREFIX
+
"default-"
;
//NON-NLS-1
public
static
final
String
DEFAULT_DRIVER_PROP_PREFIX
=
INTERNAL_PROP_PREFIX
+
"default-"
;
//NON-NLS-1
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
浏览文件 @
31b0c854
...
@@ -26,6 +26,7 @@ import org.eclipse.osgi.util.NLS;
...
@@ -26,6 +26,7 @@ import org.eclipse.osgi.util.NLS;
import
org.eclipse.ui.INewWizard
;
import
org.eclipse.ui.INewWizard
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.model.DBConstants
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.DBPDataSourceInfo
;
import
org.jkiss.dbeaver.model.DBPDataSourceInfo
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionPurpose
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionPurpose
;
...
@@ -126,10 +127,12 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
...
@@ -126,10 +127,12 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
String
driverName
;
String
driverName
;
String
driverVersion
;
String
driverVersion
;
private
final
DataSourceDescriptor
testDataSource
;
private
final
DataSourceDescriptor
testDataSource
;
private
boolean
initOnTest
;
public
ConnectionTester
(
DataSourceDescriptor
testDataSource
)
public
ConnectionTester
(
DataSourceDescriptor
testDataSource
)
{
{
this
.
testDataSource
=
testDataSource
;
this
.
testDataSource
=
testDataSource
;
this
.
initOnTest
=
CommonUtils
.
toBoolean
(
testDataSource
.
getDriver
().
getDriverParameter
(
DBConstants
.
PARAM_INIT_ON_TEST
));
productName
=
null
;
productName
=
null
;
productVersion
=
null
;
productVersion
=
null
;
}
}
...
@@ -143,7 +146,7 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
...
@@ -143,7 +146,7 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
try
{
try
{
testDataSource
.
setName
(
testDataSource
.
getConnectionInfo
().
getUrl
());
testDataSource
.
setName
(
testDataSource
.
getConnectionInfo
().
getUrl
());
monitor
.
worked
(
1
);
monitor
.
worked
(
1
);
testDataSource
.
connect
(
monitor
,
false
,
false
);
testDataSource
.
connect
(
monitor
,
initOnTest
,
false
);
monitor
.
worked
(
1
);
monitor
.
worked
(
1
);
DBPDataSource
dataSource
=
testDataSource
.
getDataSource
();
DBPDataSource
dataSource
=
testDataSource
.
getDataSource
();
monitor
.
subTask
(
CoreMessages
.
dialog_connection_wizard_start_connection_monitor_subtask_test
);
monitor
.
subTask
(
CoreMessages
.
dialog_connection_wizard_start_connection_monitor_subtask_test
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录