Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
6a0cfb13
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,发现更多精彩内容 >>
提交
6a0cfb13
编写于
2月 23, 2021
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Bundles lazy activation
Former-commit-id:
119495cd
上级
05055333
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
33 addition
and
6 deletion
+33
-6
bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
...ss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
...kiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF
...org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.intro/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.intro/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriver.java
...del/src/org/jkiss/dbeaver/model/connection/DBPDriver.java
+2
-0
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceUtils.java
...istry/src/org/jkiss/dbeaver/registry/DataSourceUtils.java
+7
-5
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/RegistryConstants.java
...try/src/org/jkiss/dbeaver/registry/RegistryConstants.java
+1
-0
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
...c/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
+10
-1
plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF
+1
-0
test/org.jkiss.dbeaver.ext.greenplum.test/META-INF/MANIFEST.MF
...org.jkiss.dbeaver.ext.greenplum.test/META-INF/MANIFEST.MF
+1
-0
test/org.jkiss.dbeaver.ext.postgresql.test/META-INF/MANIFEST.MF
...rg.jkiss.dbeaver.ext.postgresql.test/META-INF/MANIFEST.MF
+1
-0
test/org.jkiss.dbeaver.test.platform/META-INF/MANIFEST.MF
test/org.jkiss.dbeaver.test.platform/META-INF/MANIFEST.MF
+1
-0
未找到文件。
bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -6,5 +6,6 @@ Bundle-Version: 2.0.145.qualifier
Bundle-Release-Date: 20210301
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Export-Package: org.jkiss.wmi.service
Automatic-Module-Name: org.jkiss.wmi
plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -6,6 +6,7 @@ Bundle-SymbolicName: org.jkiss.dbeaver.data.gis;singleton:=true
Bundle-Version: 1.0.76.qualifier
Bundle-Release-Date: 20210301
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.jkiss.dbeaver.model,
org.eclipse.core.runtime,
org.jkiss.bundle.gis;visibility:=reexport
...
...
plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -6,6 +6,7 @@ Bundle-SymbolicName: org.jkiss.dbeaver.data.office;singleton:=true
Bundle-Version: 1.1.90.qualifier
Bundle-Release-Date: 20210301
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.jkiss.dbeaver.model,
org.jkiss.dbeaver.data.transfer,
org.jkiss.bundle.apache.poi
...
...
plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
浏览文件 @
6a0cfb13
...
...
@@ -310,6 +310,7 @@
defaultPort=
"1521"
defaultDatabase=
"ORCL"
defaultUser=
"system"
customEndpoint=
"true"
webURL=
"https://www.oracle.com/technetwork/database/features/jdbc/"
icon=
"icons/oracle_icon.png"
iconBig=
"icons/oracle_icon_big.png"
...
...
plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -6,6 +6,7 @@ Bundle-Version: 1.0.81.qualifier
Bundle-Release-Date: 20210301
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.jkiss.dbeaver.ext.postgresql,
org.jkiss.dbeaver.core,
...
...
plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -6,6 +6,7 @@ Bundle-Version: 1.0.81.qualifier
Bundle-Release-Date: 20210301
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.jkiss.dbeaver.core,
org.jkiss.dbeaver.debug.core,
...
...
plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -6,6 +6,7 @@ Bundle-Version: 1.0.72.qualifier
Bundle-Release-Date: 20210301
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.jkiss.dbeaver.model;visibility:=reexport,
org.jkiss.dbeaver.model.sql;visibility:=reexport,
org.jkiss.dbeaver.ext.generic;visibility:=reexport
...
...
plugins/org.jkiss.dbeaver.intro/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -6,5 +6,6 @@ Bundle-SymbolicName: org.jkiss.dbeaver.intro;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Release-Date: 20170101
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.intro
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriver.java
浏览文件 @
6a0cfb13
...
...
@@ -110,6 +110,8 @@ public interface DBPDriver extends DBPNamedObject
boolean
isLicenseRequired
();
boolean
isCustomDriverLoader
();
boolean
isUseURL
();
boolean
isCustomEndpointInformation
();
// Can be created
boolean
isInstantiable
();
// Driver shipped along with JDK/DBeaver, doesn't need any additional libraries. Basically it is ODBC driver.
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceUtils.java
浏览文件 @
6a0cfb13
...
...
@@ -403,11 +403,13 @@ public class DataSourceUtils {
@NotNull
public
static
String
getDataSourceAddressText
(
DBPDataSourceContainer
dataSourceContainer
)
{
DBPDataSourceProvider
dataSourceProvider
=
dataSourceContainer
.
getDriver
().
getDataSourceProvider
();
if
(
dataSourceProvider
instanceof
DBPInformationProvider
)
{
String
objectInformation
=
((
DBPInformationProvider
)
dataSourceProvider
).
getObjectInformation
(
dataSourceContainer
,
DBPInformationProvider
.
INFO_TARGET_ADDRESS
);
if
(!
CommonUtils
.
isEmpty
(
objectInformation
))
{
return
objectInformation
;
if
(
dataSourceContainer
.
getDriver
().
isCustomEndpointInformation
())
{
DBPDataSourceProvider
dataSourceProvider
=
dataSourceContainer
.
getDriver
().
getDataSourceProvider
();
if
(
dataSourceProvider
instanceof
DBPInformationProvider
)
{
String
objectInformation
=
((
DBPInformationProvider
)
dataSourceProvider
).
getObjectInformation
(
dataSourceContainer
,
DBPInformationProvider
.
INFO_TARGET_ADDRESS
);
if
(!
CommonUtils
.
isEmpty
(
objectInformation
))
{
return
objectInformation
;
}
}
}
DBPConnectionConfiguration
cfg
=
dataSourceContainer
.
getConnectionConfiguration
();
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/RegistryConstants.java
浏览文件 @
6a0cfb13
...
...
@@ -90,6 +90,7 @@ public class RegistryConstants {
public
static
final
String
ATTR_EMBEDDED
=
"embedded"
;
//$NON-NLS-1$
public
static
final
String
ATTR_CUSTOM_DRIVER_LOADER
=
"customDriverLoader"
;
//$NON-NLS-1$
public
static
final
String
ATTR_USE_URL_TEMPLATE
=
"useURL"
;
//$NON-NLS-1$
public
static
final
String
ATTR_CUSTOM_ENDPOINT
=
"customEndpoint"
;
//$NON-NLS-1$
public
static
final
String
ATTR_INSTANTIABLE
=
"instantiable"
;
//$NON-NLS-1$
public
static
final
String
ATTR_PROMOTED
=
"promoted"
;
//$NON-NLS-1$
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
浏览文件 @
6a0cfb13
...
...
@@ -141,6 +141,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
private
boolean
licenseRequired
;
private
boolean
customDriverLoader
;
private
boolean
useURLTemplate
;
private
boolean
customEndpointInformation
;
private
boolean
instantiable
,
origInstantiable
;
private
boolean
custom
;
private
boolean
modified
;
...
...
@@ -192,6 +193,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
this
.
id
=
id
;
this
.
custom
=
true
;
this
.
useURLTemplate
=
true
;
this
.
customEndpointInformation
=
false
;
this
.
instantiable
=
true
;
this
.
promoted
=
0
;
...
...
@@ -235,6 +237,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
this
.
licenseRequired
=
copyFrom
.
licenseRequired
;
this
.
customDriverLoader
=
copyFrom
.
customDriverLoader
;
this
.
useURLTemplate
=
copyFrom
.
useURLTemplate
;
this
.
customEndpointInformation
=
copyFrom
.
customEndpointInformation
;
this
.
instantiable
=
copyFrom
.
instantiable
;
this
.
promoted
=
copyFrom
.
promoted
;
this
.
nativeClientHomes
.
addAll
(
copyFrom
.
nativeClientHomes
);
...
...
@@ -281,6 +284,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
this
.
clientRequired
=
CommonUtils
.
getBoolean
(
config
.
getAttribute
(
RegistryConstants
.
ATTR_CLIENT_REQUIRED
),
false
);
this
.
customDriverLoader
=
CommonUtils
.
getBoolean
(
config
.
getAttribute
(
RegistryConstants
.
ATTR_CUSTOM_DRIVER_LOADER
),
false
);
this
.
useURLTemplate
=
CommonUtils
.
getBoolean
(
config
.
getAttribute
(
RegistryConstants
.
ATTR_USE_URL_TEMPLATE
),
true
);
this
.
customEndpointInformation
=
CommonUtils
.
getBoolean
(
config
.
getAttribute
(
RegistryConstants
.
ATTR_CUSTOM_ENDPOINT
),
false
);
this
.
promoted
=
CommonUtils
.
toInt
(
config
.
getAttribute
(
RegistryConstants
.
ATTR_PROMOTED
),
0
);
this
.
supportsDriverProperties
=
CommonUtils
.
getBoolean
(
config
.
getAttribute
(
RegistryConstants
.
ATTR_SUPPORTS_DRIVER_PROPERTIES
),
true
);
this
.
origInstantiable
=
this
.
instantiable
=
CommonUtils
.
getBoolean
(
config
.
getAttribute
(
RegistryConstants
.
ATTR_INSTANTIABLE
),
true
);
...
...
@@ -747,7 +751,12 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
return
useURLTemplate
;
}
public
void
setUseURL
(
boolean
useURLTemplate
)
{
@Override
public
boolean
isCustomEndpointInformation
()
{
return
customEndpointInformation
;
}
void
setUseURL
(
boolean
useURLTemplate
)
{
this
.
useURLTemplate
=
useURLTemplate
;
}
...
...
plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -7,6 +7,7 @@ Bundle-Version: 1.0.40.qualifier
Bundle-Release-Date: 20210301
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.jkiss.dbeaver.model;visibility:=reexport,
org.jkiss.dbeaver.registry;visibility:=reexport,
...
...
plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -7,6 +7,7 @@ Bundle-Version: 1.0.40.qualifier
Bundle-Release-Date: 20210301
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.jkiss.dbeaver.model;visibility:=reexport,
org.jkiss.dbeaver.registry;visibility:=reexport,
...
...
test/org.jkiss.dbeaver.ext.greenplum.test/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -7,6 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: DBeaver Corp
Bundle-ClassPath: .
Fragment-Host: org.jkiss.dbeaver.ext.greenplum
Bundle-ActivationPolicy: lazy
Require-Bundle: org.junit,
org.mockito.mockito-all,
org.jkiss.dbeaver.headless,
...
...
test/org.jkiss.dbeaver.ext.postgresql.test/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -7,6 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: DBeaver Corp
Bundle-ClassPath: .
Fragment-Host: org.jkiss.dbeaver.ext.postgresql
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.junit,
...
...
test/org.jkiss.dbeaver.test.platform/META-INF/MANIFEST.MF
浏览文件 @
6a0cfb13
...
...
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.jkiss.dbeaver.test.platform
Bundle-Version: 1.0.9.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.junit,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录