Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
fd01f8fb
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,发现更多精彩内容 >>
提交
fd01f8fb
编写于
6月 25, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Connection configuration refactoring
Former-commit-id:
49d1f794
上级
cfeda1dc
变更
54
隐藏空白更改
内联
并排
Showing
54 changed file
with
258 addition
and
176 deletion
+258
-176
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionBootstrap.java
...e/src/org/jkiss/dbeaver/model/DBPConnectionBootstrap.java
+85
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionConfiguration.java
...c/org/jkiss/dbeaver/model/DBPConnectionConfiguration.java
+11
-13
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSourceProvider.java
...re/src/org/jkiss/dbeaver/model/DBPDataSourceProvider.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSourceRegistry.java
...re/src/org/jkiss/dbeaver/model/DBPDataSourceRegistry.java
+3
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java
...src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceProvider.java
...jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceProvider.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/HTTPTunnelImpl.java
.../src/org/jkiss/dbeaver/model/impl/net/HTTPTunnelImpl.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java
...e/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java
+4
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/DBWTunnel.java
...eaver.core/src/org/jkiss/dbeaver/model/net/DBWTunnel.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/struct/DBSDataSourceContainer.java
...rg/jkiss/dbeaver/model/struct/DBSDataSourceContainer.java
+6
-6
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
.../src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+9
-9
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
...g/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
...re/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
+15
-15
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/EventProcessorJob.java
...src/org/jkiss/dbeaver/runtime/jobs/EventProcessorJob.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/net/GlobalProxyAuthenticator.java
...g/jkiss/dbeaver/runtime/net/GlobalProxyAuthenticator.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/net/GlobalProxySelector.java
...rc/org/jkiss/dbeaver/runtime/net/GlobalProxySelector.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/IDataSourceConnectionEditorSite.java
...org/jkiss/dbeaver/ui/IDataSourceConnectionEditorSite.java
+0
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
....jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java
...eaver/ui/actions/datasource/DataSourceConnectHandler.java
+9
-9
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ConnectionPropertiesControl.java
...kiss/dbeaver/ui/controls/ConnectionPropertiesControl.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageAbstract.java
...dbeaver/ui/dialogs/connection/ConnectionPageAbstract.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
.../dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
+9
-9
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageNetwork.java
.../dbeaver/ui/dialogs/connection/ConnectionPageNetwork.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageSettings.java
...dbeaver/ui/dialogs/connection/ConnectionPageSettings.java
+4
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
...jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/DriverPropertiesDialogPage.java
...ver/ui/dialogs/connection/DriverPropertiesDialogPage.java
+7
-7
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
...s/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditShellCommandsDialogPage.java
...er/ui/dialogs/connection/EditShellCommandsDialogPage.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/NewConnectionWizard.java
...ss/dbeaver/ui/dialogs/connection/NewConnectionWizard.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/tools/AbstractToolWizard.java
...rg/jkiss/dbeaver/ui/dialogs/tools/AbstractToolWizard.java
+4
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorUtils.java
...src/org/jkiss/dbeaver/ui/editors/DatabaseEditorUtils.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorInput.java
.../src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorInput.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DataSourceManagementToolbar.java
...s/dbeaver/ui/perspective/DataSourceManagementToolbar.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/DatabaseNavigatorLabelProvider.java
...ws/navigator/database/DatabaseNavigatorLabelProvider.java
+1
-1
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/DB2DataSourceProvider.java
.../src/org/jkiss/dbeaver/ext/db2/DB2DataSourceProvider.java
+2
-2
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
...b2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
+3
-3
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/views/DB2ConnectionPage.java
...rc/org/jkiss/dbeaver/ext/db2/views/DB2ConnectionPage.java
+3
-3
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/views/DB2ConnectionTracePage.java
...g/jkiss/dbeaver/ext/db2/views/DB2ConnectionTracePage.java
+4
-4
plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/GenericDataSourceProvider.java
.../jkiss/dbeaver/ext/generic/GenericDataSourceProvider.java
+2
-2
plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataSource.java
...rg/jkiss/dbeaver/ext/generic/model/GenericDataSource.java
+1
-1
plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/views/GenericConnectionPage.java
...kiss/dbeaver/ext/generic/views/GenericConnectionPage.java
+3
-3
plugins/org.jkiss.dbeaver.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizard.java
...dbeaver/ext/import_config/wizards/ConfigImportWizard.java
+2
-2
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/MySQLDataSourceProvider.java
.../org/jkiss/dbeaver/ext/mysql/MySQLDataSourceProvider.java
+1
-1
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLDatabaseWizardPageSettings.java
...aver/ext/mysql/tools/MySQLDatabaseWizardPageSettings.java
+2
-2
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java
...rc/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java
+2
-2
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/views/MySQLConnectionPage.java
...rg/jkiss/dbeaver/ext/mysql/views/MySQLConnectionPage.java
+3
-3
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleDataSourceProvider.java
...rg/jkiss/dbeaver/ext/oracle/OracleDataSourceProvider.java
+1
-1
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
.../org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
+3
-3
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleScriptExecuteWizard.java
...s/dbeaver/ext/oracle/tools/OracleScriptExecuteWizard.java
+2
-2
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionExtraPage.java
...s/dbeaver/ext/oracle/views/OracleConnectionExtraPage.java
+4
-4
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionPage.java
.../jkiss/dbeaver/ext/oracle/views/OracleConnectionPage.java
+4
-4
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/WMIDataSourceProvider.java
.../src/org/jkiss/dbeaver/ext/wmi/WMIDataSourceProvider.java
+2
-2
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSource.java
...mi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSource.java
+2
-2
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/views/WMIConnectionPage.java
...rc/org/jkiss/dbeaver/ext/wmi/views/WMIConnectionPage.java
+3
-3
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionBootstrap.java
0 → 100644
浏览文件 @
fd01f8fb
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License (version 2)
* as published by the Free Software Foundation.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
package
org.jkiss.dbeaver.model
;
import
java.util.*
;
/**
* Connection bootstrap info.
* Bootstrap properties are applied to each opened connection after data-source initialization.
*/
public
class
DBPConnectionBootstrap
{
private
String
defaultObjectName
;
private
Boolean
defaultAutoCommit
;
private
Integer
defaultTransactionIsolation
;
private
final
List
<
String
>
initQueries
;
private
boolean
ignoreErrors
;
public
DBPConnectionBootstrap
()
{
this
.
initQueries
=
new
ArrayList
<
String
>();
this
.
ignoreErrors
=
false
;
}
public
DBPConnectionBootstrap
(
DBPConnectionBootstrap
info
)
{
this
.
defaultObjectName
=
info
.
defaultObjectName
;
this
.
defaultAutoCommit
=
info
.
defaultAutoCommit
;
this
.
defaultTransactionIsolation
=
info
.
defaultTransactionIsolation
;
this
.
initQueries
=
new
ArrayList
<
String
>(
info
.
initQueries
);
this
.
ignoreErrors
=
info
.
ignoreErrors
;
}
public
List
<
String
>
getInitQueries
()
{
return
initQueries
;
}
public
String
getDefaultObjectName
()
{
return
defaultObjectName
;
}
public
void
setDefaultObjectName
(
String
defaultObjectName
)
{
this
.
defaultObjectName
=
defaultObjectName
;
}
public
Boolean
getDefaultAutoCommit
()
{
return
defaultAutoCommit
;
}
public
void
setDefaultAutoCommit
(
Boolean
defaultAutoCommit
)
{
this
.
defaultAutoCommit
=
defaultAutoCommit
;
}
public
Integer
getDefaultTransactionIsolation
()
{
return
defaultTransactionIsolation
;
}
public
void
setDefaultTransactionIsolation
(
Integer
defaultTransactionIsolation
)
{
this
.
defaultTransactionIsolation
=
defaultTransactionIsolation
;
}
public
boolean
isIgnoreErrors
()
{
return
ignoreErrors
;
}
public
void
setIgnoreErrors
(
boolean
ignoreErrors
)
{
this
.
ignoreErrors
=
ignoreErrors
;
}
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnection
Info
.java
→
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnection
Configuration
.java
浏览文件 @
fd01f8fb
...
...
@@ -24,11 +24,10 @@ import org.jkiss.dbeaver.model.runtime.DBRShellCommand;
import
java.util.*
;
/**
*
DBPConnectionInfo
*
Connection configuration.
*/
public
class
DBPConnection
Info
implements
DBPObject
public
class
DBPConnection
Configuration
implements
DBPObject
{
private
String
hostName
;
private
String
hostPort
;
private
String
serverName
;
...
...
@@ -40,25 +39,20 @@ public class DBPConnectionInfo implements DBPObject
private
final
Map
<
Object
,
Object
>
properties
;
private
final
Map
<
DBPConnectionEventType
,
DBRShellCommand
>
events
;
private
final
List
<
DBWHandlerConfiguration
>
handlers
;
private
final
List
<
String
>
bootstrapQueries
;
private
final
DBPConnectionBootstrap
bootstrap
;
private
DBPConnectionType
connectionType
;
private
String
connectionColor
;
public
static
class
Bootstrap
{
List
<
String
>
queries
;
boolean
ignoreErrors
;
}
public
DBPConnectionInfo
()
public
DBPConnectionConfiguration
()
{
this
.
connectionType
=
DBPConnectionType
.
DEFAULT_TYPE
;
this
.
properties
=
new
HashMap
<
Object
,
Object
>();
this
.
events
=
new
HashMap
<
DBPConnectionEventType
,
DBRShellCommand
>();
this
.
handlers
=
new
ArrayList
<
DBWHandlerConfiguration
>();
this
.
bootstrap
Queries
=
new
ArrayList
<
String
>
();
this
.
bootstrap
=
new
DBPConnectionBootstrap
();
}
public
DBPConnection
Info
(
DBPConnectionInfo
info
)
public
DBPConnection
Configuration
(
DBPConnectionConfiguration
info
)
{
this
.
hostName
=
info
.
hostName
;
this
.
hostPort
=
info
.
hostPort
;
...
...
@@ -78,7 +72,7 @@ public class DBPConnectionInfo implements DBPObject
for
(
DBWHandlerConfiguration
handler
:
info
.
handlers
)
{
this
.
handlers
.
add
(
new
DBWHandlerConfiguration
(
handler
));
}
this
.
bootstrap
Queries
=
new
ArrayList
<
String
>(
info
.
bootstrapQueries
);
this
.
bootstrap
=
new
DBPConnectionBootstrap
(
info
.
bootstrap
);
}
public
String
getClientHomeId
()
...
...
@@ -252,4 +246,8 @@ public class DBPConnectionInfo implements DBPObject
{
this
.
connectionColor
=
color
;
}
public
DBPConnectionBootstrap
getBootstrap
()
{
return
bootstrap
;
}
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSourceProvider.java
浏览文件 @
fd01f8fb
...
...
@@ -55,7 +55,7 @@ public interface DBPDataSourceProvider
DBPPropertyDescriptor
[]
getConnectionProperties
(
DBRRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
DBPConnection
Configuration
connectionInfo
)
throws
DBException
;
/**
...
...
@@ -64,7 +64,7 @@ public interface DBPDataSourceProvider
* @param connectionInfo connection info
* @return valid connection URL or null (if URLs not supported by driver)
*/
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
);
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Configuration
connectionInfo
);
/**
* Opens new data source
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSourceRegistry.java
浏览文件 @
fd01f8fb
...
...
@@ -29,6 +29,9 @@ import java.util.List;
*/
public
interface
DBPDataSourceRegistry
{
/**
* Owner project.
*/
IProject
getProject
();
@Nullable
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java
浏览文件 @
fd01f8fb
...
...
@@ -108,7 +108,7 @@ public abstract class JDBCDataSource
}
}
DBPConnection
Info
connectionInfo
=
container
.
getActualConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
container
.
getActualConnectionConfiguration
();
if
(
connectionInfo
.
getProperties
()
!=
null
)
{
for
(
Map
.
Entry
<
Object
,
Object
>
prop
:
connectionInfo
.
getProperties
().
entrySet
())
{
connectProps
.
setProperty
(
CommonUtils
.
toString
(
prop
.
getKey
()),
CommonUtils
.
toString
(
prop
.
getValue
()));
...
...
@@ -163,12 +163,12 @@ public abstract class JDBCDataSource
}
}
protected
String
getConnectionUserName
(
DBPConnection
Info
connectionInfo
)
protected
String
getConnectionUserName
(
DBPConnection
Configuration
connectionInfo
)
{
return
connectionInfo
.
getUserName
();
}
protected
String
getConnectionUserPassword
(
DBPConnection
Info
connectionInfo
)
protected
String
getConnectionUserPassword
(
DBPConnection
Configuration
connectionInfo
)
{
return
connectionInfo
.
getUserPassword
();
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceProvider.java
浏览文件 @
fd01f8fb
...
...
@@ -52,7 +52,7 @@ public abstract class JDBCDataSourceProvider implements DBPDataSourceProvider {
public
DBPPropertyDescriptor
[]
getConnectionProperties
(
DBRRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
DBPConnection
Configuration
connectionInfo
)
throws
DBException
{
Collection
<
DBPPropertyDescriptor
>
props
=
null
;
Object
driverInstance
=
driver
.
getDriverInstance
(
runnableContext
);
...
...
@@ -66,7 +66,7 @@ public abstract class JDBCDataSourceProvider implements DBPDataSourceProvider {
}
private
Collection
<
DBPPropertyDescriptor
>
readDriverProperties
(
DBPConnection
Info
connectionInfo
,
DBPConnection
Configuration
connectionInfo
,
Driver
driver
)
throws
DBException
{
Properties
driverProps
=
new
Properties
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/HTTPTunnelImpl.java
浏览文件 @
fd01f8fb
...
...
@@ -18,7 +18,7 @@
package
org.jkiss.dbeaver.model.impl.net
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.net.DBWHandlerConfiguration
;
import
org.jkiss.dbeaver.model.net.DBWTunnel
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
...
...
@@ -31,14 +31,14 @@ import java.io.IOException;
public
class
HTTPTunnelImpl
implements
DBWTunnel
{
@Override
public
DBPConnection
Info
initializeTunnel
(
DBRProgressMonitor
monitor
,
DBWHandlerConfiguration
configuration
,
DBPConnectionInfo
connectionInfo
)
public
DBPConnection
Configuration
initializeTunnel
(
DBRProgressMonitor
monitor
,
DBWHandlerConfiguration
configuration
,
DBPConnectionConfiguration
connectionInfo
)
throws
DBException
,
IOException
{
return
connectionInfo
;
}
@Override
public
void
closeTunnel
(
DBRProgressMonitor
monitor
,
DBPConnection
Info
connectionInfo
)
throws
DBException
,
IOException
public
void
closeTunnel
(
DBRProgressMonitor
monitor
,
DBPConnection
Configuration
connectionInfo
)
throws
DBException
,
IOException
{
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java
浏览文件 @
fd01f8fb
...
...
@@ -22,7 +22,7 @@ import org.jkiss.dbeaver.DBException;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.core.Log
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.net.DBWHandlerConfiguration
;
import
org.jkiss.dbeaver.model.net.DBWTunnel
;
...
...
@@ -48,7 +48,7 @@ public class SSHTunnelImpl implements DBWTunnel {
private
transient
Session
session
;
@Override
public
DBPConnection
Info
initializeTunnel
(
DBRProgressMonitor
monitor
,
DBWHandlerConfiguration
configuration
,
DBPConnectionInfo
connectionInfo
)
public
DBPConnection
Configuration
initializeTunnel
(
DBRProgressMonitor
monitor
,
DBWHandlerConfiguration
configuration
,
DBPConnectionConfiguration
connectionInfo
)
throws
DBException
,
IOException
{
String
dbPortString
=
connectionInfo
.
getHostPort
();
...
...
@@ -143,7 +143,7 @@ public class SSHTunnelImpl implements DBWTunnel {
}
catch
(
JSchException
e
)
{
throw
new
DBException
(
"Cannot establish tunnel"
,
e
);
}
connectionInfo
=
new
DBPConnection
Info
(
connectionInfo
);
connectionInfo
=
new
DBPConnection
Configuration
(
connectionInfo
);
String
newPortValue
=
String
.
valueOf
(
localPort
);
// Replace database host/port and URL - let's use localhost
connectionInfo
.
setHostName
(
LOCALHOST_NAME
);
...
...
@@ -178,7 +178,7 @@ public class SSHTunnelImpl implements DBWTunnel {
}
@Override
public
void
closeTunnel
(
DBRProgressMonitor
monitor
,
DBPConnection
Info
connectionInfo
)
throws
DBException
,
IOException
public
void
closeTunnel
(
DBRProgressMonitor
monitor
,
DBPConnection
Configuration
connectionInfo
)
throws
DBException
,
IOException
{
if
(
session
!=
null
)
{
session
.
disconnect
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/DBWTunnel.java
浏览文件 @
fd01f8fb
...
...
@@ -18,7 +18,7 @@
package
org.jkiss.dbeaver.model.net
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
java.io.IOException
;
...
...
@@ -28,10 +28,10 @@ import java.io.IOException;
*/
public
interface
DBWTunnel
extends
DBWNetworkHandler
{
DBPConnection
Info
initializeTunnel
(
DBRProgressMonitor
monitor
,
DBWHandlerConfiguration
configuration
,
DBPConnectionInfo
connectionInfo
)
DBPConnection
Configuration
initializeTunnel
(
DBRProgressMonitor
monitor
,
DBWHandlerConfiguration
configuration
,
DBPConnectionConfiguration
connectionInfo
)
throws
DBException
,
IOException
;
void
closeTunnel
(
DBRProgressMonitor
monitor
,
DBPConnection
Info
connectionInfo
)
void
closeTunnel
(
DBRProgressMonitor
monitor
,
DBPConnection
Configuration
connectionInfo
)
throws
DBException
,
IOException
;
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/struct/DBSDataSourceContainer.java
浏览文件 @
fd01f8fb
...
...
@@ -48,18 +48,18 @@ public interface DBSDataSourceContainer extends DBSObject, DBDPreferences
DBPDriver
getDriver
();
/**
* Connection
info
* Connection
configuration.
* @return connection details
*/
@NotNull
DBPConnection
Info
getConnectionInfo
();
DBPConnection
Configuration
getConnectionConfiguration
();
/**
* Actual connection
info
. Contains actual parameters used to connect to this datasource.
* Differs from getConnection
Info
() in case if tunnel or proxy was used.
* @return actual connection
info
.
* Actual connection
configuration
. Contains actual parameters used to connect to this datasource.
* Differs from getConnection
Configuration
() in case if tunnel or proxy was used.
* @return actual connection
configuration
.
*/
DBPConnection
Info
getActualConnectionInfo
();
DBPConnection
Configuration
getActualConnectionConfiguration
();
boolean
isShowSystemObjects
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
浏览文件 @
fd01f8fb
...
...
@@ -119,8 +119,8 @@ public class DataSourceDescriptor
@NotNull
private
DriverDescriptor
driver
;
@NotNull
private
DBPConnection
Info
connectionInfo
;
private
DBPConnection
Info
tunnelConnectionInfo
;
private
DBPConnection
Configuration
connectionInfo
;
private
DBPConnection
Configuration
tunnelConnectionInfo
;
@NotNull
private
String
id
;
private
String
name
;
...
...
@@ -154,7 +154,7 @@ public class DataSourceDescriptor
@NotNull
DataSourceRegistry
registry
,
@NotNull
String
id
,
@NotNull
DriverDescriptor
driver
,
@NotNull
DBPConnection
Info
connectionInfo
)
@NotNull
DBPConnection
Configuration
connectionInfo
)
{
this
.
registry
=
registry
;
this
.
id
=
id
;
...
...
@@ -218,18 +218,18 @@ public class DataSourceDescriptor
@NotNull
@Override
public
DBPConnection
Info
getConnectionInfo
()
public
DBPConnection
Configuration
getConnectionConfiguration
()
{
return
connectionInfo
;
}
public
void
setConnectionInfo
(
@NotNull
DBPConnection
Info
connectionInfo
)
public
void
setConnectionInfo
(
@NotNull
DBPConnection
Configuration
connectionInfo
)
{
this
.
connectionInfo
=
connectionInfo
;
}
@Override
public
DBPConnection
Info
getActualConnectionInfo
()
public
DBPConnection
Configuration
getActualConnectionConfiguration
()
{
return
tunnelConnectionInfo
!=
null
?
tunnelConnectionInfo
:
connectionInfo
;
}
...
...
@@ -291,7 +291,7 @@ public class DataSourceDescriptor
if
(
preferenceStore
.
contains
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
))
{
return
preferenceStore
.
getBoolean
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
);
}
else
{
return
getConnection
Info
().
getConnectionType
().
isAutocommit
();
return
getConnection
Configuration
().
getConnectionType
().
isAutocommit
();
}
}
...
...
@@ -324,7 +324,7 @@ public class DataSourceDescriptor
}
}
// Save in preferences
if
(
autoCommit
==
getConnection
Info
().
getConnectionType
().
isAutocommit
())
{
if
(
autoCommit
==
getConnection
Configuration
().
getConnectionType
().
isAutocommit
())
{
preferenceStore
.
setToDefault
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
);
}
else
{
preferenceStore
.
setValue
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
,
autoCommit
);
...
...
@@ -600,7 +600,7 @@ public class DataSourceDescriptor
}
connecting
=
true
;
DBPConnection
Info
savedConnectionInfo
=
null
;
DBPConnection
Configuration
savedConnectionInfo
=
null
;
tunnelConnectionInfo
=
null
;
try
{
// Handle tunnel
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
浏览文件 @
fd01f8fb
...
...
@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.registry;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.edit.DBECommandContext
;
import
org.jkiss.dbeaver.model.edit.DBEObjectMaker
;
import
org.jkiss.dbeaver.model.impl.DBSObjectCache
;
...
...
@@ -72,7 +72,7 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
registry
,
DataSourceDescriptor
.
generateNewId
(
dsTpl
.
getDriver
()),
dsTpl
.
getDriver
(),
new
DBPConnection
Info
(
dsTpl
.
getConnectionInfo
()));
new
DBPConnection
Configuration
(
dsTpl
.
getConnectionConfiguration
()));
dataSource
.
copyFrom
(
dsTpl
);
// Generate new name
String
origName
=
dsTpl
.
getName
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
浏览文件 @
fd01f8fb
...
...
@@ -386,7 +386,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
{
// Connection info
DBPConnection
Info
connectionInfo
=
dataSource
.
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
dataSource
.
getConnectionConfiguration
();
xml
.
startElement
(
RegistryConstants
.
TAG_CONNECTION
);
if
(!
CommonUtils
.
isEmpty
(
connectionInfo
.
getHostName
()))
{
xml
.
addAttribute
(
RegistryConstants
.
ATTR_HOST
,
connectionInfo
.
getHostName
());
...
...
@@ -598,7 +598,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
DataSourceRegistry
.
this
,
id
,
driver
,
new
DBPConnection
Info
());
new
DBPConnection
Configuration
());
curDataSource
.
setName
(
name
);
String
createDate
=
atts
.
getValue
(
RegistryConstants
.
ATTR_CREATE_DATE
);
if
(!
CommonUtils
.
isEmpty
(
createDate
))
{
...
...
@@ -637,22 +637,22 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
driver
.
setName
(
atts
.
getValue
(
RegistryConstants
.
ATTR_URL
));
driver
.
setDriverClassName
(
"java.sql.Driver"
);
}
curDataSource
.
getConnection
Info
().
setHostName
(
atts
.
getValue
(
RegistryConstants
.
ATTR_HOST
));
curDataSource
.
getConnection
Info
().
setHostPort
(
atts
.
getValue
(
RegistryConstants
.
ATTR_PORT
));
curDataSource
.
getConnection
Info
().
setServerName
(
atts
.
getValue
(
RegistryConstants
.
ATTR_SERVER
));
curDataSource
.
getConnection
Info
().
setDatabaseName
(
atts
.
getValue
(
RegistryConstants
.
ATTR_DATABASE
));
curDataSource
.
getConnection
Info
().
setUrl
(
atts
.
getValue
(
RegistryConstants
.
ATTR_URL
));
curDataSource
.
getConnection
Info
().
setUserName
(
atts
.
getValue
(
RegistryConstants
.
ATTR_USER
));
curDataSource
.
getConnection
Info
().
setUserPassword
(
decryptPassword
(
atts
.
getValue
(
RegistryConstants
.
ATTR_PASSWORD
)));
curDataSource
.
getConnection
Info
().
setClientHomeId
(
atts
.
getValue
(
RegistryConstants
.
ATTR_HOME
));
curDataSource
.
getConnection
Info
().
setConnectionType
(
curDataSource
.
getConnection
Configuration
().
setHostName
(
atts
.
getValue
(
RegistryConstants
.
ATTR_HOST
));
curDataSource
.
getConnection
Configuration
().
setHostPort
(
atts
.
getValue
(
RegistryConstants
.
ATTR_PORT
));
curDataSource
.
getConnection
Configuration
().
setServerName
(
atts
.
getValue
(
RegistryConstants
.
ATTR_SERVER
));
curDataSource
.
getConnection
Configuration
().
setDatabaseName
(
atts
.
getValue
(
RegistryConstants
.
ATTR_DATABASE
));
curDataSource
.
getConnection
Configuration
().
setUrl
(
atts
.
getValue
(
RegistryConstants
.
ATTR_URL
));
curDataSource
.
getConnection
Configuration
().
setUserName
(
atts
.
getValue
(
RegistryConstants
.
ATTR_USER
));
curDataSource
.
getConnection
Configuration
().
setUserPassword
(
decryptPassword
(
atts
.
getValue
(
RegistryConstants
.
ATTR_PASSWORD
)));
curDataSource
.
getConnection
Configuration
().
setClientHomeId
(
atts
.
getValue
(
RegistryConstants
.
ATTR_HOME
));
curDataSource
.
getConnection
Configuration
().
setConnectionType
(
DataSourceProviderRegistry
.
getInstance
().
getConnectionType
(
CommonUtils
.
toString
(
atts
.
getValue
(
RegistryConstants
.
ATTR_TYPE
)),
DBPConnectionType
.
DEFAULT_TYPE
)
);
String
colorValue
=
atts
.
getValue
(
RegistryConstants
.
ATTR_COLOR
);
if
(!
CommonUtils
.
isEmpty
(
colorValue
))
{
curDataSource
.
getConnection
Info
().
setConnectionColor
(
colorValue
);
curDataSource
.
getConnection
Configuration
().
setConnectionColor
(
colorValue
);
}
curDataSource
.
refreshConnectionInfo
();
}
...
...
@@ -662,7 +662,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
atts
.
getValue
(
RegistryConstants
.
ATTR_NAME
),
atts
.
getValue
(
RegistryConstants
.
ATTR_VALUE
));
}
else
if
(
curDataSource
!=
null
)
{
curDataSource
.
getConnection
Info
().
setProperty
(
curDataSource
.
getConnection
Configuration
().
setProperty
(
atts
.
getValue
(
RegistryConstants
.
ATTR_NAME
),
atts
.
getValue
(
RegistryConstants
.
ATTR_VALUE
));
}
...
...
@@ -674,7 +674,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
curCommand
.
setShowProcessPanel
(
CommonUtils
.
getBoolean
(
atts
.
getValue
(
RegistryConstants
.
ATTR_SHOW_PANEL
)));
curCommand
.
setWaitProcessFinish
(
CommonUtils
.
getBoolean
(
atts
.
getValue
(
RegistryConstants
.
ATTR_WAIT_PROCESS
)));
curCommand
.
setTerminateAtDisconnect
(
CommonUtils
.
getBoolean
(
atts
.
getValue
(
RegistryConstants
.
ATTR_TERMINATE_AT_DISCONNECT
)));
curDataSource
.
getConnection
Info
().
setEvent
(
eventType
,
curCommand
);
curDataSource
.
getConnection
Configuration
().
setEvent
(
eventType
,
curCommand
);
}
}
else
if
(
localName
.
equals
(
RegistryConstants
.
TAG_CUSTOM_PROPERTY
))
{
if
(
curDataSource
!=
null
)
{
...
...
@@ -696,7 +696,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
curNetworkHandler
.
setUserName
(
CommonUtils
.
notEmpty
(
atts
.
getValue
(
RegistryConstants
.
ATTR_USER
)));
curNetworkHandler
.
setSavePassword
(
CommonUtils
.
getBoolean
(
atts
.
getValue
(
RegistryConstants
.
ATTR_SAVE_PASSWORD
)));
curNetworkHandler
.
setPassword
(
decryptPassword
(
atts
.
getValue
(
RegistryConstants
.
ATTR_PASSWORD
)));
curDataSource
.
getConnection
Info
().
addHandler
(
curNetworkHandler
);
curDataSource
.
getConnection
Configuration
().
addHandler
(
curNetworkHandler
);
}
}
else
if
(
localName
.
equals
(
RegistryConstants
.
TAG_FILTER
))
{
if
(
curDataSource
!=
null
)
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/EventProcessorJob.java
浏览文件 @
fd01f8fb
...
...
@@ -25,7 +25,7 @@ import org.jkiss.dbeaver.DBException;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.core.Log
;
import
org.jkiss.dbeaver.model.DBPConnectionEventType
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.runtime.DBRProcessDescriptor
;
import
org.jkiss.dbeaver.model.runtime.DBRShellCommand
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
...
...
@@ -62,7 +62,7 @@ public abstract class EventProcessorJob extends AbstractJob {
protected
void
processEvents
(
DBPConnectionEventType
eventType
)
{
DBPConnection
Info
info
=
container
.
getActualConnectionInfo
();
DBPConnection
Configuration
info
=
container
.
getActualConnectionConfiguration
();
DBRShellCommand
command
=
info
.
getEvent
(
eventType
);
if
(
command
!=
null
&&
command
.
isEnabled
())
{
Map
<
String
,
Object
>
variables
=
new
HashMap
<
String
,
Object
>();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/net/GlobalProxyAuthenticator.java
浏览文件 @
fd01f8fb
...
...
@@ -80,7 +80,7 @@ public class GlobalProxyAuthenticator extends Authenticator {
DBCExecutionContext
activeContext
=
DBCExecutionContext
.
ACTIVE_CONTEXT
.
get
();
if
(
activeContext
!=
null
)
{
DBSDataSourceContainer
container
=
activeContext
.
getDataSource
().
getContainer
();
for
(
DBWHandlerConfiguration
networkHandler
:
container
.
getConnection
Info
().
getDeclaredHandlers
())
{
for
(
DBWHandlerConfiguration
networkHandler
:
container
.
getConnection
Configuration
().
getDeclaredHandlers
())
{
if
(
networkHandler
.
isEnabled
()
&&
networkHandler
.
getType
()
==
DBWHandlerType
.
PROXY
)
{
String
userName
=
networkHandler
.
getUserName
();
String
userPassword
=
networkHandler
.
getPassword
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/net/GlobalProxySelector.java
浏览文件 @
fd01f8fb
...
...
@@ -61,7 +61,7 @@ public class GlobalProxySelector extends ProxySelector {
if
(
activeContext
!=
null
)
{
List
<
Proxy
>
proxies
=
null
;
DBSDataSourceContainer
container
=
activeContext
.
getDataSource
().
getContainer
();
for
(
DBWHandlerConfiguration
networkHandler
:
container
.
getConnection
Info
().
getDeclaredHandlers
())
{
for
(
DBWHandlerConfiguration
networkHandler
:
container
.
getConnection
Configuration
().
getDeclaredHandlers
())
{
if
(
networkHandler
.
isEnabled
()
&&
networkHandler
.
getType
()
==
DBWHandlerType
.
PROXY
)
{
Map
<
String
,
String
>
proxyProps
=
networkHandler
.
getProperties
();
String
proxyHost
=
proxyProps
.
get
(
SocksConstants
.
PROP_HOST
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/IDataSourceConnectionEditorSite.java
浏览文件 @
fd01f8fb
...
...
@@ -18,13 +18,9 @@
package
org.jkiss.dbeaver.ui
;
import
org.eclipse.jface.operation.IRunnableContext
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.model.DBPConnectionInfo
;
import
org.jkiss.dbeaver.model.DBPDriver
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableContext
;
import
org.jkiss.dbeaver.model.struct.DBSDataSourceContainer
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.registry.DataSourceRegistry
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
浏览文件 @
fd01f8fb
...
...
@@ -1355,7 +1355,7 @@ public class UIUtils {
}
}
public
static
Color
getConnectionColor
(
DBPConnection
Info
connectionInfo
)
{
public
static
Color
getConnectionColor
(
DBPConnection
Configuration
connectionInfo
)
{
String
rgbString
=
connectionInfo
.
getConnectionColor
();
if
(
CommonUtils
.
isEmpty
(
rgbString
))
{
rgbString
=
connectionInfo
.
getConnectionType
().
getColor
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java
浏览文件 @
fd01f8fb
...
...
@@ -59,8 +59,8 @@ public class DataSourceConnectHandler extends DataSourceHandler
// Already connecting/disconnecting - just return
return
;
}
final
String
oldName
=
dataSourceDescriptor
.
getConnection
Info
().
getUserName
();
final
String
oldPassword
=
dataSourceDescriptor
.
getConnection
Info
().
getUserPassword
();
final
String
oldName
=
dataSourceDescriptor
.
getConnection
Configuration
().
getUserName
();
final
String
oldPassword
=
dataSourceDescriptor
.
getConnection
Configuration
().
getUserPassword
();
if
(!
dataSourceDescriptor
.
isSavePassword
())
{
// Ask for password
if
(!
askForPassword
(
dataSourceDescriptor
,
null
))
{
...
...
@@ -68,7 +68,7 @@ public class DataSourceConnectHandler extends DataSourceHandler
return
;
}
}
for
(
DBWHandlerConfiguration
handler
:
dataSourceDescriptor
.
getConnection
Info
().
getDeclaredHandlers
())
{
for
(
DBWHandlerConfiguration
handler
:
dataSourceDescriptor
.
getConnection
Configuration
().
getDeclaredHandlers
())
{
if
(
handler
.
isEnabled
()
&&
handler
.
isSecured
()
&&
!
handler
.
isSavePassword
())
{
if
(!
askForPassword
(
dataSourceDescriptor
,
handler
))
{
updateDataSourceObject
(
dataSourceDescriptor
);
...
...
@@ -90,8 +90,8 @@ public class DataSourceConnectHandler extends DataSourceHandler
// but we need a password to open isolated contexts (e.g. for data export)
// Currently it is not possible to ask for password from isolation context opening
// procedure. We need to do something here...
//dataSourceDescriptor.getConnection
Info
().setUserName(oldName);
//dataSourceDescriptor.getConnection
Info
().setUserPassword(oldPassword);
//dataSourceDescriptor.getConnection
Configuration
().setUserName(oldName);
//dataSourceDescriptor.getConnection
Configuration
().setUserPassword(oldPassword);
}
}
if
(
onFinish
!=
null
)
{
...
...
@@ -161,8 +161,8 @@ public class DataSourceConnectHandler extends DataSourceHandler
String
prompt
=
networkHandler
!=
null
?
NLS
.
bind
(
CoreMessages
.
dialog_connection_auth_title_for_handler
,
networkHandler
.
getTitle
())
:
"'"
+
dataSourceContainer
.
getName
()
+
CoreMessages
.
dialog_connection_auth_title
;
//$NON-NLS-1$
String
user
=
networkHandler
!=
null
?
networkHandler
.
getUserName
()
:
dataSourceContainer
.
getConnection
Info
().
getUserName
();
String
password
=
networkHandler
!=
null
?
networkHandler
.
getPassword
()
:
dataSourceContainer
.
getConnection
Info
().
getUserPassword
();
String
user
=
networkHandler
!=
null
?
networkHandler
.
getUserName
()
:
dataSourceContainer
.
getConnection
Configuration
().
getUserName
();
String
password
=
networkHandler
!=
null
?
networkHandler
.
getPassword
()
:
dataSourceContainer
.
getConnection
Configuration
().
getUserPassword
();
DBAAuthInfo
authInfo
=
DBUserInterface
.
getInstance
().
promptUserCredentials
(
prompt
,
user
,
password
);
if
(
authInfo
==
null
)
{
...
...
@@ -174,8 +174,8 @@ public class DataSourceConnectHandler extends DataSourceHandler
networkHandler
.
setPassword
(
authInfo
.
getUserPassword
());
networkHandler
.
setSavePassword
(
authInfo
.
isSavePassword
());
}
else
{
dataSourceContainer
.
getConnection
Info
().
setUserName
(
authInfo
.
getUserName
());
dataSourceContainer
.
getConnection
Info
().
setUserPassword
(
authInfo
.
getUserPassword
());
dataSourceContainer
.
getConnection
Configuration
().
setUserName
(
authInfo
.
getUserName
());
dataSourceContainer
.
getConnection
Configuration
().
setUserPassword
(
authInfo
.
getUserPassword
());
dataSourceContainer
.
setSavePassword
(
authInfo
.
isSavePassword
());
}
if
(
dataSourceContainer
.
isSavePassword
())
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ConnectionPropertiesControl.java
浏览文件 @
fd01f8fb
...
...
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.model.DBConstants
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.DBPDriver
;
import
org.jkiss.dbeaver.model.DBPPropertyDescriptor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableContext
;
...
...
@@ -55,7 +55,7 @@ public class ConnectionPropertiesControl extends PropertyTreeViewer {
setExpandSingleRoot
(
false
);
}
public
PropertySourceCustom
makeProperties
(
DBRRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
public
PropertySourceCustom
makeProperties
(
DBRRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnection
Configuration
connectionInfo
)
{
Map
<
Object
,
Object
>
connectionProps
=
new
HashMap
<
Object
,
Object
>();
connectionProps
.
putAll
(
driver
.
getConnectionProperties
());
...
...
@@ -132,7 +132,7 @@ public class ConnectionPropertiesControl extends PropertyTreeViewer {
return
propertyDescriptors
;
}
private
void
loadDriverProperties
(
DBRRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
private
void
loadDriverProperties
(
DBRRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnection
Configuration
connectionInfo
)
{
try
{
final
DBPPropertyDescriptor
[]
connectionsProps
=
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageAbstract.java
浏览文件 @
fd01f8fb
...
...
@@ -21,7 +21,7 @@ import org.eclipse.jface.dialogs.DialogPage;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ui.IDataSourceConnectionEditor
;
import
org.jkiss.dbeaver.ui.IDataSourceConnectionEditorSite
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
/**
...
...
@@ -54,10 +54,10 @@ public abstract class ConnectionPageAbstract extends DialogPage implements IData
@Override
public
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
saveConnectionURL
(
dataSource
.
getConnection
Info
());
saveConnectionURL
(
dataSource
.
getConnection
Configuration
());
}
protected
void
saveConnectionURL
(
DBPConnection
Info
connectionInfo
)
protected
void
saveConnectionURL
(
DBPConnection
Configuration
connectionInfo
)
{
if
(!
isCustomURL
())
{
try
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
浏览文件 @
fd01f8fb
...
...
@@ -128,7 +128,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
if
(
connectionNameText
!=
null
)
{
ConnectionPageSettings
settings
=
wizard
.
getPageSettings
();
if
(
settings
!=
null
&&
connectionNameText
!=
null
&&
(
CommonUtils
.
isEmpty
(
connectionNameText
.
getText
())
||
!
connectionNameChanged
))
{
DBPConnection
Info
connectionInfo
=
settings
.
getActiveDataSource
().
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
settings
.
getActiveDataSource
().
getConnectionConfiguration
();
String
newName
=
dataSourceDescriptor
==
null
?
""
:
dataSourceDescriptor
.
getName
();
//$NON-NLS-1$
if
(
CommonUtils
.
isEmpty
(
newName
))
{
newName
=
connectionInfo
.
getDatabaseName
();
...
...
@@ -159,7 +159,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
if
(
dataSourceDescriptor
!=
null
)
{
if
(!
activated
)
{
// Get settings from data source descriptor
connectionTypeCombo
.
select
(
dataSourceDescriptor
.
getConnection
Info
().
getConnectionType
());
connectionTypeCombo
.
select
(
dataSourceDescriptor
.
getConnection
Configuration
().
getConnectionType
());
savePasswordCheck
.
setSelection
(
dataSourceDescriptor
.
isSavePassword
());
autocommit
.
setSelection
(
dataSourceDescriptor
.
isDefaultAutoCommit
());
showSystemObjects
.
setSelection
(
dataSourceDescriptor
.
isShowSystemObjects
());
...
...
@@ -191,8 +191,8 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
if
(
eventsButton
!=
null
)
{
eventsButton
.
setFont
(
getFont
());
DataSourceDescriptor
dataSource
=
getWizard
().
getPageSettings
().
getActiveDataSource
();
for
(
DBPConnectionEventType
eventType
:
dataSource
.
getConnection
Info
().
getDeclaredEvents
())
{
if
(
dataSource
.
getConnection
Info
().
getEvent
(
eventType
).
isEnabled
())
{
for
(
DBPConnectionEventType
eventType
:
dataSource
.
getConnection
Configuration
().
getDeclaredEvents
())
{
if
(
dataSource
.
getConnection
Configuration
().
getEvent
(
eventType
).
isEnabled
())
{
eventsButton
.
setFont
(
boldFont
);
break
;
}
...
...
@@ -295,10 +295,10 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
DataSourceDescriptor
dataSource
=
wizard
.
getPageSettings
().
getActiveDataSource
();
UIUtils
.
showPreferencesFor
(
getControl
().
getShell
(),
dataSource
.
getConnection
Info
().
getConnectionType
(),
dataSource
.
getConnection
Configuration
().
getConnectionType
(),
PrefPageConnectionTypes
.
PAGE_ID
);
loadConnectionTypes
();
DBPConnectionType
connectionType
=
dataSource
.
getConnection
Info
().
getConnectionType
();
DBPConnectionType
connectionType
=
dataSource
.
getConnection
Configuration
().
getConnectionType
();
connectionTypeCombo
.
select
(
connectionType
);
autocommit
.
setSelection
(
connectionType
.
isAutocommit
());
}
...
...
@@ -487,7 +487,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
dataSource
.
resetPassword
();
}
if
(
connectionTypeCombo
.
getSelectionIndex
()
>=
0
)
{
dataSource
.
getConnection
Info
().
setConnectionType
(
dataSource
.
getConnection
Configuration
().
setConnectionType
(
(
DBPConnectionType
)
connectionTypeCombo
.
getData
(
connectionTypeCombo
.
getSelectionIndex
()));
}
for
(
FilterInfo
filterInfo
:
filters
)
{
...
...
@@ -505,8 +505,8 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
dataSource
);
if
(
dialog
.
open
()
==
IDialogConstants
.
OK_ID
)
{
eventsButton
.
setFont
(
getFont
());
for
(
DBPConnectionEventType
eventType
:
dataSource
.
getConnection
Info
().
getDeclaredEvents
())
{
if
(
dataSource
.
getConnection
Info
().
getEvent
(
eventType
).
isEnabled
())
{
for
(
DBPConnectionEventType
eventType
:
dataSource
.
getConnection
Configuration
().
getDeclaredEvents
())
{
if
(
dataSource
.
getConnection
Configuration
().
getEvent
(
eventType
).
isEnabled
())
{
eventsButton
.
setFont
(
boldFont
);
break
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageNetwork.java
浏览文件 @
fd01f8fb
...
...
@@ -136,7 +136,7 @@ public class ConnectionPageNetwork extends ActiveWizardPage<ConnectionWizard> {
NetworkHandlerRegistry
registry
=
NetworkHandlerRegistry
.
getInstance
();
TabItem
selectItem
=
null
;
for
(
NetworkHandlerDescriptor
descriptor
:
registry
.
getDescriptors
())
{
DBWHandlerConfiguration
configuration
=
dataSource
.
getConnection
Info
().
getHandler
(
descriptor
.
getId
());
DBWHandlerConfiguration
configuration
=
dataSource
.
getConnection
Configuration
().
getHandler
(
descriptor
.
getId
());
if
(
configuration
==
null
)
{
configuration
=
new
DBWHandlerConfiguration
(
descriptor
,
driver
);
}
...
...
@@ -185,7 +185,7 @@ public class ConnectionPageNetwork extends ActiveWizardPage<ConnectionWizard> {
}
}
if
(
foundHandlers
)
{
dataSource
.
getConnection
Info
().
setHandlers
(
handlers
);
dataSource
.
getConnection
Configuration
().
setHandlers
(
handlers
);
}
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageSettings.java
浏览文件 @
fd01f8fb
...
...
@@ -36,7 +36,7 @@ import org.jkiss.dbeaver.runtime.RunnableContextDelegate;
import
org.jkiss.dbeaver.ui.ICompositeDialogPage
;
import
org.jkiss.dbeaver.ui.IDataSourceConnectionEditor
;
import
org.jkiss.dbeaver.ui.IDataSourceConnectionEditorSite
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.registry.DataSourceRegistry
;
import
org.jkiss.dbeaver.registry.DataSourceViewDescriptor
;
...
...
@@ -130,7 +130,7 @@ class ConnectionPageSettings extends ActiveWizardPage<ConnectionWizard> implemen
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
getActiveDataSource
().
getConnection
Info
().
getProperties
().
clear
();
getActiveDataSource
().
getConnection
Configuration
().
getProperties
().
clear
();
if
(
connectionEditor
!=
null
)
{
connectionEditor
.
saveSettings
(
dataSource
);
}
...
...
@@ -231,13 +231,13 @@ class ConnectionPageSettings extends ActiveWizardPage<ConnectionWizard> implemen
DriverDescriptor
driver
=
getDriver
();
DataSourceDescriptor
info
=
infoMap
.
get
(
driver
);
if
(
info
==
null
)
{
DBPConnection
Info
connectionInfo
=
new
DBPConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
new
DBPConnectionConfiguration
();
info
=
new
DataSourceDescriptor
(
wizard
.
getDataSourceRegistry
(),
DataSourceDescriptor
.
generateNewId
(
wizard
.
getSelectedDriver
()),
wizard
.
getSelectedDriver
(),
connectionInfo
);
info
.
getConnection
Info
().
setClientHomeId
(
driver
.
getDefaultClientHomeId
());
info
.
getConnection
Configuration
().
setClientHomeId
(
driver
.
getDefaultClientHomeId
());
infoMap
.
put
(
driver
,
info
);
}
return
info
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
浏览文件 @
fd01f8fb
...
...
@@ -75,7 +75,7 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
dataSourceRegistry
,
dataSource
.
getId
(),
getSelectedDriver
(),
dataSource
.
getConnection
Info
());
dataSource
.
getConnection
Configuration
());
try
{
saveSettings
(
testDataSource
);
...
...
@@ -142,7 +142,7 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
Thread
.
currentThread
().
setName
(
CoreMessages
.
dialog_connection_wizard_start_connection_monitor_thread
);
try
{
testDataSource
.
setName
(
testDataSource
.
getConnection
Info
().
getUrl
());
testDataSource
.
setName
(
testDataSource
.
getConnection
Configuration
().
getUrl
());
monitor
.
worked
(
1
);
testDataSource
.
connect
(
monitor
,
initOnTest
,
false
);
monitor
.
worked
(
1
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/DriverPropertiesDialogPage.java
浏览文件 @
fd01f8fb
...
...
@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.ui.dialogs.connection;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.widgets.Composite
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
...
...
@@ -39,7 +39,7 @@ public class DriverPropertiesDialogPage extends ConnectionPageAbstract
private
ConnectionPropertiesControl
propsControl
;
private
PropertySourceCustom
propertySource
;
private
DBPConnection
Info
prevConnectionInfo
=
null
;
private
DBPConnection
Configuration
prevConnectionInfo
=
null
;
public
DriverPropertiesDialogPage
(
ConnectionPageAbstract
hostPage
)
{
...
...
@@ -73,10 +73,10 @@ public class DriverPropertiesDialogPage extends ConnectionPageAbstract
protected
void
refreshDriverProperties
()
{
DataSourceDescriptor
activeDataSource
=
site
.
getActiveDataSource
();
if
(
prevConnectionInfo
==
activeDataSource
.
getConnection
Info
())
{
if
(
prevConnectionInfo
==
activeDataSource
.
getConnection
Configuration
())
{
return
;
}
DBPConnection
Info
tmpConnectionInfo
=
new
DBPConnectionInfo
();
DBPConnection
Configuration
tmpConnectionInfo
=
new
DBPConnectionConfiguration
();
DataSourceDescriptor
tempDataSource
=
new
DataSourceDescriptor
(
site
.
getDataSourceRegistry
(),
activeDataSource
.
getId
(),
...
...
@@ -84,13 +84,13 @@ public class DriverPropertiesDialogPage extends ConnectionPageAbstract
tmpConnectionInfo
);
try
{
hostPage
.
saveSettings
(
tempDataSource
);
tmpConnectionInfo
.
getProperties
().
putAll
(
activeDataSource
.
getConnection
Info
().
getProperties
());
tmpConnectionInfo
.
getProperties
().
putAll
(
activeDataSource
.
getConnection
Configuration
().
getProperties
());
propertySource
=
propsControl
.
makeProperties
(
site
.
getRunnableContext
(),
site
.
getDriver
(),
tmpConnectionInfo
);
propsControl
.
loadProperties
(
propertySource
);
prevConnectionInfo
=
activeDataSource
.
getConnection
Info
();
prevConnectionInfo
=
activeDataSource
.
getConnection
Configuration
();
}
finally
{
tempDataSource
.
dispose
();
}
...
...
@@ -100,7 +100,7 @@ public class DriverPropertiesDialogPage extends ConnectionPageAbstract
public
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
if
(
propertySource
!=
null
)
{
dataSource
.
getConnection
Info
().
getProperties
().
putAll
(
propertySource
.
getProperties
());
dataSource
.
getConnection
Configuration
().
getProperties
().
putAll
(
propertySource
.
getProperties
());
}
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
浏览文件 @
fd01f8fb
...
...
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import
org.eclipse.ui.IWorkbench
;
import
org.eclipse.ui.IWorkbenchPropertyPage
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.registry.DataSourceViewDescriptor
;
import
org.jkiss.dbeaver.registry.DriverDescriptor
;
...
...
@@ -40,7 +40,7 @@ import java.util.List;
public
class
EditConnectionWizard
extends
ConnectionWizard
{
private
DataSourceDescriptor
dataSource
;
private
DBPConnection
Info
oldData
;
private
DBPConnection
Configuration
oldData
;
private
ConnectionPageSettings
pageSettings
;
private
ConnectionPageGeneral
pageGeneral
;
private
ConnectionPageNetwork
pageNetwork
;
...
...
@@ -54,7 +54,7 @@ public class EditConnectionWizard extends ConnectionWizard
{
super
(
dataSource
.
getRegistry
());
this
.
dataSource
=
dataSource
;
this
.
oldData
=
new
DBPConnection
Info
(
this
.
dataSource
.
getConnectionInfo
());
this
.
oldData
=
new
DBPConnection
Configuration
(
this
.
dataSource
.
getConnectionConfiguration
());
setWindowTitle
(
CoreMessages
.
dialog_connection_wizard_title
);
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditShellCommandsDialogPage.java
浏览文件 @
fd01f8fb
...
...
@@ -60,7 +60,7 @@ public class EditShellCommandsDialogPage extends ActiveWizardPage<ConnectionWiza
setDescription
(
CoreMessages
.
dialog_connection_events_title
);
setImageDescriptor
(
DBeaverIcons
.
getImageDescriptor
(
DBIcon
.
EVENT
));
for
(
DBPConnectionEventType
eventType
:
DBPConnectionEventType
.
values
())
{
DBRShellCommand
command
=
dataSource
.
getConnection
Info
().
getEvent
(
eventType
);
DBRShellCommand
command
=
dataSource
.
getConnection
Configuration
().
getEvent
(
eventType
);
eventsCache
.
put
(
eventType
,
command
==
null
?
null
:
new
DBRShellCommand
(
command
));
}
}
...
...
@@ -238,7 +238,7 @@ public class EditShellCommandsDialogPage extends ActiveWizardPage<ConnectionWiza
void
saveConfigurations
(
DataSourceDescriptor
dataSource
)
{
for
(
Map
.
Entry
<
DBPConnectionEventType
,
DBRShellCommand
>
entry
:
eventsCache
.
entrySet
())
{
dataSource
.
getConnection
Info
().
setEvent
(
entry
.
getKey
(),
entry
.
getValue
());
dataSource
.
getConnection
Configuration
().
setEvent
(
entry
.
getKey
(),
entry
.
getValue
());
}
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/NewConnectionWizard.java
浏览文件 @
fd01f8fb
...
...
@@ -164,7 +164,7 @@ public class NewConnectionWizard extends ConnectionWizard
DriverDescriptor
driver
=
getSelectedDriver
();
DataSourceDescriptor
dataSourceTpl
=
getPageSettings
().
getActiveDataSource
();
DataSourceDescriptor
dataSourceNew
=
new
DataSourceDescriptor
(
dataSourceRegistry
,
dataSourceTpl
.
getId
(),
driver
,
dataSourceTpl
.
getConnection
Info
());
dataSourceRegistry
,
dataSourceTpl
.
getId
(),
driver
,
dataSourceTpl
.
getConnection
Configuration
());
dataSourceNew
.
copyFrom
(
dataSourceTpl
);
saveSettings
(
dataSourceNew
);
dataSourceRegistry
.
addDataSource
(
dataSourceNew
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/tools/AbstractToolWizard.java
浏览文件 @
fd01f8fb
...
...
@@ -27,7 +27,7 @@ import org.eclipse.swt.SWT;
import
org.eclipse.swt.widgets.Composite
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.model.DBPClientHome
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress
;
import
org.jkiss.dbeaver.model.struct.DBSDataSourceContainer
;
...
...
@@ -50,7 +50,7 @@ public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject>
private
final
BASE_OBJECT
databaseObject
;
private
DBPClientHome
clientHome
;
private
DBPConnection
Info
connectionInfo
;
private
DBPConnection
Configuration
connectionInfo
;
private
String
toolUserName
;
private
String
toolUserPassword
;
...
...
@@ -76,7 +76,7 @@ public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject>
return
databaseObject
;
}
public
DBPConnection
Info
getConnectionInfo
()
public
DBPConnection
Configuration
getConnectionInfo
()
{
return
connectionInfo
;
}
...
...
@@ -112,7 +112,7 @@ public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject>
public
void
createPageControls
(
Composite
pageContainer
)
{
DBSDataSourceContainer
container
=
getDatabaseObject
().
getDataSource
().
getContainer
();
connectionInfo
=
container
.
getActualConnection
Info
();
connectionInfo
=
container
.
getActualConnection
Configuration
();
super
.
createPageControls
(
pageContainer
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorUtils.java
浏览文件 @
fd01f8fb
...
...
@@ -50,12 +50,12 @@ public class DatabaseEditorUtils {
if
(
editor
instanceof
IDataSourceContainerProvider
)
{
DBSDataSourceContainer
container
=
((
IDataSourceContainerProvider
)
editor
).
getDataSourceContainer
();
if
(
container
!=
null
)
{
bgColor
=
UIUtils
.
getConnectionColor
(
container
.
getConnection
Info
());
bgColor
=
UIUtils
.
getConnectionColor
(
container
.
getConnection
Configuration
());
}
}
else
if
(
editor
instanceof
DBPContextProvider
)
{
DBCExecutionContext
context
=
((
DBPContextProvider
)
editor
).
getExecutionContext
();
if
(
context
!=
null
)
{
bgColor
=
UIUtils
.
getConnectionColor
(
context
.
getDataSource
().
getContainer
().
getConnection
Info
());
bgColor
=
UIUtils
.
getConnectionColor
(
context
.
getDataSource
().
getContainer
().
getConnection
Configuration
());
}
}
if
(
bgColor
==
null
)
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorInput.java
浏览文件 @
fd01f8fb
...
...
@@ -102,7 +102,7 @@ public class SQLEditorInput extends ProjectFileEditorInput implements IPersistab
"Script: "
+
getFile
().
getName
()
+
" \n"
+
"Connection: "
+
dataSourceContainer
.
getName
()
+
" \n"
+
"Type: "
+
(
dataSourceContainer
.
getDriver
()
==
null
?
"Unknown"
:
dataSourceContainer
.
getDriver
().
getFullName
())
+
" \n"
+
"URL: "
+
dataSourceContainer
.
getConnection
Info
().
getUrl
();
"URL: "
+
dataSourceContainer
.
getConnection
Configuration
().
getUrl
();
}
@Override
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DataSourceManagementToolbar.java
浏览文件 @
fd01f8fb
...
...
@@ -351,12 +351,12 @@ public class DataSourceManagementToolbar implements DBPRegistryListener, DBPEven
connectionCombo
.
add
(
DBeaverIcons
.
getImage
(
dsNode
==
null
?
DBIcon
.
TREE_DATABASE
:
dsNode
.
getNodeIconDefault
()),
ds
.
getName
(),
UIUtils
.
getConnectionColor
(
ds
.
getConnection
Info
()),
UIUtils
.
getConnectionColor
(
ds
.
getConnection
Configuration
()),
ds
);
}
else
{
TableItem
item
=
connectionCombo
.
getItem
(
i
+
1
);
item
.
setText
(
ds
.
getName
());
item
.
setBackground
(
UIUtils
.
getConnectionColor
(
ds
.
getConnection
Info
()));
item
.
setBackground
(
UIUtils
.
getConnectionColor
(
ds
.
getConnection
Configuration
()));
}
if
(
dataSourceContainer
==
ds
)
{
selectionIndex
=
i
+
1
;
...
...
@@ -521,7 +521,7 @@ public class DataSourceManagementToolbar implements DBPRegistryListener, DBPEven
databaseCombo
.
add
(
DBeaverIcons
.
getImage
(
dbNode
.
getNodeIconDefault
()),
database
.
getName
(),
UIUtils
.
getConnectionColor
(
dataSource
.
getContainer
().
getConnection
Info
()),
UIUtils
.
getConnectionColor
(
dataSource
.
getContainer
().
getConnection
Configuration
()),
database
);
}
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/DatabaseNavigatorLabelProvider.java
浏览文件 @
fd01f8fb
...
...
@@ -135,7 +135,7 @@ class DatabaseNavigatorLabelProvider extends LabelProvider implements IFontProvi
if
(
element
instanceof
DBNDataSource
)
{
DataSourceDescriptor
ds
=
((
DBNDatabaseNode
)
element
).
getDataSourceContainer
();
if
(
ds
!=
null
)
{
return
UIUtils
.
getConnectionColor
(
ds
.
getConnection
Info
());
return
UIUtils
.
getConnectionColor
(
ds
.
getConnection
Configuration
());
}
}
return
null
;
...
...
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/DB2DataSourceProvider.java
浏览文件 @
fd01f8fb
...
...
@@ -22,7 +22,7 @@ import com.ibm.db2.jcc.DB2BaseDataSource;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ext.db2.model.DB2DataSource
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.DBPDriver
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSourceProvider
;
...
...
@@ -66,7 +66,7 @@ public class DB2DataSourceProvider extends JDBCDataSourceProvider {
}
@Override
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Configuration
connectionInfo
)
{
StringBuilder
url
=
new
StringBuilder
(
128
);
url
.
append
(
"jdbc:db2://"
).
append
(
connectionInfo
.
getHostName
());
...
...
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
浏览文件 @
fd01f8fb
...
...
@@ -41,7 +41,7 @@ import org.jkiss.dbeaver.ext.db2.model.security.DB2AuthIDType;
import
org.jkiss.dbeaver.ext.db2.model.security.DB2Grantee
;
import
org.jkiss.dbeaver.ext.db2.model.security.DB2GranteeCache
;
import
org.jkiss.dbeaver.ext.db2.model.security.DB2Role
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.DBPDataSourceInfo
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.exec.DBCException
;
...
...
@@ -169,7 +169,7 @@ public class DB2DataSource extends JDBCDataSource implements DBSObjectSelector,
this
.
activeSchemaName
=
JDBCUtils
.
queryString
(
session
,
GET_CURRENT_USER
);
if
(
this
.
activeSchemaName
==
null
)
{
LOG
.
warn
(
"Special registers 'CURRENT SCHEMA' and 'SYSTEM_USER' both returned null. Use connection username as active schema"
);
this
.
activeSchemaName
=
getContainer
().
getActualConnection
Info
().
getUserName
();
this
.
activeSchemaName
=
getContainer
().
getActualConnection
Configuration
().
getUserName
();
}
}
...
...
@@ -212,7 +212,7 @@ public class DB2DataSource extends JDBCDataSource implements DBSObjectSelector,
// -----------------------
@Override
protected
String
getConnectionUserName
(
DBPConnection
Info
connectionInfo
)
protected
String
getConnectionUserName
(
DBPConnection
Configuration
connectionInfo
)
{
return
connectionInfo
.
getUserName
();
}
...
...
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/views/DB2ConnectionPage.java
浏览文件 @
fd01f8fb
...
...
@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.ext.db2.Activator;
import
org.jkiss.dbeaver.ext.db2.DB2Constants
;
import
org.jkiss.dbeaver.ext.db2.DB2Messages
;
import
org.jkiss.dbeaver.ui.ICompositeDialogPage
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.dialogs.connection.ConnectionPageAbstract
;
...
...
@@ -150,7 +150,7 @@ public class DB2ConnectionPage extends ConnectionPageAbstract implements ICompos
public
void
loadSettings
()
{
// Load values from new connection info
DBPConnection
Info
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionConfiguration
();
if
(
hostText
!=
null
)
{
hostText
.
setText
(
CommonUtils
.
notEmpty
(
connectionInfo
.
getHostName
()));
}
...
...
@@ -175,7 +175,7 @@ public class DB2ConnectionPage extends ConnectionPageAbstract implements ICompos
@Override
public
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
DBPConnection
Info
connectionInfo
=
dataSource
.
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
dataSource
.
getConnectionConfiguration
();
if
(
hostText
!=
null
)
{
connectionInfo
.
setHostName
(
hostText
.
getText
());
}
...
...
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/views/DB2ConnectionTracePage.java
浏览文件 @
fd01f8fb
...
...
@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
import
org.eclipse.swt.widgets.Group
;
import
org.eclipse.swt.widgets.Text
;
import
org.jkiss.dbeaver.ext.db2.DB2Constants
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.dialogs.connection.ConnectionPageAbstract
;
...
...
@@ -145,7 +145,7 @@ public class DB2ConnectionTracePage extends ConnectionPageAbstract
public
void
loadSettings
()
{
// Load values from new connection info
DBPConnection
Info
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionConfiguration
();
Map
<
Object
,
Object
>
connectionProperties
=
connectionInfo
.
getProperties
();
// Settings
...
...
@@ -179,7 +179,7 @@ public class DB2ConnectionTracePage extends ConnectionPageAbstract
public
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
super
.
saveSettings
(
dataSource
);
Map
<
Object
,
Object
>
connectionProperties
=
dataSource
.
getConnection
Info
().
getProperties
();
Map
<
Object
,
Object
>
connectionProperties
=
dataSource
.
getConnection
Configuration
().
getProperties
();
{
connectionProperties
.
put
(
DB2Constants
.
PROP_TRACE_ENABLED
,
enableTraceCheck
.
getSelection
());
...
...
@@ -194,7 +194,7 @@ public class DB2ConnectionTracePage extends ConnectionPageAbstract
}
connectionProperties
.
put
(
DB2Constants
.
PROP_TRACE_LEVEL
,
traceLevel
);
}
saveConnectionURL
(
dataSource
.
getConnection
Info
());
saveConnectionURL
(
dataSource
.
getConnection
Configuration
());
}
}
plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/GenericDataSourceProvider.java
浏览文件 @
fd01f8fb
...
...
@@ -24,7 +24,7 @@ import org.jkiss.code.NotNull;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ext.generic.model.GenericDataSource
;
import
org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.DBPDriver
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSourceProvider
;
...
...
@@ -86,7 +86,7 @@ public class GenericDataSourceProvider extends JDBCDataSourceProvider {
}
@Override
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Configuration
connectionInfo
)
{
try
{
DriverDescriptor
.
MetaURL
metaURL
=
DriverDescriptor
.
parseSampleURL
(
driver
.
getSampleURL
());
...
...
plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataSource.java
浏览文件 @
fd01f8fb
...
...
@@ -174,7 +174,7 @@ public class GenericDataSource extends JDBCDataSource
try
{
final
Driver
driver
=
getDriverInstance
(
VoidProgressMonitor
.
INSTANCE
);
// Use void monitor - driver already loaded
if
(
driver
!=
null
)
{
driver
.
connect
(
getContainer
().
getActualConnection
Info
().
getUrl
()
+
paramShutdown
,
null
);
driver
.
connect
(
getContainer
().
getActualConnection
Configuration
().
getUrl
()
+
paramShutdown
,
null
);
}
}
catch
(
Exception
e
)
{
log
.
debug
(
e
);
...
...
plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/views/GenericConnectionPage.java
浏览文件 @
fd01f8fb
...
...
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.*;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ext.generic.GenericMessages
;
import
org.jkiss.dbeaver.ui.ICompositeDialogPage
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.DBPDriver
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.registry.DriverDescriptor
;
...
...
@@ -363,7 +363,7 @@ public class GenericConnectionPage extends ConnectionPageAbstract implements ICo
public
void
loadSettings
()
{
// Load values from new connection info
DBPConnection
Info
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionConfiguration
();
if
(
site
.
getDriver
()
!=
null
)
{
driverText
.
setText
(
CommonUtils
.
toString
(
site
.
getDriver
().
getFullName
()));
}
...
...
@@ -422,7 +422,7 @@ public class GenericConnectionPage extends ConnectionPageAbstract implements ICo
@Override
public
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
DBPConnection
Info
connectionInfo
=
dataSource
.
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
dataSource
.
getConnectionConfiguration
();
final
Set
<
String
>
properties
=
metaURL
==
null
?
Collections
.<
String
>
emptySet
()
:
metaURL
.
getAvailableProperties
();
if
(
hostText
!=
null
&&
properties
.
contains
(
DriverDescriptor
.
PROP_HOST
))
{
...
...
plugins/org.jkiss.dbeaver.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizard.java
浏览文件 @
fd01f8fb
...
...
@@ -24,7 +24,7 @@ import org.eclipse.ui.IImportWizard;
import
org.eclipse.ui.IWorkbench
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.*
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.dialogs.SelectObjectDialog
;
...
...
@@ -158,7 +158,7 @@ public abstract class ConfigImportWizard extends Wizard implements IImportWizard
name
=
connectionInfo
.
getAlias
()
+
" "
+
(
i
+
1
);
}
DBPConnection
Info
config
=
new
DBPConnectionInfo
();
DBPConnection
Configuration
config
=
new
DBPConnectionConfiguration
();
config
.
setProperties
(
connectionInfo
.
getProperties
());
config
.
setUrl
(
connectionInfo
.
getUrl
());
config
.
setUserName
(
connectionInfo
.
getUser
());
...
...
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/MySQLDataSourceProvider.java
浏览文件 @
fd01f8fb
...
...
@@ -82,7 +82,7 @@ public class MySQLDataSourceProvider extends JDBCDataSourceProvider implements D
}
@Override
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Configuration
connectionInfo
)
{
String
trustStorePath
=
"D:/temp/ssl/test-cert-store"
;
...
...
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLDatabaseWizardPageSettings.java
浏览文件 @
fd01f8fb
...
...
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite;
import
org.eclipse.swt.widgets.Group
;
import
org.eclipse.swt.widgets.Label
;
import
org.jkiss.dbeaver.model.DBConstants
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.encode.EncryptionException
;
import
org.jkiss.dbeaver.registry.encode.SecuredPasswordEncrypter
;
import
org.jkiss.dbeaver.ui.UIUtils
;
...
...
@@ -49,7 +49,7 @@ public abstract class MySQLDatabaseWizardPageSettings<WIZARD extends AbstractToo
{
try
{
final
SecuredPasswordEncrypter
encrypter
=
new
SecuredPasswordEncrypter
();
final
DBPConnection
Info
connectionInfo
=
wizard
.
getConnectionInfo
();
final
DBPConnection
Configuration
connectionInfo
=
wizard
.
getConnectionInfo
();
final
String
authProperty
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"-auth-"
+
wizard
.
getDatabaseObject
().
getName
()
+
"@"
;
String
authUser
=
null
;
String
authPassword
=
null
;
...
...
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java
浏览文件 @
fd01f8fb
...
...
@@ -22,7 +22,7 @@ import org.eclipse.ui.IWorkbenchPart;
import
org.eclipse.ui.IWorkbenchWindow
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.tools.IExternalTool
;
import
org.jkiss.dbeaver.ui.dialogs.tools.AbstractToolWizard
;
...
...
@@ -60,7 +60,7 @@ public class MySQLToolScript implements IExternalTool
if
(
toolWizard
.
isVerbose
())
{
cmd
.
add
(
"-v"
);
}
DBPConnection
Info
connectionInfo
=
toolWizard
.
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
toolWizard
.
getConnectionInfo
();
cmd
.
add
(
"--host="
+
connectionInfo
.
getHostName
());
if
(!
CommonUtils
.
isEmpty
(
connectionInfo
.
getHostPort
()))
{
cmd
.
add
(
"--port="
+
connectionInfo
.
getHostPort
());
...
...
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/views/MySQLConnectionPage.java
浏览文件 @
fd01f8fb
...
...
@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.ext.mysql.Activator;
import
org.jkiss.dbeaver.ext.mysql.MySQLConstants
;
import
org.jkiss.dbeaver.ext.mysql.MySQLMessages
;
import
org.jkiss.dbeaver.ui.ICompositeDialogPage
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.DBPDriver
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.ui.UIUtils
;
...
...
@@ -191,7 +191,7 @@ public class MySQLConnectionPage extends ConnectionPageAbstract implements IComp
}
// Load values from new connection info
DBPConnection
Info
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionConfiguration
();
if
(
hostText
!=
null
)
{
if
(!
CommonUtils
.
isEmpty
(
connectionInfo
.
getHostName
()))
{
hostText
.
setText
(
connectionInfo
.
getHostName
());
...
...
@@ -230,7 +230,7 @@ public class MySQLConnectionPage extends ConnectionPageAbstract implements IComp
@Override
public
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
DBPConnection
Info
connectionInfo
=
dataSource
.
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
dataSource
.
getConnectionConfiguration
();
if
(
hostText
!=
null
)
{
connectionInfo
.
setHostName
(
hostText
.
getText
());
}
...
...
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleDataSourceProvider.java
浏览文件 @
fd01f8fb
...
...
@@ -66,7 +66,7 @@ public class OracleDataSourceProvider extends JDBCDataSourceProvider implements
}
@Override
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Configuration
connectionInfo
)
{
//boolean isOCI = OCIUtils.isOciDriver(driver);
OracleConstants
.
ConnectionType
connectionType
;
...
...
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
浏览文件 @
fd01f8fb
...
...
@@ -116,7 +116,7 @@ public class OracleDataSource extends JDBCDataSource
}
@Override
protected
String
getConnectionUserName
(
DBPConnection
Info
connectionInfo
)
protected
String
getConnectionUserName
(
DBPConnection
Configuration
connectionInfo
)
{
final
Object
role
=
connectionInfo
.
getProperty
(
OracleConstants
.
PROP_INTERNAL_LOGON
);
return
role
==
null
?
connectionInfo
.
getUserName
()
:
connectionInfo
.
getUserName
()
+
" AS "
+
role
;
...
...
@@ -230,7 +230,7 @@ public class OracleDataSource extends JDBCDataSource
final
JDBCSession
session
=
getDefaultContext
(
true
).
openSession
(
monitor
,
DBCExecutionPurpose
.
META
,
"Load data source meta info"
);
try
{
// Set session settings
DBPConnection
Info
connectionInfo
=
getContainer
().
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
getContainer
().
getConnectionConfiguration
();
Object
sessionLanguage
=
connectionInfo
.
getProperty
(
OracleConstants
.
PROP_SESSION_LANGUAGE
);
if
(
sessionLanguage
!=
null
)
{
try
{
...
...
@@ -580,7 +580,7 @@ public class OracleDataSource extends JDBCDataSource
protected
JDBCStatement
prepareObjectsStatement
(
JDBCSession
session
,
OracleDataSource
owner
)
throws
SQLException
{
StringBuilder
schemasQuery
=
new
StringBuilder
();
boolean
manyObjects
=
"false"
.
equals
(
owner
.
getContainer
().
getConnection
Info
().
getProperty
(
OracleConstants
.
PROP_CHECK_SCHEMA_CONTENT
));
boolean
manyObjects
=
"false"
.
equals
(
owner
.
getContainer
().
getConnection
Configuration
().
getProperty
(
OracleConstants
.
PROP_CHECK_SCHEMA_CONTENT
));
schemasQuery
.
append
(
"SELECT U.USERNAME FROM SYS.ALL_USERS U\n"
);
// if (owner.isAdmin() && false) {
...
...
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleScriptExecuteWizard.java
浏览文件 @
fd01f8fb
...
...
@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.ext.oracle.model.OracleDataSource;
import
org.jkiss.dbeaver.ext.oracle.model.dict.OracleConnectionType
;
import
org.jkiss.dbeaver.ext.oracle.oci.OCIUtils
;
import
org.jkiss.dbeaver.ext.oracle.oci.OracleHomeDescriptor
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.runtime.RuntimeUtils
;
import
org.jkiss.dbeaver.ui.dialogs.tools.AbstractScriptExecuteWizard
;
...
...
@@ -78,7 +78,7 @@ class OracleScriptExecuteWizard extends AbstractScriptExecuteWizard<OracleDataSo
{
List
<
String
>
cmd
=
new
ArrayList
<
String
>();
fillProcessParameters
(
cmd
);
DBPConnection
Info
conInfo
=
getConnectionInfo
();
DBPConnection
Configuration
conInfo
=
getConnectionInfo
();
String
url
;
if
(
"TNS"
.
equals
(
conInfo
.
getProperty
(
OracleConstants
.
PROP_CONNECTION_TYPE
)))
{
//$NON-NLS-1$
url
=
conInfo
.
getServerName
();
...
...
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionExtraPage.java
浏览文件 @
fd01f8fb
...
...
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Group;
import
org.jkiss.dbeaver.ext.oracle.model.OracleConstants
;
import
org.jkiss.dbeaver.ext.oracle.model.dict.OracleLanguage
;
import
org.jkiss.dbeaver.ext.oracle.model.dict.OracleTerritory
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.dialogs.connection.ConnectionPageAbstract
;
...
...
@@ -119,7 +119,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
//oraHomeSelector.setVisible(isOCI);
// Load values from new connection info
DBPConnection
Info
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionConfiguration
();
Map
<
Object
,
Object
>
connectionProperties
=
connectionInfo
.
getProperties
();
// Settings
...
...
@@ -148,7 +148,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
public
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
super
.
saveSettings
(
dataSource
);
Map
<
Object
,
Object
>
connectionProperties
=
dataSource
.
getConnection
Info
().
getProperties
();
Map
<
Object
,
Object
>
connectionProperties
=
dataSource
.
getConnection
Configuration
().
getProperties
();
{
// Settings
...
...
@@ -172,7 +172,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
OracleConstants
.
PROP_ALWAYS_SHOW_DBA
,
String
.
valueOf
(
showDBAAlwaysCheckbox
.
getSelection
()));
}
saveConnectionURL
(
dataSource
.
getConnection
Info
());
saveConnectionURL
(
dataSource
.
getConnection
Configuration
());
}
}
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionPage.java
浏览文件 @
fd01f8fb
...
...
@@ -33,7 +33,7 @@ import org.jkiss.dbeaver.ext.oracle.model.dict.OracleConnectionType;
import
org.jkiss.dbeaver.ext.oracle.oci.OCIUtils
;
import
org.jkiss.dbeaver.ext.oracle.oci.OracleHomeDescriptor
;
import
org.jkiss.dbeaver.ui.ICompositeDialogPage
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.controls.ClientHomesSelector
;
...
...
@@ -103,7 +103,7 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
public
void
widgetSelected
(
SelectionEvent
e
)
{
connectionType
=
(
OracleConstants
.
ConnectionType
)
connectionTypeFolder
.
getSelection
()[
0
].
getData
();
site
.
getActiveDataSource
().
getConnection
Info
().
setProperty
(
OracleConstants
.
PROP_CONNECTION_TYPE
,
connectionType
.
name
());
site
.
getActiveDataSource
().
getConnection
Configuration
().
setProperty
(
OracleConstants
.
PROP_CONNECTION_TYPE
,
connectionType
.
name
());
updateUI
();
}
});
...
...
@@ -317,7 +317,7 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
//oraHomeSelector.setVisible(isOCI);
// Load values from new connection info
DBPConnection
Info
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
site
.
getActiveDataSource
().
getConnectionConfiguration
();
Map
<
Object
,
Object
>
connectionProperties
=
connectionInfo
.
getProperties
();
final
Object
sidService
=
connectionProperties
.
get
(
OracleConstants
.
PROP_SID_SERVICE
);
...
...
@@ -385,7 +385,7 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
@Override
public
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
DBPConnection
Info
connectionInfo
=
dataSource
.
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
dataSource
.
getConnectionConfiguration
();
super
.
saveSettings
(
dataSource
);
Map
<
Object
,
Object
>
connectionProperties
=
connectionInfo
.
getProperties
();
//if (isOCI) {
...
...
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/WMIDataSourceProvider.java
浏览文件 @
fd01f8fb
...
...
@@ -47,14 +47,14 @@ public class WMIDataSourceProvider implements DBPDataSourceProvider {
public
DBPPropertyDescriptor
[]
getConnectionProperties
(
DBRRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
throws
DBException
DBPConnection
Configuration
connectionInfo
)
throws
DBException
{
driver
.
validateFilesPresence
(
runnableContext
);
return
null
;
}
@Override
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Info
connectionInfo
)
public
String
getConnectionURL
(
DBPDriver
driver
,
DBPConnection
Configuration
connectionInfo
)
{
return
"wmi://"
+
connectionInfo
.
getServerName
()
+
...
...
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSource.java
浏览文件 @
fd01f8fb
...
...
@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.ext.wmi.model;
import
org.eclipse.core.runtime.IAdaptable
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.DBPDataSourceInfo
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionContext
;
...
...
@@ -118,7 +118,7 @@ public class WMIDataSource implements DBPDataSource, DBCExecutionContext, SQLDat
@Override
public
void
initialize
(
@NotNull
DBRProgressMonitor
monitor
)
throws
DBException
{
final
DBPConnection
Info
connectionInfo
=
container
.
getActualConnectionInfo
();
final
DBPConnection
Configuration
connectionInfo
=
container
.
getActualConnectionConfiguration
();
try
{
WMIService
service
=
WMIService
.
connect
(
connectionInfo
.
getServerName
(),
...
...
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/views/WMIConnectionPage.java
浏览文件 @
fd01f8fb
...
...
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite;
import
org.eclipse.swt.widgets.Label
;
import
org.eclipse.swt.widgets.Text
;
import
org.jkiss.dbeaver.ext.wmi.Activator
;
import
org.jkiss.dbeaver.model.DBPConnection
Info
;
import
org.jkiss.dbeaver.model.DBPConnection
Configuration
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.dialogs.connection.ConnectionPageAbstract
;
...
...
@@ -156,7 +156,7 @@ public class WMIConnectionPage extends ConnectionPageAbstract
{
// Load values from new connection info
DataSourceDescriptor
activeDataSource
=
site
.
getActiveDataSource
();
DBPConnection
Info
connectionInfo
=
activeDataSource
.
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
activeDataSource
.
getConnectionConfiguration
();
if
(
connectionInfo
.
getHostName
()
==
null
)
{
connectionInfo
.
setHostName
(
DEFAULT_HOST
);
}
...
...
@@ -183,7 +183,7 @@ public class WMIConnectionPage extends ConnectionPageAbstract
@Override
public
void
saveSettings
(
DataSourceDescriptor
dataSource
)
{
DBPConnection
Info
connectionInfo
=
dataSource
.
getConnectionInfo
();
DBPConnection
Configuration
connectionInfo
=
dataSource
.
getConnectionConfiguration
();
if
(
hostText
!=
null
)
{
connectionInfo
.
setHostName
(
hostText
.
getText
());
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录