Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
0502bb7f
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0502bb7f
编写于
1月 11, 2017
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#1120 Client app name override.
Former-commit-id:
0424bddd
上级
f9eb41b7
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
65 addition
and
18 deletion
+65
-18
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageMetaData.java
...rc/org/jkiss/dbeaver/ui/preferences/PrefPageMetaData.java
+48
-12
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
...b2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
+1
-1
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
...rc/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
+1
-1
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
.../org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
+1
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
...jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/ModelPreferences.java
...dbeaver.model/src/org/jkiss/dbeaver/ModelPreferences.java
+7
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBUtils.java
...ss.dbeaver.model/src/org/jkiss/dbeaver/model/DBUtils.java
+6
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageMetaData.java
浏览文件 @
0502bb7f
...
@@ -18,11 +18,10 @@
...
@@ -18,11 +18,10 @@
*/
*/
package
org.jkiss.dbeaver.ui.preferences
;
package
org.jkiss.dbeaver.ui.preferences
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.events.SelectionAdapter
;
import
org.eclipse.swt.widgets.Button
;
import
org.eclipse.swt.events.SelectionEvent
;
import
org.eclipse.swt.widgets.Composite
;
import
org.eclipse.swt.layout.GridData
;
import
org.eclipse.swt.widgets.Control
;
import
org.eclipse.swt.widgets.*
;
import
org.eclipse.swt.widgets.Group
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.ModelPreferences
;
import
org.jkiss.dbeaver.ModelPreferences
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.core.CoreMessages
;
...
@@ -42,6 +41,9 @@ public class PrefPageMetaData extends TargetPrefPage
...
@@ -42,6 +41,9 @@ public class PrefPageMetaData extends TargetPrefPage
private
Button
separateMetaConnectionCheck
;
private
Button
separateMetaConnectionCheck
;
private
Button
caseSensitiveNamesCheck
;
private
Button
caseSensitiveNamesCheck
;
private
Button
overrideClientApplicationNameCheck
;
private
Text
clientApplicationNameText
;
public
PrefPageMetaData
()
public
PrefPageMetaData
()
{
{
super
();
super
();
...
@@ -54,7 +56,9 @@ public class PrefPageMetaData extends TargetPrefPage
...
@@ -54,7 +56,9 @@ public class PrefPageMetaData extends TargetPrefPage
return
return
store
.
contains
(
DBeaverPreferences
.
READ_EXPENSIVE_PROPERTIES
)
||
store
.
contains
(
DBeaverPreferences
.
READ_EXPENSIVE_PROPERTIES
)
||
store
.
contains
(
ModelPreferences
.
META_SEPARATE_CONNECTION
)
||
store
.
contains
(
ModelPreferences
.
META_SEPARATE_CONNECTION
)
||
store
.
contains
(
ModelPreferences
.
META_CASE_SENSITIVE
)
store
.
contains
(
ModelPreferences
.
META_CASE_SENSITIVE
)
||
store
.
contains
(
ModelPreferences
.
META_CLIENT_NAME_OVERRIDE
)
||
store
.
contains
(
ModelPreferences
.
META_CLIENT_NAME_VALUE
)
;
;
}
}
...
@@ -67,20 +71,41 @@ public class PrefPageMetaData extends TargetPrefPage
...
@@ -67,20 +71,41 @@ public class PrefPageMetaData extends TargetPrefPage
@Override
@Override
protected
Control
createPreferenceContent
(
Composite
parent
)
protected
Control
createPreferenceContent
(
Composite
parent
)
{
{
Composite
composite
=
UIUtils
.
createPlaceholder
(
parent
,
1
);
Composite
composite
=
UIUtils
.
createPlaceholder
(
parent
,
1
,
5
);
{
{
Group
metadataGroup
=
UIUtils
.
createControlGroup
(
composite
,
CoreMessages
.
pref_page_database_general_group_metadata
,
2
,
SWT
.
NONE
,
0
);
Group
metadataGroup
=
UIUtils
.
createControlGroup
(
composite
,
CoreMessages
.
pref_page_database_general_group_metadata
,
1
,
GridData
.
HORIZONTAL_ALIGN_BEGINNING
,
0
);
separateMetaConnectionCheck
=
UIUtils
.
create
Label
Checkbox
(
metadataGroup
,
CoreMessages
.
pref_page_database_general_separate_meta_connection
,
false
);
separateMetaConnectionCheck
=
UIUtils
.
createCheckbox
(
metadataGroup
,
CoreMessages
.
pref_page_database_general_separate_meta_connection
,
false
);
caseSensitiveNamesCheck
=
UIUtils
.
create
Label
Checkbox
(
metadataGroup
,
CoreMessages
.
pref_page_database_general_checkbox_case_sensitive_names
,
false
);
caseSensitiveNamesCheck
=
UIUtils
.
createCheckbox
(
metadataGroup
,
CoreMessages
.
pref_page_database_general_checkbox_case_sensitive_names
,
false
);
readExpensiveCheck
=
UIUtils
.
create
Label
Checkbox
(
metadataGroup
,
CoreMessages
.
pref_page_database_general_checkbox_show_row_count
,
false
);
readExpensiveCheck
=
UIUtils
.
createCheckbox
(
metadataGroup
,
CoreMessages
.
pref_page_database_general_checkbox_show_row_count
,
false
);
}
}
{
Group
clientNameGroup
=
UIUtils
.
createControlGroup
(
composite
,
"Client Application Name"
,
2
,
GridData
.
FILL_HORIZONTAL
,
0
);
final
Label
label
=
UIUtils
.
createLabel
(
clientNameGroup
,
"Client application name is passed to database server on connect to identify client connections.\n"
+
"By default it is set to product name + product version. You can set it to any custom value."
);
GridData
gd
=
new
GridData
();
gd
.
horizontalSpan
=
2
;
label
.
setLayoutData
(
gd
);
overrideClientApplicationNameCheck
=
UIUtils
.
createCheckbox
(
clientNameGroup
,
"Override client application name"
,
null
,
false
,
2
);
overrideClientApplicationNameCheck
.
addSelectionListener
(
new
SelectionAdapter
()
{
@Override
public
void
widgetSelected
(
SelectionEvent
e
)
{
updateClientAppEnablement
();
}
});
clientApplicationNameText
=
UIUtils
.
createLabelText
(
clientNameGroup
,
"Client Application Name"
,
""
);
}
return
composite
;
return
composite
;
}
}
private
void
updateClientAppEnablement
()
{
clientApplicationNameText
.
setEnabled
(
overrideClientApplicationNameCheck
.
getSelection
());
}
@Override
@Override
protected
void
loadPreferences
(
DBPPreferenceStore
store
)
protected
void
loadPreferences
(
DBPPreferenceStore
store
)
{
{
...
@@ -88,6 +113,11 @@ public class PrefPageMetaData extends TargetPrefPage
...
@@ -88,6 +113,11 @@ public class PrefPageMetaData extends TargetPrefPage
readExpensiveCheck
.
setSelection
(
store
.
getBoolean
(
DBeaverPreferences
.
READ_EXPENSIVE_PROPERTIES
));
readExpensiveCheck
.
setSelection
(
store
.
getBoolean
(
DBeaverPreferences
.
READ_EXPENSIVE_PROPERTIES
));
separateMetaConnectionCheck
.
setSelection
(
store
.
getBoolean
(
ModelPreferences
.
META_SEPARATE_CONNECTION
));
separateMetaConnectionCheck
.
setSelection
(
store
.
getBoolean
(
ModelPreferences
.
META_SEPARATE_CONNECTION
));
caseSensitiveNamesCheck
.
setSelection
(
store
.
getBoolean
(
ModelPreferences
.
META_CASE_SENSITIVE
));
caseSensitiveNamesCheck
.
setSelection
(
store
.
getBoolean
(
ModelPreferences
.
META_CASE_SENSITIVE
));
overrideClientApplicationNameCheck
.
setSelection
(
store
.
getBoolean
(
ModelPreferences
.
META_CLIENT_NAME_OVERRIDE
));
clientApplicationNameText
.
setText
(
store
.
getString
(
ModelPreferences
.
META_CLIENT_NAME_VALUE
));
updateClientAppEnablement
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
warn
(
e
);
log
.
warn
(
e
);
}
}
...
@@ -100,6 +130,9 @@ public class PrefPageMetaData extends TargetPrefPage
...
@@ -100,6 +130,9 @@ public class PrefPageMetaData extends TargetPrefPage
store
.
setValue
(
DBeaverPreferences
.
READ_EXPENSIVE_PROPERTIES
,
readExpensiveCheck
.
getSelection
());
store
.
setValue
(
DBeaverPreferences
.
READ_EXPENSIVE_PROPERTIES
,
readExpensiveCheck
.
getSelection
());
store
.
setValue
(
ModelPreferences
.
META_SEPARATE_CONNECTION
,
separateMetaConnectionCheck
.
getSelection
());
store
.
setValue
(
ModelPreferences
.
META_SEPARATE_CONNECTION
,
separateMetaConnectionCheck
.
getSelection
());
store
.
setValue
(
ModelPreferences
.
META_CASE_SENSITIVE
,
caseSensitiveNamesCheck
.
getSelection
());
store
.
setValue
(
ModelPreferences
.
META_CASE_SENSITIVE
,
caseSensitiveNamesCheck
.
getSelection
());
store
.
setValue
(
ModelPreferences
.
META_CLIENT_NAME_OVERRIDE
,
overrideClientApplicationNameCheck
.
getSelection
());
store
.
setValue
(
ModelPreferences
.
META_CLIENT_NAME_VALUE
,
clientApplicationNameText
.
getText
());
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
warn
(
e
);
log
.
warn
(
e
);
}
}
...
@@ -112,6 +145,9 @@ public class PrefPageMetaData extends TargetPrefPage
...
@@ -112,6 +145,9 @@ public class PrefPageMetaData extends TargetPrefPage
store
.
setToDefault
(
DBeaverPreferences
.
READ_EXPENSIVE_PROPERTIES
);
store
.
setToDefault
(
DBeaverPreferences
.
READ_EXPENSIVE_PROPERTIES
);
store
.
setToDefault
(
ModelPreferences
.
META_SEPARATE_CONNECTION
);
store
.
setToDefault
(
ModelPreferences
.
META_SEPARATE_CONNECTION
);
store
.
setToDefault
(
ModelPreferences
.
META_CASE_SENSITIVE
);
store
.
setToDefault
(
ModelPreferences
.
META_CASE_SENSITIVE
);
store
.
setToDefault
(
ModelPreferences
.
META_CLIENT_NAME_OVERRIDE
);
store
.
setToDefault
(
ModelPreferences
.
META_CLIENT_NAME_VALUE
);
}
}
@Override
@Override
...
...
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
浏览文件 @
0502bb7f
...
@@ -300,7 +300,7 @@ public class DB2DataSource extends JDBCDataSource implements DBSObjectSelector,
...
@@ -300,7 +300,7 @@ public class DB2DataSource extends JDBCDataSource implements DBSObjectSelector,
// Provide client info
// Provide client info
try
{
try
{
db2Connection
.
setClientInfo
(
"ApplicationName"
,
db2Connection
.
setClientInfo
(
"ApplicationName"
,
CommonUtils
.
truncateString
(
DBUtils
.
getClientApplicationName
(
getContainer
()
)
+
" - "
+
purpose
,
255
));
CommonUtils
.
truncateString
(
DBUtils
.
getClientApplicationName
(
getContainer
()
,
purpose
)
,
255
));
}
catch
(
Throwable
e
)
{
}
catch
(
Throwable
e
)
{
// just ignore
// just ignore
}
}
...
...
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
浏览文件 @
0502bb7f
...
@@ -375,7 +375,7 @@ public class MySQLDataSource extends JDBCDataSource implements DBSObjectSelector
...
@@ -375,7 +375,7 @@ public class MySQLDataSource extends JDBCDataSource implements DBSObjectSelector
{
{
// Provide client info
// Provide client info
try
{
try
{
mysqlConnection
.
setClientInfo
(
"ApplicationName"
,
DBUtils
.
getClientApplicationName
(
getContainer
()
)
+
" - "
+
purpose
);
mysqlConnection
.
setClientInfo
(
"ApplicationName"
,
DBUtils
.
getClientApplicationName
(
getContainer
()
,
purpose
)
);
}
catch
(
Throwable
e
)
{
}
catch
(
Throwable
e
)
{
// just ignore
// just ignore
log
.
debug
(
e
);
log
.
debug
(
e
);
...
...
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
浏览文件 @
0502bb7f
...
@@ -208,7 +208,7 @@ public class OracleDataSource extends JDBCDataSource
...
@@ -208,7 +208,7 @@ public class OracleDataSource extends JDBCDataSource
protected
Map
<
String
,
String
>
getInternalConnectionProperties
(
DBRProgressMonitor
monitor
,
String
purpose
)
throws
DBCException
{
protected
Map
<
String
,
String
>
getInternalConnectionProperties
(
DBRProgressMonitor
monitor
,
String
purpose
)
throws
DBCException
{
Map
<
String
,
String
>
connectionsProps
=
new
HashMap
<>();
Map
<
String
,
String
>
connectionsProps
=
new
HashMap
<>();
// Program name
// Program name
connectionsProps
.
put
(
"v$session.program"
,
CommonUtils
.
truncateString
(
DBUtils
.
getClientApplicationName
(
getContainer
()
)
+
" - "
+
purpose
,
48
));
connectionsProps
.
put
(
"v$session.program"
,
CommonUtils
.
truncateString
(
DBUtils
.
getClientApplicationName
(
getContainer
()
,
purpose
)
,
48
));
return
connectionsProps
;
return
connectionsProps
;
}
}
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
浏览文件 @
0502bb7f
...
@@ -355,7 +355,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
...
@@ -355,7 +355,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
{
{
// Provide client info
// Provide client info
try
{
try
{
pgConnection
.
setClientInfo
(
"ApplicationName"
,
DBUtils
.
getClientApplicationName
(
getContainer
()
)
+
" - "
+
purpose
);
pgConnection
.
setClientInfo
(
"ApplicationName"
,
DBUtils
.
getClientApplicationName
(
getContainer
()
,
purpose
)
);
}
catch
(
Throwable
e
)
{
}
catch
(
Throwable
e
)
{
// just ignore
// just ignore
log
.
debug
(
e
);
log
.
debug
(
e
);
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/ModelPreferences.java
浏览文件 @
0502bb7f
...
@@ -53,6 +53,9 @@ public final class ModelPreferences
...
@@ -53,6 +53,9 @@ public final class ModelPreferences
public
static
final
String
META_SEPARATE_CONNECTION
=
"database.meta.separate.connection"
;
//$NON-NLS-1$
public
static
final
String
META_SEPARATE_CONNECTION
=
"database.meta.separate.connection"
;
//$NON-NLS-1$
public
static
final
String
META_CASE_SENSITIVE
=
"database.meta.casesensitive"
;
//$NON-NLS-1$
public
static
final
String
META_CASE_SENSITIVE
=
"database.meta.casesensitive"
;
//$NON-NLS-1$
public
static
final
String
META_CLIENT_NAME_OVERRIDE
=
"database.meta.client.name.override"
;
//$NON-NLS-1$
public
static
final
String
META_CLIENT_NAME_VALUE
=
"database.meta.client.name.value"
;
//$NON-NLS-1$
// Network
// Network
public
static
final
String
NET_TUNNEL_PORT_MIN
=
"net.tunnel.port.min"
;
//$NON-NLS-1$
public
static
final
String
NET_TUNNEL_PORT_MIN
=
"net.tunnel.port.min"
;
//$NON-NLS-1$
public
static
final
String
NET_TUNNEL_PORT_MAX
=
"net.tunnel.port.max"
;
//$NON-NLS-1$
public
static
final
String
NET_TUNNEL_PORT_MAX
=
"net.tunnel.port.max"
;
//$NON-NLS-1$
...
@@ -105,6 +108,10 @@ public final class ModelPreferences
...
@@ -105,6 +108,10 @@ public final class ModelPreferences
PrefUtils
.
setDefaultPreferenceValue
(
store
,
MEMORY_CONTENT_MAX_SIZE
,
10000
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
MEMORY_CONTENT_MAX_SIZE
,
10000
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
META_SEPARATE_CONNECTION
,
true
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
META_SEPARATE_CONNECTION
,
true
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
META_CASE_SENSITIVE
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
META_CASE_SENSITIVE
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
META_CLIENT_NAME_OVERRIDE
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
META_CLIENT_NAME_VALUE
,
""
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
CONTENT_HEX_ENCODING
,
GeneralUtils
.
getDefaultFileEncoding
());
PrefUtils
.
setDefaultPreferenceValue
(
store
,
CONTENT_HEX_ENCODING
,
GeneralUtils
.
getDefaultFileEncoding
());
PrefUtils
.
setDefaultPreferenceValue
(
store
,
CONTENT_CACHE_CLOB
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
CONTENT_CACHE_CLOB
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
CONTENT_CACHE_BLOB
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
CONTENT_CACHE_BLOB
,
false
);
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBUtils.java
浏览文件 @
0502bb7f
...
@@ -1360,8 +1360,12 @@ public final class DBUtils {
...
@@ -1360,8 +1360,12 @@ public final class DBUtils {
});
});
}
}
public
static
String
getClientApplicationName
(
DBPDataSourceContainer
container
)
{
public
static
String
getClientApplicationName
(
DBPDataSourceContainer
container
,
String
purpose
)
{
return
GeneralUtils
.
getProductTitle
();
if
(
container
.
getPreferenceStore
().
getBoolean
(
ModelPreferences
.
META_CLIENT_NAME_OVERRIDE
))
{
return
container
.
getPreferenceStore
().
getString
(
ModelPreferences
.
META_CLIENT_NAME_VALUE
);
}
final
String
productTitle
=
GeneralUtils
.
getProductTitle
();
return
purpose
==
null
?
productTitle
:
productTitle
+
" - "
+
purpose
;
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录