Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
dd15372b
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,发现更多精彩内容 >>
提交
dd15372b
编写于
5月 26, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactoring: model.sql bundle extraction
Former-commit-id:
427266a3
上级
72197d27
变更
65
显示空白变更内容
内联
并排
Showing
65 changed file
with
822 addition
and
654 deletion
+822
-654
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java
....dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java
+0
-8
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceToolbarUtils.java
...dbeaver/ui/actions/datasource/DataSourceToolbarUtils.java
+5
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/net/HTTPTunnelConfiguratorUI.java
...kiss/dbeaver/ui/dialogs/net/HTTPTunnelConfiguratorUI.java
+5
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/net/SSLConfiguratorAbstractUI.java
...iss/dbeaver/ui/dialogs/net/SSLConfiguratorAbstractUI.java
+5
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/net/SocksProxyConfiguratorUI.java
...kiss/dbeaver/ui/dialogs/net/SocksProxyConfiguratorUI.java
+5
-0
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/DB2Utils.java
...eaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/DB2Utils.java
+2
-2
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableCheckConstraint.java
.../jkiss/dbeaver/ext/db2/model/DB2TableCheckConstraint.java
+2
-2
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Trigger.java
...t.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Trigger.java
+2
-2
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2ViewBase.java
....db2/src/org/jkiss/dbeaver/ext/db2/model/DB2ViewBase.java
+2
-2
plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolView.java
...ol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolView.java
+2
-2
plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/META-INF/MANIFEST.MF
...iss.dbeaver.ext.format.sqlworkbenchj/META-INF/MANIFEST.MF
+3
-0
plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/plugin.xml
...ins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/plugin.xml
+6
-1
plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/src/org/jkiss/dbeaver/ext/format/sqlworkbenchj/SQLWorkbenchJAdapterFactory.java
...ext/format/sqlworkbenchj/SQLWorkbenchJAdapterFactory.java
+45
-0
plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/src/org/jkiss/dbeaver/ext/format/sqlworkbenchj/SQLWorkbenchJFormatterSettingsPage.java
...mat/sqlworkbenchj/SQLWorkbenchJFormatterSettingsPage.java
+1
-1
plugins/org.jkiss.dbeaver.ext.generic/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.ext.generic/META-INF/MANIFEST.MF
+2
-1
plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANAMetaModel.java
...a/src/org/jkiss/dbeaver/ext/hana/model/HANAMetaModel.java
+2
-2
plugins/org.jkiss.dbeaver.ext.hive/src/org/jkiss/dbeaver/ext/hive/model/HiveMetaModel.java
...e/src/org/jkiss/dbeaver/ext/hive/model/HiveMetaModel.java
+2
-3
plugins/org.jkiss.dbeaver.ext.hsqldb/src/org/jkiss/dbeaver/ext/hsqldb/model/HSQLMetaModel.java
...src/org/jkiss/dbeaver/ext/hsqldb/model/HSQLMetaModel.java
+2
-2
plugins/org.jkiss.dbeaver.ext.hsqldb/src/org/jkiss/dbeaver/ext/hsqldb/model/HSQLTrigger.java
...b/src/org/jkiss/dbeaver/ext/hsqldb/model/HSQLTrigger.java
+2
-2
plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLView.java
...ysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLView.java
+2
-2
plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF
...ins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTrigger.java
...rg/jkiss/dbeaver/ext/postgresql/model/PostgreTrigger.java
+2
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/plan/PostgrePlanNodeBase.java
...beaver/ext/postgresql/model/plan/PostgrePlanNodeBase.java
+3
-2
plugins/org.jkiss.dbeaver.model.sql/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.model.sql/META-INF/MANIFEST.MF
+5
-1
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle.properties
...g.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle.properties
+9
-0
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_de.properties
...kiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_de.properties
+2
-0
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_fr.properties
...kiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_fr.properties
+2
-0
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_ja.properties
...kiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_ja.properties
+2
-0
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_ko.properties
...kiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_ko.properties
+9
-0
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_ru.properties
...kiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_ru.properties
+7
-0
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_zh.properties
...kiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_zh.properties
+2
-0
plugins/org.jkiss.dbeaver.model.sql/plugin.xml
plugins/org.jkiss.dbeaver.model.sql/plugin.xml
+11
-0
plugins/org.jkiss.dbeaver.model.sql/schemas/org.jkiss.dbeaver.sqlFormatter.exsd
...ver.model.sql/schemas/org.jkiss.dbeaver.sqlFormatter.exsd
+0
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLModelPreferences.java
.../src/org/jkiss/dbeaver/model/sql/SQLModelPreferences.java
+27
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/SQLFormatUtils.java
...rc/org/jkiss/dbeaver/model/sql/format/SQLFormatUtils.java
+40
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/SQLFormatter.java
.../src/org/jkiss/dbeaver/model/sql/format/SQLFormatter.java
+0
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/SQLFormatterConfiguration.java
...s/dbeaver/model/sql/format/SQLFormatterConfiguration.java
+137
-138
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/SQLFormatterRegistry.java
.../jkiss/dbeaver/model/sql/format/SQLFormatterRegistry.java
+0
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/external/SQLFormatterExternal.java
...eaver/model/sql/format/external/SQLFormatterExternal.java
+0
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/tokenized/FormatterToken.java
...ss/dbeaver/model/sql/format/tokenized/FormatterToken.java
+74
-74
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/tokenized/IndentFormatter.java
...s/dbeaver/model/sql/format/tokenized/IndentFormatter.java
+0
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterCompact.java
...eaver/model/sql/format/tokenized/SQLFormatterCompact.java
+0
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
...ver/model/sql/format/tokenized/SQLFormatterTokenized.java
+0
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLTokensParser.java
...s/dbeaver/model/sql/format/tokenized/SQLTokensParser.java
+302
-302
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/tokenized/TokenType.java
...g/jkiss/dbeaver/model/sql/format/tokenized/TokenType.java
+0
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/internal/SQLModelPreferencesInitializer.java
...er/model/sql/internal/SQLModelPreferencesInitializer.java
+40
-0
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/registry/SQLFormatterConfigurationRegistry.java
...model/sql/registry/SQLFormatterConfigurationRegistry.java
+1
-17
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/registry/SQLFormatterDescriptor.java
...ss/dbeaver/model/sql/registry/SQLFormatterDescriptor.java
+2
-20
plugins/org.jkiss.dbeaver.model.sql/tests/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenizedTest.java
...model/sql/format/tokenized/SQLFormatterTokenizedTest.java
+0
-0
plugins/org.jkiss.dbeaver.model/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.model/META-INF/MANIFEST.MF
+0
-3
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/ModelPreferences.java
...dbeaver.model/src/org/jkiss/dbeaver/ModelPreferences.java
+0
-3
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/app/DBPPlatform.java
...er.model/src/org/jkiss/dbeaver/model/app/DBPPlatform.java
+0
-4
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
...eaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
+0
-14
plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java
...org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java
+5
-0
plugins/org.jkiss.dbeaver.ui.editors.sql/META-INF/MANIFEST.MF
...ins/org.jkiss.dbeaver.ui.editors.sql/META-INF/MANIFEST.MF
+1
-1
plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties
...ss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties
+0
-7
plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
+0
-7
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/preferences/PrefPageSQLFormat.java
...dbeaver/ui/editors/sql/preferences/PrefPageSQLFormat.java
+27
-13
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/preferences/format/BaseFormatterConfigurationPage.java
...ql/preferences/format/BaseFormatterConfigurationPage.java
+2
-3
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/preferences/format/SQLExternalFormatterConfigurationPage.java
...erences/format/SQLExternalFormatterConfigurationPage.java
+1
-1
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/preferences/format/SQLFormatterConfigurator.java
...tors/sql/preferences/format/SQLFormatterConfigurator.java
+4
-4
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/preferences/format/tokenized/SQLTokenizedFormatterConfigurationPage.java
...mat/tokenized/SQLTokenizedFormatterConfigurationPage.java
+2
-2
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLFormattingStrategy.java
.../dbeaver/ui/editors/sql/syntax/SQLFormattingStrategy.java
+1
-1
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/IObjectPropertyConfigurator.java
...src/org/jkiss/dbeaver/ui/IObjectPropertyConfigurator.java
+3
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java
浏览文件 @
dd15372b
...
@@ -44,7 +44,6 @@ import org.jkiss.dbeaver.model.qm.QMUtils;
...
@@ -44,7 +44,6 @@ import org.jkiss.dbeaver.model.qm.QMUtils;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.OSDescriptor
;
import
org.jkiss.dbeaver.model.runtime.OSDescriptor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatterRegistry
;
import
org.jkiss.dbeaver.registry.*
;
import
org.jkiss.dbeaver.registry.*
;
import
org.jkiss.dbeaver.registry.datatype.DataTypeProviderRegistry
;
import
org.jkiss.dbeaver.registry.datatype.DataTypeProviderRegistry
;
import
org.jkiss.dbeaver.registry.driver.DriverDescriptor
;
import
org.jkiss.dbeaver.registry.driver.DriverDescriptor
;
...
@@ -56,7 +55,6 @@ import org.jkiss.dbeaver.runtime.jobs.KeepAliveJob;
...
@@ -56,7 +55,6 @@ import org.jkiss.dbeaver.runtime.jobs.KeepAliveJob;
import
org.jkiss.dbeaver.runtime.net.GlobalProxySelector
;
import
org.jkiss.dbeaver.runtime.net.GlobalProxySelector
;
import
org.jkiss.dbeaver.runtime.qm.QMControllerImpl
;
import
org.jkiss.dbeaver.runtime.qm.QMControllerImpl
;
import
org.jkiss.dbeaver.runtime.qm.QMLogFileWriter
;
import
org.jkiss.dbeaver.runtime.qm.QMLogFileWriter
;
import
org.jkiss.dbeaver.ui.editors.sql.registry.SQLFormatterConfigurationRegistry
;
import
org.jkiss.dbeaver.ui.resources.DefaultResourceHandlerImpl
;
import
org.jkiss.dbeaver.ui.resources.DefaultResourceHandlerImpl
;
import
org.jkiss.dbeaver.utils.ContentUtils
;
import
org.jkiss.dbeaver.utils.ContentUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
...
@@ -484,12 +482,6 @@ public class DBeaverCore implements DBPPlatform {
...
@@ -484,12 +482,6 @@ public class DBeaverCore implements DBPPlatform {
return
DataFormatterRegistry
.
getInstance
();
return
DataFormatterRegistry
.
getInstance
();
}
}
@NotNull
@Override
public
SQLFormatterRegistry
getSQLFormatterRegistry
()
{
return
SQLFormatterConfigurationRegistry
.
getInstance
();
}
@NotNull
@NotNull
@Override
@Override
public
DBPPreferenceStore
getPreferenceStore
()
{
public
DBPPreferenceStore
getPreferenceStore
()
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceToolbarUtils.java
浏览文件 @
dd15372b
...
@@ -70,8 +70,10 @@ public class DataSourceToolbarUtils
...
@@ -70,8 +70,10 @@ public class DataSourceToolbarUtils
public
static
void
updateCommandsUI
()
{
public
static
void
updateCommandsUI
()
{
ICommandService
commandService
=
PlatformUI
.
getWorkbench
().
getService
(
ICommandService
.
class
);
ICommandService
commandService
=
PlatformUI
.
getWorkbench
().
getService
(
ICommandService
.
class
);
if
(
commandService
!=
null
)
{
commandService
.
refreshElements
(
"org.jkiss.dbeaver.ui.tools.select.connection"
,
null
);
commandService
.
refreshElements
(
"org.jkiss.dbeaver.ui.tools.select.connection"
,
null
);
commandService
.
refreshElements
(
"org.jkiss.dbeaver.ui.tools.select.schema"
,
null
);
commandService
.
refreshElements
(
"org.jkiss.dbeaver.ui.tools.select.schema"
,
null
);
commandService
.
refreshElements
(
"org.jkiss.dbeaver.ui.editors.sql.sync.connection"
,
null
);
commandService
.
refreshElements
(
"org.jkiss.dbeaver.ui.editors.sql.sync.connection"
,
null
);
}
}
}
}
}
\ No newline at end of file
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/net/HTTPTunnelConfiguratorUI.java
浏览文件 @
dd15372b
...
@@ -44,6 +44,11 @@ public class HTTPTunnelConfiguratorUI implements IObjectPropertyConfigurator<DBW
...
@@ -44,6 +44,11 @@ public class HTTPTunnelConfiguratorUI implements IObjectPropertyConfigurator<DBW
properties
.
clear
();
properties
.
clear
();
}
}
@Override
public
void
resetSettings
(
DBWHandlerConfiguration
configuration
)
{
}
@Override
@Override
public
boolean
isComplete
()
public
boolean
isComplete
()
{
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/net/SSLConfiguratorAbstractUI.java
浏览文件 @
dd15372b
...
@@ -24,6 +24,11 @@ import org.jkiss.dbeaver.ui.IObjectPropertyConfigurator;
...
@@ -24,6 +24,11 @@ import org.jkiss.dbeaver.ui.IObjectPropertyConfigurator;
*/
*/
public
abstract
class
SSLConfiguratorAbstractUI
implements
IObjectPropertyConfigurator
<
DBWHandlerConfiguration
>
{
public
abstract
class
SSLConfiguratorAbstractUI
implements
IObjectPropertyConfigurator
<
DBWHandlerConfiguration
>
{
@Override
public
void
resetSettings
(
DBWHandlerConfiguration
configuration
)
{
}
@Override
@Override
public
boolean
isComplete
()
public
boolean
isComplete
()
{
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/net/SocksProxyConfiguratorUI.java
浏览文件 @
dd15372b
...
@@ -87,6 +87,11 @@ public class SocksProxyConfiguratorUI implements IObjectPropertyConfigurator<DBW
...
@@ -87,6 +87,11 @@ public class SocksProxyConfiguratorUI implements IObjectPropertyConfigurator<DBW
configuration
.
setSavePassword
(
savePasswordCheckbox
.
getSelection
());
configuration
.
setSavePassword
(
savePasswordCheckbox
.
getSelection
());
}
}
@Override
public
void
resetSettings
(
DBWHandlerConfiguration
configuration
)
{
}
@Override
@Override
public
boolean
isComplete
()
public
boolean
isComplete
()
{
{
...
...
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/DB2Utils.java
浏览文件 @
dd15372b
...
@@ -49,7 +49,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession;
...
@@ -49,7 +49,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.sql.Clob
;
import
java.sql.Clob
;
...
@@ -572,7 +572,7 @@ public class DB2Utils {
...
@@ -572,7 +572,7 @@ public class DB2Utils {
{
{
// First let the defaut SQL formater operate
// First let the defaut SQL formater operate
String
result
=
SQLUtils
.
formatSQL
(
db2DataSource
,
rawText
);
String
result
=
SQL
Format
Utils
.
formatSQL
(
db2DataSource
,
rawText
);
// Put some kwywords on the same line
// Put some kwywords on the same line
result
=
result
.
replace
(
"CREATE\r\n PROCEDURE"
,
"CREATE PROCEDURE"
);
result
=
result
.
replace
(
"CREATE\r\n PROCEDURE"
,
"CREATE PROCEDURE"
);
...
...
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TableCheckConstraint.java
浏览文件 @
dd15372b
...
@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
...
@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
import
org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableConstraint
;
import
org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableConstraint
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
org.jkiss.dbeaver.model.struct.DBSEntityAttributeRef
;
import
org.jkiss.dbeaver.model.struct.DBSEntityAttributeRef
;
import
org.jkiss.dbeaver.model.struct.DBSEntityConstraintType
;
import
org.jkiss.dbeaver.model.struct.DBSEntityConstraintType
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
...
@@ -145,7 +145,7 @@ public class DB2TableCheckConstraint extends JDBCTableConstraint<DB2Table> imple
...
@@ -145,7 +145,7 @@ public class DB2TableCheckConstraint extends JDBCTableConstraint<DB2Table> imple
@Override
@Override
public
String
getObjectDefinitionText
(
DBRProgressMonitor
monitor
,
Map
<
String
,
Object
>
options
)
throws
DBException
public
String
getObjectDefinitionText
(
DBRProgressMonitor
monitor
,
Map
<
String
,
Object
>
options
)
throws
DBException
{
{
return
SQLUtils
.
formatSQL
(
getDataSource
(),
text
);
return
SQL
Format
Utils
.
formatSQL
(
getDataSource
(),
text
);
}
}
// -----------------
// -----------------
...
...
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Trigger.java
浏览文件 @
dd15372b
...
@@ -35,7 +35,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
...
@@ -35,7 +35,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
import
org.jkiss.dbeaver.model.meta.Association
;
import
org.jkiss.dbeaver.model.meta.Association
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTrigger
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTrigger
;
...
@@ -160,7 +160,7 @@ public class DB2Trigger extends DB2SchemaObject implements DBSTrigger, DB2Source
...
@@ -160,7 +160,7 @@ public class DB2Trigger extends DB2SchemaObject implements DBSTrigger, DB2Source
@Override
@Override
public
String
getObjectDefinitionText
(
DBRProgressMonitor
monitor
,
Map
<
String
,
Object
>
options
)
throws
DBException
public
String
getObjectDefinitionText
(
DBRProgressMonitor
monitor
,
Map
<
String
,
Object
>
options
)
throws
DBException
{
{
return
SQLUtils
.
formatSQL
(
getDataSource
(),
text
);
return
SQL
Format
Utils
.
formatSQL
(
getDataSource
(),
text
);
}
}
// -----------------
// -----------------
...
...
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2ViewBase.java
浏览文件 @
dd15372b
...
@@ -34,7 +34,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
...
@@ -34,7 +34,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
import
org.jkiss.dbeaver.model.meta.Association
;
import
org.jkiss.dbeaver.model.meta.Association
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSView
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSView
;
...
@@ -117,7 +117,7 @@ public abstract class DB2ViewBase extends DB2TableBase implements DB2SourceObjec
...
@@ -117,7 +117,7 @@ public abstract class DB2ViewBase extends DB2TableBase implements DB2SourceObjec
@Property
(
hidden
=
true
,
editable
=
true
,
updatable
=
true
,
order
=
-
1
)
@Property
(
hidden
=
true
,
editable
=
true
,
updatable
=
true
,
order
=
-
1
)
public
String
getObjectDefinitionText
(
DBRProgressMonitor
monitor
,
Map
<
String
,
Object
>
options
)
throws
DBException
public
String
getObjectDefinitionText
(
DBRProgressMonitor
monitor
,
Map
<
String
,
Object
>
options
)
throws
DBException
{
{
return
SQLUtils
.
formatSQL
(
getDataSource
(),
text
);
return
SQL
Format
Utils
.
formatSQL
(
getDataSource
(),
text
);
}
}
// -----------------
// -----------------
...
...
plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/ExasolView.java
浏览文件 @
dd15372b
...
@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCStructCache;
...
@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCStructCache;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
org.jkiss.dbeaver.model.struct.DBSEntityAssociation
;
import
org.jkiss.dbeaver.model.struct.DBSEntityAssociation
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
...
@@ -178,7 +178,7 @@ public class ExasolView extends ExasolTableBase implements ExasolSourceObject, D
...
@@ -178,7 +178,7 @@ public class ExasolView extends ExasolTableBase implements ExasolSourceObject, D
@Property
(
hidden
=
true
,
editable
=
true
,
updatable
=
true
,
order
=
-
1
)
@Property
(
hidden
=
true
,
editable
=
true
,
updatable
=
true
,
order
=
-
1
)
public
String
getObjectDefinitionText
(
DBRProgressMonitor
monitor
,
Map
<
String
,
Object
>
options
)
throws
DBException
{
public
String
getObjectDefinitionText
(
DBRProgressMonitor
monitor
,
Map
<
String
,
Object
>
options
)
throws
DBException
{
read
();
read
();
return
SQLUtils
.
formatSQL
(
getDataSource
(),
this
.
text
);
return
SQL
Format
Utils
.
formatSQL
(
getDataSource
(),
this
.
text
);
}
}
...
...
plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/META-INF/MANIFEST.MF
浏览文件 @
dd15372b
...
@@ -8,8 +8,11 @@ Require-Bundle: org.eclipse.ui,
...
@@ -8,8 +8,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.runtime,
org.jkiss.dbeaver.core,
org.jkiss.dbeaver.core,
org.jkiss.dbeaver.model,
org.jkiss.dbeaver.model,
org.jkiss.dbeaver.model.sql,
org.jkiss.dbeaver.ui,
org.jkiss.dbeaver.ui,
org.jkiss.dbeaver.ui.editors.sql,
org.eclipse.core.resources
org.eclipse.core.resources
Export-Package: org.jkiss.dbeaver.ext.format.sqlworkbenchj
Bundle-ActivationPolicy: lazy
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: JKISS
Bundle-Vendor: JKISS
plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/plugin.xml
浏览文件 @
dd15372b
...
@@ -6,9 +6,14 @@
...
@@ -6,9 +6,14 @@
<formatter
<formatter
id=
"sqlworkbenchj"
id=
"sqlworkbenchj"
class=
"org.jkiss.dbeaver.ext.format.sqlworkbenchj.SQLWorkbenchJFormatter"
class=
"org.jkiss.dbeaver.ext.format.sqlworkbenchj.SQLWorkbenchJFormatter"
configurerClass=
"org.jkiss.dbeaver.ext.format.sqlworkbenchj.SQLWorkbenchJFormatterSettingsPage"
label=
"SQL Workbench/J formatter"
label=
"SQL Workbench/J formatter"
description=
"Formatter from SQL Workbench/J"
/>
description=
"Formatter from SQL Workbench/J"
/>
</extension>
</extension>
<extension
point=
"org.eclipse.core.runtime.adapters"
>
<factory
adaptableType=
"org.jkiss.dbeaver.ext.format.sqlworkbenchj.SQLWorkbenchJFormatter"
class=
"org.jkiss.dbeaver.ext.format.sqlworkbenchj.SQLWorkbenchJAdapterFactory"
>
<adapter
type=
"org.jkiss.dbeaver.ui.editors.sql.preferences.format.SQLFormatterConfigurator"
/>
</factory>
</extension>
</plugin>
</plugin>
plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/src/org/jkiss/dbeaver/ext/format/sqlworkbenchj/SQLWorkbenchJAdapterFactory.java
0 → 100644
浏览文件 @
dd15372b
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.ext.format.sqlworkbenchj
;
import
org.eclipse.core.runtime.IAdapterFactory
;
import
org.jkiss.dbeaver.ui.editors.sql.preferences.format.SQLFormatterConfigurator
;
/**
* Adapts objects to their UI configurators
*/
public
class
SQLWorkbenchJAdapterFactory
implements
IAdapterFactory
{
private
static
final
Class
<?>[]
ADAPTER_LIST
=
{
SQLFormatterConfigurator
.
class
};
@Override
public
<
T
>
T
getAdapter
(
Object
adaptableObject
,
Class
<
T
>
adapterType
)
{
if
(
adapterType
==
SQLFormatterConfigurator
.
class
&&
adaptableObject
instanceof
SQLWorkbenchJFormatter
)
{
return
adapterType
.
cast
(
new
SQLWorkbenchJFormatterSettingsPage
());
}
return
null
;
}
@Override
public
Class
[]
getAdapterList
()
{
return
ADAPTER_LIST
;
}
}
plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/src/org/jkiss/dbeaver/ext/format/sqlworkbenchj/SQLWorkbenchJFormatterSettingsPage.java
浏览文件 @
dd15372b
...
@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Group;
...
@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Group;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.controls.TextWithOpenFolder
;
import
org.jkiss.dbeaver.ui.controls.TextWithOpenFolder
;
import
org.jkiss.dbeaver.ui.editors.sql.format.BaseFormatterConfigurationPage
;
import
org.jkiss.dbeaver.ui.editors.sql.
preferences.
format.BaseFormatterConfigurationPage
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
/**
/**
...
...
plugins/org.jkiss.dbeaver.ext.generic/META-INF/MANIFEST.MF
浏览文件 @
dd15372b
...
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.jkiss.dbeaver.ext.generic;singleton:=true
...
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.jkiss.dbeaver.ext.generic;singleton:=true
Bundle-Version: 2.3.96.qualifier
Bundle-Version: 2.3.96.qualifier
Bundle-Release-Date: 20190611
Bundle-Release-Date: 20190611
Require-Bundle: org.eclipse.core.runtime,
Require-Bundle: org.eclipse.core.runtime,
org.jkiss.dbeaver.model
org.jkiss.dbeaver.model;visibility:=reexport,
org.jkiss.dbeaver.model.sql;visibility:=reexport
Bundle-ActivationPolicy: lazy
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: JKISS
Bundle-Vendor: JKISS
...
...
plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANAMetaModel.java
浏览文件 @
dd15372b
...
@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
...
@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
java.sql.SQLException
;
import
java.sql.SQLException
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -113,7 +113,7 @@ public class HANAMetaModel extends GenericMetaModel
...
@@ -113,7 +113,7 @@ public class HANAMetaModel extends GenericMetaModel
}
}
if
(
ddl
.
length
()
>
0
)
{
if
(
ddl
.
length
()
>
0
)
{
// Format DDL
// Format DDL
return
SQLUtils
.
formatSQL
(
sourceObject
.
getDataSource
(),
ddl
.
toString
());
return
SQL
Format
Utils
.
formatSQL
(
sourceObject
.
getDataSource
(),
ddl
.
toString
());
}
}
}
}
}
}
...
...
plugins/org.jkiss.dbeaver.ext.hive/src/org/jkiss/dbeaver/ext/hive/model/HiveMetaModel.java
浏览文件 @
dd15372b
...
@@ -18,7 +18,6 @@ package org.jkiss.dbeaver.ext.hive.model;
...
@@ -18,7 +18,6 @@ package org.jkiss.dbeaver.ext.hive.model;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ext.generic.model.GenericDataSource
;
import
org.jkiss.dbeaver.ext.generic.model.GenericDataSource
;
import
org.jkiss.dbeaver.ext.generic.model.GenericProcedure
;
import
org.jkiss.dbeaver.ext.generic.model.GenericTable
;
import
org.jkiss.dbeaver.ext.generic.model.GenericTable
;
import
org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel
;
import
org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel
;
import
org.jkiss.dbeaver.model.DBPDataSourceContainer
;
import
org.jkiss.dbeaver.model.DBPDataSourceContainer
;
...
@@ -28,7 +27,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
...
@@ -28,7 +27,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
java.sql.SQLException
;
import
java.sql.SQLException
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -65,7 +64,7 @@ public class HiveMetaModel extends GenericMetaModel
...
@@ -65,7 +64,7 @@ public class HiveMetaModel extends GenericMetaModel
}
}
String
ddl
=
sql
.
toString
();
String
ddl
=
sql
.
toString
();
if
(
sourceObject
.
isView
())
{
if
(
sourceObject
.
isView
())
{
return
SQLUtils
.
formatSQL
(
sourceObject
.
getDataSource
(),
ddl
);
return
SQL
Format
Utils
.
formatSQL
(
sourceObject
.
getDataSource
(),
ddl
);
}
}
return
ddl
;
return
ddl
;
}
}
...
...
plugins/org.jkiss.dbeaver.ext.hsqldb/src/org/jkiss/dbeaver/ext/hsqldb/model/HSQLMetaModel.java
浏览文件 @
dd15372b
...
@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet;
...
@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSProcedureType
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSProcedureType
;
import
java.sql.SQLException
;
import
java.sql.SQLException
;
...
@@ -121,7 +121,7 @@ public class HSQLMetaModel extends GenericMetaModel
...
@@ -121,7 +121,7 @@ public class HSQLMetaModel extends GenericMetaModel
if
(
dbResult
.
nextRow
())
{
if
(
dbResult
.
nextRow
())
{
String
definition
=
dbResult
.
getString
(
1
);
String
definition
=
dbResult
.
getString
(
1
);
if
(
definition
!=
null
)
{
if
(
definition
!=
null
)
{
definition
=
SQLUtils
.
formatSQL
(
dataSource
,
definition
);
definition
=
SQL
Format
Utils
.
formatSQL
(
dataSource
,
definition
);
}
}
return
definition
;
return
definition
;
}
}
...
...
plugins/org.jkiss.dbeaver.ext.hsqldb/src/org/jkiss/dbeaver/ext/hsqldb/model/HSQLTrigger.java
浏览文件 @
dd15372b
...
@@ -22,7 +22,7 @@ import org.jkiss.dbeaver.ext.generic.model.GenericTrigger;
...
@@ -22,7 +22,7 @@ import org.jkiss.dbeaver.ext.generic.model.GenericTrigger;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
/**
/**
* HSQLTrigger
* HSQLTrigger
...
@@ -42,7 +42,7 @@ public class HSQLTrigger extends GenericTrigger {
...
@@ -42,7 +42,7 @@ public class HSQLTrigger extends GenericTrigger {
timing
=
JDBCUtils
.
safeGetString
(
dbResult
,
"ACTION_TIMING"
);
timing
=
JDBCUtils
.
safeGetString
(
dbResult
,
"ACTION_TIMING"
);
statement
=
JDBCUtils
.
safeGetString
(
dbResult
,
"ACTION_STATEMENT"
);
statement
=
JDBCUtils
.
safeGetString
(
dbResult
,
"ACTION_STATEMENT"
);
if
(
statement
!=
null
)
{
if
(
statement
!=
null
)
{
statement
=
SQLUtils
.
formatSQL
(
getDataSource
(),
statement
);
statement
=
SQL
Format
Utils
.
formatSQL
(
getDataSource
(),
statement
);
}
}
}
}
...
...
plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF
浏览文件 @
dd15372b
...
@@ -6,6 +6,7 @@ Bundle-Version: 2.1.95.qualifier
...
@@ -6,6 +6,7 @@ Bundle-Version: 2.1.95.qualifier
Bundle-Release-Date: 20190611
Bundle-Release-Date: 20190611
Require-Bundle: org.eclipse.core.runtime,
Require-Bundle: org.eclipse.core.runtime,
org.jkiss.dbeaver.model,
org.jkiss.dbeaver.model,
org.jkiss.dbeaver.model.sql,
org.jkiss.dbeaver.data.gis,
org.jkiss.dbeaver.data.gis,
com.google.gson
com.google.gson
Bundle-ActivationPolicy: lazy
Bundle-ActivationPolicy: lazy
...
...
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLView.java
浏览文件 @
dd15372b
...
@@ -34,7 +34,7 @@ import org.jkiss.dbeaver.model.meta.LazyProperty;
...
@@ -34,7 +34,7 @@ import org.jkiss.dbeaver.model.meta.LazyProperty;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.meta.PropertyGroup
;
import
org.jkiss.dbeaver.model.meta.PropertyGroup
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableConstraint
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableConstraint
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableForeignKey
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableForeignKey
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableIndex
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableIndex
;
...
@@ -220,7 +220,7 @@ public class MySQLView extends MySQLTableBase implements DBSView
...
@@ -220,7 +220,7 @@ public class MySQLView extends MySQLTableBase implements DBSView
}
}
}
}
additionalInfo
.
setDefinition
(
additionalInfo
.
setDefinition
(
SQLUtils
.
formatSQL
(
getDataSource
(),
definition
));
SQL
Format
Utils
.
formatSQL
(
getDataSource
(),
definition
));
}
}
}
}
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF
浏览文件 @
dd15372b
...
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.jkiss.dbeaver.ext.postgresql;singleton:=true
...
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.jkiss.dbeaver.ext.postgresql;singleton:=true
Bundle-Version: 2.1.83.qualifier
Bundle-Version: 2.1.83.qualifier
Bundle-Release-Date: 20190611
Bundle-Release-Date: 20190611
Require-Bundle: org.jkiss.dbeaver.model,
Require-Bundle: org.jkiss.dbeaver.model,
org.jkiss.dbeaver.model.sql,
org.jkiss.dbeaver.ext.generic,
org.jkiss.dbeaver.ext.generic,
org.jkiss.dbeaver.data.gis;visibility:=reexport,
org.jkiss.dbeaver.data.gis;visibility:=reexport,
org.jkiss.bundle.gis;visibility:=reexport,
org.jkiss.bundle.gis;visibility:=reexport,
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTrigger.java
浏览文件 @
dd15372b
...
@@ -33,6 +33,7 @@ import org.jkiss.dbeaver.model.meta.IPropertyValueTransformer;
...
@@ -33,6 +33,7 @@ import org.jkiss.dbeaver.model.meta.IPropertyValueTransformer;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.SQLUtils
;
import
org.jkiss.dbeaver.model.sql.SQLUtils
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatUtils
;
import
org.jkiss.dbeaver.model.struct.DBSActionTiming
;
import
org.jkiss.dbeaver.model.struct.DBSActionTiming
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSManipulationType
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSManipulationType
;
...
@@ -271,7 +272,7 @@ public class PostgreTrigger implements DBSTrigger, DBPQualifiedObject, PostgreOb
...
@@ -271,7 +272,7 @@ public class PostgreTrigger implements DBSTrigger, DBPQualifiedObject, PostgreOb
try
(
JDBCSession
session
=
DBUtils
.
openMetaSession
(
monitor
,
this
,
"Read trigger definition"
))
{
try
(
JDBCSession
session
=
DBUtils
.
openMetaSession
(
monitor
,
this
,
"Read trigger definition"
))
{
String
triggerSource
=
JDBCUtils
.
queryString
(
session
,
"SELECT pg_catalog.pg_get_triggerdef(?)"
,
objectId
);
String
triggerSource
=
JDBCUtils
.
queryString
(
session
,
"SELECT pg_catalog.pg_get_triggerdef(?)"
,
objectId
);
if
(
triggerSource
!=
null
)
{
if
(
triggerSource
!=
null
)
{
triggerSource
=
SQLUtils
.
formatSQL
(
getDataSource
(),
triggerSource
);
triggerSource
=
SQL
Format
Utils
.
formatSQL
(
getDataSource
(),
triggerSource
);
ddl
.
append
(
triggerSource
).
append
(
";"
);
ddl
.
append
(
triggerSource
).
append
(
";"
);
}
}
}
catch
(
SQLException
e
)
{
}
catch
(
SQLException
e
)
{
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/plan/PostgrePlanNodeBase.java
浏览文件 @
dd15372b
...
@@ -26,8 +26,9 @@ import org.jkiss.dbeaver.model.meta.Property;
...
@@ -26,8 +26,9 @@ import org.jkiss.dbeaver.model.meta.Property;
import
org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor
;
import
org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor
;
import
org.jkiss.dbeaver.model.preferences.DBPPropertySource
;
import
org.jkiss.dbeaver.model.preferences.DBPPropertySource
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.
SQL
Utils
;
import
org.jkiss.dbeaver.model.sql.
format.SQLFormat
Utils
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.util.*
;
import
java.util.*
;
/**
/**
...
@@ -159,7 +160,7 @@ public abstract class PostgrePlanNodeBase<NODE extends PostgrePlanNodeBase<?>> e
...
@@ -159,7 +160,7 @@ public abstract class PostgrePlanNodeBase<NODE extends PostgrePlanNodeBase<?>> e
cond
=
attributes
.
get
(
ATTR_FILTER
);
cond
=
attributes
.
get
(
ATTR_FILTER
);
}
}
if
(!
CommonUtils
.
isEmpty
(
cond
))
{
if
(!
CommonUtils
.
isEmpty
(
cond
))
{
cond
=
SQLUtils
.
formatSQL
(
dataSource
,
cond
);
cond
=
SQL
Format
Utils
.
formatSQL
(
dataSource
,
cond
);
}
}
return
cond
;
return
cond
;
}
}
...
...
plugins/org.jkiss.dbeaver.model.sql/META-INF/MANIFEST.MF
浏览文件 @
dd15372b
...
@@ -7,7 +7,11 @@ Bundle-Version: 1.0.0.qualifier
...
@@ -7,7 +7,11 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Release-Date: 20190611
Bundle-Release-Date: 20190611
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-ActivationPolicy: lazy
Export-Package: org.jkiss.dbeaver.model.sql
Export-Package: org.jkiss.dbeaver.model.sql,
org.jkiss.dbeaver.model.sql.format,
org.jkiss.dbeaver.model.sql.format.external,
org.jkiss.dbeaver.model.sql.format.tokenized,
org.jkiss.dbeaver.model.sql.registry
Bundle-ClassPath: .
Bundle-ClassPath: .
Require-Bundle: org.eclipse.equinox.security,
Require-Bundle: org.eclipse.equinox.security,
org.eclipse.core.runtime,
org.eclipse.core.runtime,
...
...
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle.properties
浏览文件 @
dd15372b
Bundle-Vendor
=
JKISS
Bundle-Vendor
=
JKISS
Bundle-Name
=
DBeaver SQL Model
Bundle-Name
=
DBeaver SQL Model
extension-point.org.jkiss.dbeaver.sqlFormatter.name
=
SQL formatters
sql.formatter.default.name
=
Default formatter
sql.formatter.default.tip
=
Default SQL formatter
sql.formatter.compact.name
=
Compact formatter
sql.formatter.compact.tip
=
Compact SQL formatter. Similar to default formatter but with more compact output
sql.formatter.external.name
=
External formatter
sql.formatter.external.tip
=
External formatter. Uses configurable command-line executable to format SQL queries
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_de.properties
0 → 100644
浏览文件 @
dd15372b
extension-point.org.jkiss.dbeaver.sqlCommand.name
=
SQL-Skriptbefehle
extension-point.org.jkiss.dbeaver.sqlFormatter.name
=
SQL-Formatierer
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_fr.properties
0 → 100644
浏览文件 @
dd15372b
extension-point.org.jkiss.dbeaver.sqlCommand.name
=
Commandes de scripts SQL
extension-point.org.jkiss.dbeaver.sqlFormatter.name
=
Formateurs SQL
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_ja.properties
0 → 100644
浏览文件 @
dd15372b
extension-point.org.jkiss.dbeaver.sqlCommand.name
=
SQL
\u
30B9
\u
30AF
\u
30EA
\u
30D7
\u
30C8
\u
30B3
\u
30DE
\u
30F3
\u
30C9
extension-point.org.jkiss.dbeaver.sqlFormatter.name
=
SQL
\u
30D5
\u
30A9
\u
30FC
\u
30DE
\u
30C3
\u
30BF
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_ko.properties
0 → 100644
浏览文件 @
dd15372b
extension-point.org.jkiss.dbeaver.sqlCommand.name
=
SQL
\u
C2A4
\u
D06C
\u
B9BD
\u
D2B8
\u
BA85
\u
B839
\u
C5B4
extension-point.org.jkiss.dbeaver.sqlFormatter.name
=
SQL
\u
D3EC
\u
B9F7
\u
D130
sql.formatter.default.name
=
\u
C11C
\u
C2DD
\u
AE30
\u
BCF8
\u
AC12
sql.formatter.default.tip
=
SQL
\u
C11C
\u
C2DD
\u
AE30
\u
BCF8
\u
AC12
sql.formatter.compact.name
=
Compact
\u
C11C
\u
C2DD
sql.formatter.compact.tip
=
Compact SQL
\u
C11C
\u
C2DD.
\u
AE30
\u
BCF8
\u
C11C
\u
C2DD
\u
ACFC
\u
C720
\u
C0AC
\u
D558
\u
C9C0
\u
B9CC
\u
B354 compact
\u
D558
\u
AC8C
sql.formatter.external.name
=
External formatter
sql.formatter.external.tip
=
External formatter. Uses configurable command-line executable to format SQL queries
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_ru.properties
0 → 100644
浏览文件 @
dd15372b
sql.formatter.default.name
=
\u0421\u0442\u0430\u
043D
\u0434\u0430\u0440\u0442\u
043D
\u
044B
\u0439
sql.formatter.default.tip
=
SQL
\u0444\u
043E
\u0440\u
043C
\u0430\u0442\u0438\u0440\u
043E
\u0432\u0430\u
043D
\u0438\u0435
\u
043F
\u
043E
\u0443\u
043C
\u
043E
\u
043B
\u0447\u0430\u
043D
\u0438\u
044E.
sql.formatter.compact.name
=
\u
041A
\u
043E
\u
043C
\u
043F
\u0430\u
043A
\u0442\u
043D
\u
044B
\u0439
sql.formatter.compact.tip
=
\u
041A
\u
043E
\u
043C
\u
043F
\u0430\u
043A
\u0442\u
043D
\u
043E
\u0435
\u0444\u
043E
\u0440\u
043C
\u0430\u0442\u0438\u0440\u
043E
\u0432\u0430\u
043D
\u0438\u0435
.
\u0410\u
043D
\u0430\u
043B
\u
043E
\u0433\u0438\u0447\u
043D
\u
043E
\u0441\u0442\u0430\u
043D
\u0434\u0430\u0440\u0442\u
043D
\u
043E
\u
043C
\u0443
,
\u
043D
\u
043E
\u0441
\u0431\u
043E
\u
043B
\u0435\u0435
\u
043A
\u
043E
\u
043C
\u
043F
\u0430\u
043A
\u0442\u
043D
\u
044B
\u
043C
\u0432\u
044B
\u0445\u
043E
\u0434\u
043E
\u
043C.
sql.formatter.external.name
=
\u0412\u
043D
\u0435\u0448\u
043D
\u0438\u0439
sql.formatter.external.tip
=
\u0412\u
043D
\u0435\u0448\u
043D
\u
044F
\u
044F
\u
043F
\u0440\u
043E
\u0433\u0440\u0430\u
043C
\u
043C
\u0430
.
\u0418\u0441\u
043F
\u
043E
\u
043B
\u
044C
\u0437\u0443\u0435\u0442
\u
043D
\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u
043C
\u
044B
\u0439
\u0438\u0441\u
043F
\u
043E
\u
043B
\u
043D
\u
044F
\u0435\u
043C
\u
044B
\u0439
\u0444\u0430\u0439\u
043B
\u
043A
\u
043E
\u
043C
\u0430\u
043D
\u0434\u
043D
\u
043E
\u0439
\u0441\u0442\u0440\u
043E
\u
043A
\u0438
\u0434\u
043B
\u
044F
\u0444\u
043E
\u0440\u
043C
\u0430\u0442\u0438\u0440\u
043E
\u0432\u0430\u
043D
\u0438\u
044F
\u0437\u0430\u
043F
\u0440\u
043E
\u0441\u
043E
\u0432
SQL.
plugins/org.jkiss.dbeaver.model.sql/OSGI-INF/l10n/bundle_zh.properties
0 → 100644
浏览文件 @
dd15372b
extension-point.org.jkiss.dbeaver.sqlCommand.name
=
SQL
\u
811A
\u
672C
\u
547D
\u
4EE4
extension-point.org.jkiss.dbeaver.sqlFormatter.name
=
SQL
\u
683C
\u
5F0F
\u5316
plugins/org.jkiss.dbeaver.model.sql/plugin.xml
浏览文件 @
dd15372b
...
@@ -2,5 +2,16 @@
...
@@ -2,5 +2,16 @@
<?eclipse version="3.2"?>
<?eclipse version="3.2"?>
<plugin>
<plugin>
<extension-point
id=
"org.jkiss.dbeaver.sqlFormatter"
name=
"%extension-point.org.jkiss.dbeaver.sqlFormatter.name"
schema=
"schema/org.jkiss.dbeaver.sqlFormatter.exsd"
/>
<extension
point=
"org.eclipse.core.runtime.preferences"
>
<initializer
class=
"org.jkiss.dbeaver.model.sql.internal.SQLModelPreferencesInitializer"
/>
</extension>
<extension
point=
"org.jkiss.dbeaver.sqlFormatter"
>
<formatter
id=
"default"
class=
"org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterTokenized"
label=
"%sql.formatter.default.name"
description=
"%sql.formatter.default.tip"
/>
<formatter
id=
"compact"
class=
"org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterCompact"
label=
"%sql.formatter.compact.name"
description=
"%sql.formatter.compact.tip"
/>
<formatter
id=
"external"
class=
"org.jkiss.dbeaver.model.sql.format.external.SQLFormatterExternal"
label=
"%sql.formatter.external.name"
description=
"%sql.formatter.external.tip"
/>
</extension>
</plugin>
</plugin>
plugins/org.jkiss.dbeaver.
ui.editors.sql/schema
/org.jkiss.dbeaver.sqlFormatter.exsd
→
plugins/org.jkiss.dbeaver.
model.sql/schemas
/org.jkiss.dbeaver.sqlFormatter.exsd
浏览文件 @
dd15372b
文件已移动
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLModelPreferences.java
0 → 100644
浏览文件 @
dd15372b
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.model.sql
;
/**
* Preferences constants
*/
public
final
class
SQLModelPreferences
{
public
final
static
String
SQL_FORMAT_FORMATTER
=
"sql.format.formatter"
;
}
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/SQLFormatUtils.java
0 → 100644
浏览文件 @
dd15372b
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.model.sql.format
;
import
org.jkiss.dbeaver.model.sql.SQLDataSource
;
import
org.jkiss.dbeaver.model.sql.SQLSyntaxManager
;
import
org.jkiss.dbeaver.model.sql.registry.SQLFormatterConfigurationRegistry
;
/**
* SQL Formatter
*/
public
class
SQLFormatUtils
{
public
static
String
formatSQL
(
SQLDataSource
dataSource
,
String
query
)
{
SQLSyntaxManager
syntaxManager
=
new
SQLSyntaxManager
();
syntaxManager
.
init
(
dataSource
.
getSQLDialect
(),
dataSource
.
getContainer
().
getPreferenceStore
());
SQLFormatterConfiguration
configuration
=
new
SQLFormatterConfiguration
(
dataSource
,
syntaxManager
);
SQLFormatter
formatter
=
SQLFormatterConfigurationRegistry
.
getInstance
().
createFormatter
(
configuration
);
if
(
formatter
==
null
)
{
return
query
;
}
return
formatter
.
format
(
query
,
configuration
);
}
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/SQLFormatter.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/SQLFormatter.java
浏览文件 @
dd15372b
文件已移动
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/SQLFormatterConfiguration.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/SQLFormatterConfiguration.java
浏览文件 @
dd15372b
...
@@ -18,11 +18,10 @@
...
@@ -18,11 +18,10 @@
package
org.jkiss.dbeaver.model.sql.format
;
package
org.jkiss.dbeaver.model.sql.format
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.ModelPreferences
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.DBPIdentifierCase
;
import
org.jkiss.dbeaver.model.DBPIdentifierCase
;
import
org.jkiss.dbeaver.model.DBPKeywordType
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.sql.SQLModelPreferences
;
import
org.jkiss.dbeaver.model.sql.SQLSyntaxManager
;
import
org.jkiss.dbeaver.model.sql.SQLSyntaxManager
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
...
@@ -52,7 +51,7 @@ public class SQLFormatterConfiguration {
...
@@ -52,7 +51,7 @@ public class SQLFormatterConfiguration {
* Create formatter config with default (set in properties) formatter
* Create formatter config with default (set in properties) formatter
*/
*/
public
SQLFormatterConfiguration
(
DBPDataSource
dataSource
,
SQLSyntaxManager
syntaxManager
)
{
public
SQLFormatterConfiguration
(
DBPDataSource
dataSource
,
SQLSyntaxManager
syntaxManager
)
{
this
(
dataSource
,
syntaxManager
,
CommonUtils
.
notEmpty
(
syntaxManager
.
getPreferenceStore
().
getString
(
ModelPreferences
.
SQL_FORMAT_FORMATTER
)).
toUpperCase
(
Locale
.
ENGLISH
));
this
(
dataSource
,
syntaxManager
,
CommonUtils
.
notEmpty
(
syntaxManager
.
getPreferenceStore
().
getString
(
SQLModelPreferences
.
SQL_FORMAT_FORMATTER
)).
toUpperCase
(
Locale
.
ENGLISH
));
}
}
public
SQLFormatterConfiguration
(
DBPDataSource
dataSource
,
SQLSyntaxManager
syntaxManager
,
String
formatterId
)
{
public
SQLFormatterConfiguration
(
DBPDataSource
dataSource
,
SQLSyntaxManager
syntaxManager
,
String
formatterId
)
{
...
@@ -78,7 +77,7 @@ public class SQLFormatterConfiguration {
...
@@ -78,7 +77,7 @@ public class SQLFormatterConfiguration {
public
void
setFormatterId
(
String
formatterId
)
{
public
void
setFormatterId
(
String
formatterId
)
{
this
.
formatterId
=
formatterId
;
this
.
formatterId
=
formatterId
;
syntaxManager
.
getPreferenceStore
().
setValue
(
syntaxManager
.
getPreferenceStore
().
setValue
(
ModelPreferences
.
SQL_FORMAT_FORMATTER
,
formatterId
.
toUpperCase
(
Locale
.
ENGLISH
));
SQLModelPreferences
.
SQL_FORMAT_FORMATTER
,
formatterId
.
toUpperCase
(
Locale
.
ENGLISH
));
}
}
public
String
getIndentString
()
{
public
String
getIndentString
()
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/SQLFormatterRegistry.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/SQLFormatterRegistry.java
浏览文件 @
dd15372b
文件已移动
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/external/SQLFormatterExternal.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/external/SQLFormatterExternal.java
浏览文件 @
dd15372b
文件已移动
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/FormatterToken.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/tokenized/FormatterToken.java
浏览文件 @
dd15372b
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/IndentFormatter.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/tokenized/IndentFormatter.java
浏览文件 @
dd15372b
文件已移动
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterCompact.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterCompact.java
浏览文件 @
dd15372b
文件已移动
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
浏览文件 @
dd15372b
文件已移动
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLTokensParser.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLTokensParser.java
浏览文件 @
dd15372b
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/TokenType.java
→
plugins/org.jkiss.dbeaver.model
.sql
/src/org/jkiss/dbeaver/model/sql/format/tokenized/TokenType.java
浏览文件 @
dd15372b
文件已移动
plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/internal/SQLModelPreferencesInitializer.java
0 → 100644
浏览文件 @
dd15372b
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.model.sql.internal
;
import
org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer
;
import
org.jkiss.dbeaver.ModelPreferences
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.sql.SQLModelPreferences
;
import
org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterTokenized
;
import
org.jkiss.dbeaver.utils.PrefUtils
;
public
class
SQLModelPreferencesInitializer
extends
AbstractPreferenceInitializer
{
public
SQLModelPreferencesInitializer
()
{
}
@Override
public
void
initializeDefaultPreferences
()
{
// Init default preferences
DBPPreferenceStore
store
=
ModelPreferences
.
getPreferences
();
// Common
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQLModelPreferences
.
SQL_FORMAT_FORMATTER
,
SQLFormatterTokenized
.
FORMATTER_ID
);
}
}
plugins/org.jkiss.dbeaver.
ui.editors.sql/src/org/jkiss/dbeaver/ui/editors
/sql/registry/SQLFormatterConfigurationRegistry.java
→
plugins/org.jkiss.dbeaver.
model.sql/src/org/jkiss/dbeaver/model
/sql/registry/SQLFormatterConfigurationRegistry.java
浏览文件 @
dd15372b
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
*/
package
org.jkiss.dbeaver.
ui.editors
.sql.registry
;
package
org.jkiss.dbeaver.
model
.sql.registry
;
import
org.eclipse.core.runtime.IConfigurationElement
;
import
org.eclipse.core.runtime.IConfigurationElement
;
import
org.eclipse.core.runtime.IExtensionRegistry
;
import
org.eclipse.core.runtime.IExtensionRegistry
;
...
@@ -99,20 +99,4 @@ public class SQLFormatterConfigurationRegistry implements SQLFormatterRegistry
...
@@ -99,20 +99,4 @@ public class SQLFormatterConfigurationRegistry implements SQLFormatterRegistry
}
}
}
}
@Nullable
public
SQLFormatterConfigurator
createConfigurator
(
SQLFormatterConfiguration
configuration
)
{
final
String
formatterId
=
configuration
.
getFormatterId
();
SQLFormatterDescriptor
formatterDesc
=
getFormatter
(
formatterId
);
if
(
formatterDesc
==
null
)
{
log
.
error
(
"Formatter '"
+
formatterId
+
"' not found"
);
return
null
;
}
try
{
return
formatterDesc
.
createConfigurer
();
}
catch
(
DBException
e
)
{
log
.
error
(
"Error creating and configuring formatter"
,
e
);
return
null
;
}
}
}
}
plugins/org.jkiss.dbeaver.
ui.editors.sql/src/org/jkiss/dbeaver/ui/editors
/sql/registry/SQLFormatterDescriptor.java
→
plugins/org.jkiss.dbeaver.
model.sql/src/org/jkiss/dbeaver/model
/sql/registry/SQLFormatterDescriptor.java
浏览文件 @
dd15372b
...
@@ -15,16 +15,14 @@
...
@@ -15,16 +15,14 @@
* limitations under the License.
* limitations under the License.
*/
*/
package
org.jkiss.dbeaver.
ui.editors
.sql.registry
;
package
org.jkiss.dbeaver.
model
.sql.registry
;
import
org.eclipse.core.runtime.IConfigurationElement
;
import
org.eclipse.core.runtime.IConfigurationElement
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.impl.AbstractContextDescriptor
;
import
org.jkiss.dbeaver.model.impl.AbstractDescriptor
;
import
org.jkiss.dbeaver.model.impl.AbstractDescriptor
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatter
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatter
;
import
org.jkiss.dbeaver.model.impl.AbstractContextDescriptor
;
import
org.jkiss.utils.CommonUtils
;
/**
/**
* SQLFormatterDescriptor
* SQLFormatterDescriptor
...
@@ -37,8 +35,6 @@ public class SQLFormatterDescriptor extends AbstractContextDescriptor {
...
@@ -37,8 +35,6 @@ public class SQLFormatterDescriptor extends AbstractContextDescriptor {
private
final
String
label
;
private
final
String
label
;
private
final
String
description
;
private
final
String
description
;
private
final
AbstractDescriptor
.
ObjectType
formatterImplClass
;
private
final
AbstractDescriptor
.
ObjectType
formatterImplClass
;
private
final
AbstractDescriptor
.
ObjectType
configurerImplClass
;
public
SQLFormatterDescriptor
(
IConfigurationElement
config
)
{
public
SQLFormatterDescriptor
(
IConfigurationElement
config
)
{
super
(
config
);
super
(
config
);
...
@@ -46,11 +42,6 @@ public class SQLFormatterDescriptor extends AbstractContextDescriptor {
...
@@ -46,11 +42,6 @@ public class SQLFormatterDescriptor extends AbstractContextDescriptor {
this
.
label
=
config
.
getAttribute
(
"label"
);
this
.
label
=
config
.
getAttribute
(
"label"
);
this
.
description
=
config
.
getAttribute
(
"description"
);
this
.
description
=
config
.
getAttribute
(
"description"
);
this
.
formatterImplClass
=
new
AbstractDescriptor
.
ObjectType
(
config
.
getAttribute
(
"class"
));
this
.
formatterImplClass
=
new
AbstractDescriptor
.
ObjectType
(
config
.
getAttribute
(
"class"
));
if
(!
CommonUtils
.
isEmpty
(
config
.
getAttribute
(
"configurerClass"
)))
{
this
.
configurerImplClass
=
new
AbstractDescriptor
.
ObjectType
(
config
.
getAttribute
(
"configurerClass"
));
}
else
{
this
.
configurerImplClass
=
null
;
}
}
}
public
String
getId
()
{
public
String
getId
()
{
...
@@ -71,13 +62,4 @@ public class SQLFormatterDescriptor extends AbstractContextDescriptor {
...
@@ -71,13 +62,4 @@ public class SQLFormatterDescriptor extends AbstractContextDescriptor {
return
formatterImplClass
.
createInstance
(
SQLFormatter
.
class
);
return
formatterImplClass
.
createInstance
(
SQLFormatter
.
class
);
}
}
@Nullable
public
SQLFormatterConfigurator
createConfigurer
()
throws
DBException
{
if
(
configurerImplClass
==
null
)
{
return
null
;
}
return
configurerImplClass
.
createInstance
(
SQLFormatterConfigurator
.
class
);
}
}
}
plugins/org.jkiss.dbeaver.model/tests/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenizedTest.java
→
plugins/org.jkiss.dbeaver.model
.sql
/tests/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenizedTest.java
浏览文件 @
dd15372b
文件已移动
plugins/org.jkiss.dbeaver.model/META-INF/MANIFEST.MF
浏览文件 @
dd15372b
...
@@ -59,9 +59,6 @@ Export-Package: org.jkiss.dbeaver,
...
@@ -59,9 +59,6 @@ Export-Package: org.jkiss.dbeaver,
org.jkiss.dbeaver.model.runtime.load,
org.jkiss.dbeaver.model.runtime.load,
org.jkiss.dbeaver.model.sql,
org.jkiss.dbeaver.model.sql,
org.jkiss.dbeaver.model.sql.eval,
org.jkiss.dbeaver.model.sql.eval,
org.jkiss.dbeaver.model.sql.format,
org.jkiss.dbeaver.model.sql.format.external,
org.jkiss.dbeaver.model.sql.format.tokenized,
org.jkiss.dbeaver.model.sql.parser,
org.jkiss.dbeaver.model.sql.parser,
org.jkiss.dbeaver.model.struct,
org.jkiss.dbeaver.model.struct,
org.jkiss.dbeaver.model.struct.rdb,
org.jkiss.dbeaver.model.struct.rdb,
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/ModelPreferences.java
浏览文件 @
dd15372b
...
@@ -25,7 +25,6 @@ import org.jkiss.dbeaver.model.impl.preferences.BundlePreferenceStore;
...
@@ -25,7 +25,6 @@ import org.jkiss.dbeaver.model.impl.preferences.BundlePreferenceStore;
import
org.jkiss.dbeaver.model.qm.QMConstants
;
import
org.jkiss.dbeaver.model.qm.QMConstants
;
import
org.jkiss.dbeaver.model.qm.QMObjectType
;
import
org.jkiss.dbeaver.model.qm.QMObjectType
;
import
org.jkiss.dbeaver.model.sql.SQLConstants
;
import
org.jkiss.dbeaver.model.sql.SQLConstants
;
import
org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterTokenized
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.dbeaver.utils.PrefUtils
;
import
org.jkiss.dbeaver.utils.PrefUtils
;
import
org.osgi.framework.Bundle
;
import
org.osgi.framework.Bundle
;
...
@@ -96,7 +95,6 @@ public final class ModelPreferences
...
@@ -96,7 +95,6 @@ public final class ModelPreferences
public
static
final
String
SQL_VARIABLES_ENABLED
=
"sql.variables.enabled"
;
//$NON-NLS-1$
public
static
final
String
SQL_VARIABLES_ENABLED
=
"sql.variables.enabled"
;
//$NON-NLS-1$
public
static
final
String
SQL_FILTER_FORCE_SUBSELECT
=
"sql.query.filter.force.subselect"
;
//$NON-NLS-1$
public
static
final
String
SQL_FILTER_FORCE_SUBSELECT
=
"sql.query.filter.force.subselect"
;
//$NON-NLS-1$
public
final
static
String
SQL_FORMAT_FORMATTER
=
"sql.format.formatter"
;
public
final
static
String
SQL_FORMAT_KEYWORD_CASE
=
"sql.format.keywordCase"
;
public
final
static
String
SQL_FORMAT_KEYWORD_CASE
=
"sql.format.keywordCase"
;
public
final
static
String
SQL_FORMAT_EXTERNAL_CMD
=
"sql.format.external.cmd"
;
public
final
static
String
SQL_FORMAT_EXTERNAL_CMD
=
"sql.format.external.cmd"
;
public
final
static
String
SQL_FORMAT_EXTERNAL_FILE
=
"sql.format.external.file"
;
public
final
static
String
SQL_FORMAT_EXTERNAL_FILE
=
"sql.format.external.file"
;
...
@@ -212,7 +210,6 @@ public final class ModelPreferences
...
@@ -212,7 +210,6 @@ public final class ModelPreferences
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_VARIABLES_ENABLED
,
true
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_VARIABLES_ENABLED
,
true
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_FILTER_FORCE_SUBSELECT
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_FILTER_FORCE_SUBSELECT
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_FORMAT_FORMATTER
,
SQLFormatterTokenized
.
FORMATTER_ID
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_FORMAT_KEYWORD_CASE
,
""
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_FORMAT_KEYWORD_CASE
,
""
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_FORMAT_LF_BEFORE_COMMA
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_FORMAT_LF_BEFORE_COMMA
,
false
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_FORMAT_EXTERNAL_CMD
,
""
);
PrefUtils
.
setDefaultPreferenceValue
(
store
,
SQL_FORMAT_EXTERNAL_CMD
,
""
);
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/app/DBPPlatform.java
浏览文件 @
dd15372b
...
@@ -28,7 +28,6 @@ import org.jkiss.dbeaver.model.navigator.DBNModel;
...
@@ -28,7 +28,6 @@ import org.jkiss.dbeaver.model.navigator.DBNModel;
import
org.jkiss.dbeaver.model.qm.QMController
;
import
org.jkiss.dbeaver.model.qm.QMController
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.OSDescriptor
;
import
org.jkiss.dbeaver.model.runtime.OSDescriptor
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatterRegistry
;
import
java.io.File
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.IOException
;
...
@@ -78,9 +77,6 @@ public interface DBPPlatform
...
@@ -78,9 +77,6 @@ public interface DBPPlatform
@NotNull
@NotNull
DBPDataFormatterRegistry
getDataFormatterRegistry
();
DBPDataFormatterRegistry
getDataFormatterRegistry
();
@NotNull
SQLFormatterRegistry
getSQLFormatterRegistry
();
@NotNull
@NotNull
DBPPreferenceStore
getPreferenceStore
();
DBPPreferenceStore
getPreferenceStore
();
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
浏览文件 @
dd15372b
...
@@ -30,8 +30,6 @@ import org.jkiss.dbeaver.model.exec.DBCSession;
...
@@ -30,8 +30,6 @@ import org.jkiss.dbeaver.model.exec.DBCSession;
import
org.jkiss.dbeaver.model.impl.sql.BasicSQLDialect
;
import
org.jkiss.dbeaver.model.impl.sql.BasicSQLDialect
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatter
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatterConfiguration
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableForeignKey
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableForeignKey
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableForeignKeyColumn
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSTableForeignKeyColumn
;
...
@@ -295,18 +293,6 @@ public final class SQLUtils {
...
@@ -295,18 +293,6 @@ public final class SQLUtils {
return
result
.
toString
();
return
result
.
toString
();
}
}
public
static
String
formatSQL
(
SQLDataSource
dataSource
,
String
query
)
{
SQLSyntaxManager
syntaxManager
=
new
SQLSyntaxManager
();
syntaxManager
.
init
(
dataSource
.
getSQLDialect
(),
dataSource
.
getContainer
().
getPreferenceStore
());
SQLFormatterConfiguration
configuration
=
new
SQLFormatterConfiguration
(
dataSource
,
syntaxManager
);
SQLFormatter
formatter
=
dataSource
.
getDataSource
().
getContainer
().
getPlatform
().
getSQLFormatterRegistry
().
createFormatter
(
configuration
);
if
(
formatter
==
null
)
{
return
query
;
}
return
formatter
.
format
(
query
,
configuration
);
}
public
static
void
appendLikeCondition
(
StringBuilder
sql
,
String
value
,
boolean
not
)
public
static
void
appendLikeCondition
(
StringBuilder
sql
,
String
value
,
boolean
not
)
{
{
value
=
makeSQLLike
(
value
);
value
=
makeSQLLike
(
value
);
...
...
plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java
浏览文件 @
dd15372b
...
@@ -269,6 +269,11 @@ public class SSHTunnelConfiguratorUI implements IObjectPropertyConfigurator<DBWH
...
@@ -269,6 +269,11 @@ public class SSHTunnelConfiguratorUI implements IObjectPropertyConfigurator<DBWH
properties
.
put
(
SSHConstants
.
PROP_CONNECT_TIMEOUT
,
tunnelTimeout
.
getText
());
properties
.
put
(
SSHConstants
.
PROP_CONNECT_TIMEOUT
,
tunnelTimeout
.
getText
());
}
}
@Override
public
void
resetSettings
(
DBWHandlerConfiguration
configuration
)
{
}
private
void
updatePrivateKeyVisibility
()
private
void
updatePrivateKeyVisibility
()
{
{
boolean
isPassword
=
authMethodCombo
.
getSelectionIndex
()
==
0
;
boolean
isPassword
=
authMethodCombo
.
getSelectionIndex
()
==
0
;
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/META-INF/MANIFEST.MF
浏览文件 @
dd15372b
...
@@ -31,13 +31,13 @@ Export-Package: org.jkiss.dbeaver.runtime.sql,
...
@@ -31,13 +31,13 @@ Export-Package: org.jkiss.dbeaver.runtime.sql,
org.jkiss.dbeaver.ui.editors.sql,
org.jkiss.dbeaver.ui.editors.sql,
org.jkiss.dbeaver.ui.editors.sql.convert,
org.jkiss.dbeaver.ui.editors.sql.convert,
org.jkiss.dbeaver.ui.editors.sql.dialogs,
org.jkiss.dbeaver.ui.editors.sql.dialogs,
org.jkiss.dbeaver.ui.editors.sql.format,
org.jkiss.dbeaver.ui.editors.sql.generator,
org.jkiss.dbeaver.ui.editors.sql.generator,
org.jkiss.dbeaver.ui.editors.sql.handlers,
org.jkiss.dbeaver.ui.editors.sql.handlers,
org.jkiss.dbeaver.ui.editors.sql.indent,
org.jkiss.dbeaver.ui.editors.sql.indent,
org.jkiss.dbeaver.ui.editors.sql.internal,
org.jkiss.dbeaver.ui.editors.sql.internal,
org.jkiss.dbeaver.ui.editors.sql.log,
org.jkiss.dbeaver.ui.editors.sql.log,
org.jkiss.dbeaver.ui.editors.sql.preferences,
org.jkiss.dbeaver.ui.editors.sql.preferences,
org.jkiss.dbeaver.ui.editors.sql.preferences.format,
org.jkiss.dbeaver.ui.editors.sql.registry,
org.jkiss.dbeaver.ui.editors.sql.registry,
org.jkiss.dbeaver.ui.editors.sql.scripts,
org.jkiss.dbeaver.ui.editors.sql.scripts,
org.jkiss.dbeaver.ui.editors.sql.syntax,
org.jkiss.dbeaver.ui.editors.sql.syntax,
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties
浏览文件 @
dd15372b
...
@@ -2,7 +2,6 @@ Bundle-Vendor = DBeaver Corp
...
@@ -2,7 +2,6 @@ Bundle-Vendor = DBeaver Corp
Bundle-Name
=
DBeaver UI Editors - SQL
Bundle-Name
=
DBeaver UI Editors - SQL
extension-point.org.jkiss.dbeaver.sqlCommand.name
=
SQL script commands
extension-point.org.jkiss.dbeaver.sqlCommand.name
=
SQL script commands
extension-point.org.jkiss.dbeaver.sqlFormatter.name
=
SQL formatters
extension-point.org.jkiss.dbeaver.sql.covertname
=
SQL text conversions
extension-point.org.jkiss.dbeaver.sql.covertname
=
SQL text conversions
content-type.org.jkiss.dbeaver.sql.name
=
SQL Script
content-type.org.jkiss.dbeaver.sql.name
=
SQL Script
...
@@ -30,12 +29,6 @@ sql.convert.label.keep.formatting.discription = Keeps original formatting (white
...
@@ -30,12 +29,6 @@ sql.convert.label.keep.formatting.discription = Keeps original formatting (white
sql.convert.label.line.delimiter.name
=
Line delimiter
sql.convert.label.line.delimiter.name
=
Line delimiter
sql.convert.label.line.delimiter.discription
=
Delimiter for source code lines. Usually
\\
n or space
sql.convert.label.line.delimiter.discription
=
Delimiter for source code lines. Usually
\\
n or space
sql.convert.label.line.delimiter.delphi.discription
=
Delimiter for source code lines. Usually #13#10 or space
sql.convert.label.line.delimiter.delphi.discription
=
Delimiter for source code lines. Usually #13#10 or space
sql.formatter.default.name
=
Default formatter
sql.formatter.default.tip
=
Default SQL formatter
sql.formatter.compact.name
=
Compact formatter
sql.formatter.compact.tip
=
Compact SQL formatter. Similar to default formatter but with more compact output
sql.formatter.external.name
=
External formatter
sql.formatter.external.tip
=
External formatter. Uses configurable command-line executable to format SQL queries
sql.plan.view.simple.name
=
Simple
sql.plan.view.simple.name
=
Simple
sql.plan.view.simple.tip
=
Simple execution plan presentation
sql.plan.view.simple.tip
=
Simple execution plan presentation
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
浏览文件 @
dd15372b
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
<extension-point
id=
"org.jkiss.dbeaver.sql.covert"
name=
"%extension-point.org.jkiss.dbeaver.sql.covertname"
schema=
"schema/org.jkiss.dbeaver.sql.convert.exsd"
/>
<extension-point
id=
"org.jkiss.dbeaver.sql.covert"
name=
"%extension-point.org.jkiss.dbeaver.sql.covertname"
schema=
"schema/org.jkiss.dbeaver.sql.convert.exsd"
/>
<extension-point
id=
"org.jkiss.dbeaver.sqlCommand"
name=
"%extension-point.org.jkiss.dbeaver.sqlCommand.name"
schema=
"schema/org.jkiss.dbeaver.sqlCommand.exsd"
/>
<extension-point
id=
"org.jkiss.dbeaver.sqlCommand"
name=
"%extension-point.org.jkiss.dbeaver.sqlCommand.name"
schema=
"schema/org.jkiss.dbeaver.sqlCommand.exsd"
/>
<extension-point
id=
"org.jkiss.dbeaver.sqlPresentation"
name=
"%extension-point.org.jkiss.dbeaver.sqlCommand.name"
schema=
"schema/org.jkiss.dbeaver.sqlPresentation.exsd"
/>
<extension-point
id=
"org.jkiss.dbeaver.sqlPresentation"
name=
"%extension-point.org.jkiss.dbeaver.sqlCommand.name"
schema=
"schema/org.jkiss.dbeaver.sqlPresentation.exsd"
/>
<extension-point
id=
"org.jkiss.dbeaver.sqlFormatter"
name=
"%extension-point.org.jkiss.dbeaver.sqlFormatter.name"
schema=
"schema/org.jkiss.dbeaver.sqlFormatter.exsd"
/>
<extension-point
id=
"org.jkiss.dbeaver.sql.plan.view"
name=
"%extension-point.org.jkiss.dbeaver.sqlPlanView.name"
schema=
"schema/org.jkiss.dbeaver.sqlPlanView.exsd"
/>
<extension-point
id=
"org.jkiss.dbeaver.sql.plan.view"
name=
"%extension-point.org.jkiss.dbeaver.sqlPlanView.name"
schema=
"schema/org.jkiss.dbeaver.sqlPlanView.exsd"
/>
<extension
point=
"org.eclipse.core.runtime.preferences"
>
<extension
point=
"org.eclipse.core.runtime.preferences"
>
...
@@ -39,12 +38,6 @@
...
@@ -39,12 +38,6 @@
-->
-->
</extension>
</extension>
<extension
point=
"org.jkiss.dbeaver.sqlFormatter"
>
<formatter
id=
"default"
class=
"org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterTokenized"
configurerClass=
"org.jkiss.dbeaver.ui.editors.sql.format.tokenized.SQLTokenizedFormatterConfigurationPage"
label=
"%sql.formatter.default.name"
description=
"%sql.formatter.default.tip"
/>
<formatter
id=
"compact"
class=
"org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterCompact"
configurerClass=
"org.jkiss.dbeaver.ui.editors.sql.format.tokenized.SQLTokenizedFormatterConfigurationPage"
label=
"%sql.formatter.compact.name"
description=
"%sql.formatter.compact.tip"
/>
<formatter
id=
"external"
class=
"org.jkiss.dbeaver.model.sql.format.external.SQLFormatterExternal"
configurerClass=
"org.jkiss.dbeaver.ui.editors.sql.format.SQLExternalFormatterConfigurationPage"
label=
"%sql.formatter.external.name"
description=
"%sql.formatter.external.tip"
/>
</extension>
<extension
point=
"org.jkiss.dbeaver.sqlCommand"
>
<extension
point=
"org.jkiss.dbeaver.sqlCommand"
>
<command
id=
"set"
class=
"org.jkiss.dbeaver.runtime.sql.commands.SQLCommandSet"
label=
"Set"
description=
"Sets variable/parameter value"
/>
<command
id=
"set"
class=
"org.jkiss.dbeaver.runtime.sql.commands.SQLCommandSet"
label=
"Set"
description=
"Sets variable/parameter value"
/>
<command
id=
"echo"
class=
"org.jkiss.dbeaver.runtime.sql.commands.SQLCommandEcho"
label=
"Echo"
description=
"Prints string to Output log"
/>
<command
id=
"echo"
class=
"org.jkiss.dbeaver.runtime.sql.commands.SQLCommandEcho"
label=
"Echo"
description=
"Prints string to Output log"
/>
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/preferences/PrefPageSQLFormat.java
浏览文件 @
dd15372b
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
*/
*/
package
org.jkiss.dbeaver.ui.editors.sql.preferences
;
package
org.jkiss.dbeaver.ui.editors.sql.preferences
;
import
org.eclipse.jface.dialogs.IDialogPage
;
import
org.eclipse.jface.text.source.ISourceViewer
;
import
org.eclipse.jface.text.source.ISourceViewer
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.custom.StyledText
;
import
org.eclipse.swt.custom.StyledText
;
...
@@ -31,21 +32,26 @@ import org.eclipse.swt.widgets.Control;
...
@@ -31,21 +32,26 @@ import org.eclipse.swt.widgets.Control;
import
org.eclipse.ui.IEditorSite
;
import
org.eclipse.ui.IEditorSite
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.ModelPreferences
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.DBPDataSource
;
import
org.jkiss.dbeaver.model.DBPDataSourceContainer
;
import
org.jkiss.dbeaver.model.DBPDataSourceContainer
;
import
org.jkiss.dbeaver.model.DBPIdentifierCase
;
import
org.jkiss.dbeaver.model.DBPIdentifierCase
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionContext
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionContext
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.sql.SQLModelPreferences
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatter
;
import
org.jkiss.dbeaver.model.sql.format.external.SQLFormatterExternal
;
import
org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterTokenized
;
import
org.jkiss.dbeaver.model.sql.registry.SQLFormatterConfigurationRegistry
;
import
org.jkiss.dbeaver.model.sql.registry.SQLFormatterDescriptor
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.editors.StringEditorInput
;
import
org.jkiss.dbeaver.ui.editors.StringEditorInput
;
import
org.jkiss.dbeaver.ui.editors.SubEditorSite
;
import
org.jkiss.dbeaver.ui.editors.SubEditorSite
;
import
org.jkiss.dbeaver.ui.editors.sql.SQLEditorBase
;
import
org.jkiss.dbeaver.ui.editors.sql.SQLEditorBase
;
import
org.jkiss.dbeaver.ui.editors.sql.SQLPreferenceConstants
;
import
org.jkiss.dbeaver.ui.editors.sql.SQLPreferenceConstants
;
import
org.jkiss.dbeaver.ui.editors.sql.preferences.format.SQLExternalFormatterConfigurationPage
;
import
org.jkiss.dbeaver.ui.editors.sql.preferences.format.SQLFormatterConfigurator
;
import
org.jkiss.dbeaver.ui.editors.sql.preferences.format.tokenized.SQLTokenizedFormatterConfigurationPage
;
import
org.jkiss.dbeaver.ui.editors.sql.internal.SQLEditorMessages
;
import
org.jkiss.dbeaver.ui.editors.sql.internal.SQLEditorMessages
;
import
org.jkiss.dbeaver.ui.editors.sql.registry.SQLFormatterConfigurationRegistry
;
import
org.jkiss.dbeaver.ui.editors.sql.registry.SQLFormatterConfigurator
;
import
org.jkiss.dbeaver.ui.editors.sql.registry.SQLFormatterDescriptor
;
import
org.jkiss.dbeaver.ui.preferences.TargetPrefPage
;
import
org.jkiss.dbeaver.ui.preferences.TargetPrefPage
;
import
org.jkiss.dbeaver.utils.ContentUtils
;
import
org.jkiss.dbeaver.utils.ContentUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
...
@@ -91,7 +97,7 @@ public class PrefPageSQLFormat extends TargetPrefPage
...
@@ -91,7 +97,7 @@ public class PrefPageSQLFormat extends TargetPrefPage
return
return
store
.
contains
(
SQLPreferenceConstants
.
SQL_FORMAT_BOLD_KEYWORDS
)
||
store
.
contains
(
SQLPreferenceConstants
.
SQL_FORMAT_BOLD_KEYWORDS
)
||
store
.
contains
(
ModelPreferences
.
SQL_FORMAT_FORMATTER
);
store
.
contains
(
SQL
ModelPreferences
.
SQL_FORMAT_FORMATTER
);
}
}
@Override
@Override
...
@@ -221,7 +227,7 @@ public class PrefPageSQLFormat extends TargetPrefPage
...
@@ -221,7 +227,7 @@ public class PrefPageSQLFormat extends TargetPrefPage
{
{
styleBoldKeywords
.
setSelection
(
store
.
getBoolean
(
SQLPreferenceConstants
.
SQL_FORMAT_BOLD_KEYWORDS
));
styleBoldKeywords
.
setSelection
(
store
.
getBoolean
(
SQLPreferenceConstants
.
SQL_FORMAT_BOLD_KEYWORDS
));
String
formatterId
=
store
.
getString
(
ModelPreferences
.
SQL_FORMAT_FORMATTER
);
String
formatterId
=
store
.
getString
(
SQL
ModelPreferences
.
SQL_FORMAT_FORMATTER
);
for
(
int
i
=
0
;
i
<
formatters
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
formatters
.
size
();
i
++)
{
if
(
formatters
.
get
(
i
).
getId
().
equalsIgnoreCase
(
formatterId
))
{
if
(
formatters
.
get
(
i
).
getId
().
equalsIgnoreCase
(
formatterId
))
{
formatterSelector
.
select
(
i
);
formatterSelector
.
select
(
i
);
...
@@ -242,7 +248,7 @@ public class PrefPageSQLFormat extends TargetPrefPage
...
@@ -242,7 +248,7 @@ public class PrefPageSQLFormat extends TargetPrefPage
}
}
store
.
setValue
(
SQLPreferenceConstants
.
SQL_FORMAT_BOLD_KEYWORDS
,
styleBoldKeywords
.
getSelection
());
store
.
setValue
(
SQLPreferenceConstants
.
SQL_FORMAT_BOLD_KEYWORDS
,
styleBoldKeywords
.
getSelection
());
store
.
setValue
(
ModelPreferences
.
SQL_FORMAT_FORMATTER
,
store
.
setValue
(
SQL
ModelPreferences
.
SQL_FORMAT_FORMATTER
,
formatters
.
get
(
formatterSelector
.
getSelectionIndex
()).
getId
().
toUpperCase
(
Locale
.
ENGLISH
));
formatters
.
get
(
formatterSelector
.
getSelectionIndex
()).
getId
().
toUpperCase
(
Locale
.
ENGLISH
));
PrefUtils
.
savePreferenceStore
(
store
);
PrefUtils
.
savePreferenceStore
(
store
);
...
@@ -253,7 +259,7 @@ public class PrefPageSQLFormat extends TargetPrefPage
...
@@ -253,7 +259,7 @@ public class PrefPageSQLFormat extends TargetPrefPage
{
{
store
.
setToDefault
(
SQLPreferenceConstants
.
SQL_FORMAT_BOLD_KEYWORDS
);
store
.
setToDefault
(
SQLPreferenceConstants
.
SQL_FORMAT_BOLD_KEYWORDS
);
store
.
setToDefault
(
ModelPreferences
.
SQL_FORMAT_FORMATTER
);
store
.
setToDefault
(
SQL
ModelPreferences
.
SQL_FORMAT_FORMATTER
);
if
(
curConfigurator
!=
null
)
{
if
(
curConfigurator
!=
null
)
{
curConfigurator
.
resetSettings
(
store
);
curConfigurator
.
resetSettings
(
store
);
}
}
...
@@ -280,11 +286,19 @@ public class PrefPageSQLFormat extends TargetPrefPage
...
@@ -280,11 +286,19 @@ public class PrefPageSQLFormat extends TargetPrefPage
SQLFormatterDescriptor
selFormatter
=
formatters
.
get
(
formatterSelector
.
getSelectionIndex
());
SQLFormatterDescriptor
selFormatter
=
formatters
.
get
(
formatterSelector
.
getSelectionIndex
());
try
{
try
{
curConfigurator
=
selFormatter
.
createConfigurer
();
SQLFormatter
sqlFormatter
=
selFormatter
.
createFormatter
();
if
(
curConfigurator
!=
null
)
{
// FIXME: this is a dirty hack because I'm too lazy to make proper registry/adapter for formatter UI configurators
// FIXME: for now we support only predefined list of formatters
if
(
sqlFormatter
instanceof
SQLFormatterTokenized
)
{
curConfigurator
=
new
SQLTokenizedFormatterConfigurationPage
();
}
else
if
(
sqlFormatter
instanceof
SQLFormatterExternal
)
{
curConfigurator
=
new
SQLExternalFormatterConfigurationPage
();
}
else
{
curConfigurator
=
GeneralUtils
.
adapt
(
sqlFormatter
,
SQLFormatterConfigurator
.
class
);
}
if
(
curConfigurator
instanceof
IDialogPage
)
{
curConfigurator
.
configure
(
selFormatter
);
curConfigurator
.
configure
(
selFormatter
);
((
IDialogPage
)
curConfigurator
).
createControl
(
formatterConfigPlaceholder
);
curConfigurator
.
createControl
(
formatterConfigPlaceholder
);
curConfigurator
.
loadSettings
(
getTargetPreferenceStore
());
curConfigurator
.
loadSettings
(
getTargetPreferenceStore
());
}
}
}
catch
(
DBException
e
)
{
}
catch
(
DBException
e
)
{
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/format/BaseFormatterConfigurationPage.java
→
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/
preferences/
format/BaseFormatterConfigurationPage.java
浏览文件 @
dd15372b
...
@@ -14,14 +14,13 @@
...
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
*/
package
org.jkiss.dbeaver.ui.editors.sql.format
;
package
org.jkiss.dbeaver.ui.editors.sql.
preferences.
format
;
import
org.eclipse.jface.dialogs.DialogPage
;
import
org.eclipse.jface.dialogs.DialogPage
;
import
org.eclipse.swt.widgets.Composite
;
import
org.eclipse.swt.widgets.Composite
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatterConfiguration
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatterConfiguration
;
import
org.jkiss.dbeaver.ui.editors.sql.registry.SQLFormatterConfigurator
;
import
org.jkiss.dbeaver.model.sql.registry.SQLFormatterDescriptor
;
import
org.jkiss.dbeaver.ui.editors.sql.registry.SQLFormatterDescriptor
;
public
abstract
class
BaseFormatterConfigurationPage
extends
DialogPage
implements
SQLFormatterConfigurator
{
public
abstract
class
BaseFormatterConfigurationPage
extends
DialogPage
implements
SQLFormatterConfigurator
{
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/format/SQLExternalFormatterConfigurationPage.java
→
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/
preferences/
format/SQLExternalFormatterConfigurationPage.java
浏览文件 @
dd15372b
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
*/
package
org.jkiss.dbeaver.ui.editors.sql.format
;
package
org.jkiss.dbeaver.ui.editors.sql.
preferences.
format
;
import
org.eclipse.jface.fieldassist.SimpleContentProposalProvider
;
import
org.eclipse.jface.fieldassist.SimpleContentProposalProvider
;
import
org.eclipse.jface.fieldassist.TextContentAdapter
;
import
org.eclipse.jface.fieldassist.TextContentAdapter
;
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/
registry
/SQLFormatterConfigurator.java
→
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/
preferences/format
/SQLFormatterConfigurator.java
浏览文件 @
dd15372b
...
@@ -14,15 +14,15 @@
...
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
*/
package
org.jkiss.dbeaver.ui.editors.sql.
registry
;
package
org.jkiss.dbeaver.ui.editors.sql.
preferences.format
;
import
org.eclipse.jface.dialogs.IDialogPage
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.sql.registry.SQLFormatterDescriptor
;
/**
/**
* SQL Formatter configur
e
r
* SQL Formatter configur
ato
r
*/
*/
public
interface
SQLFormatterConfigurator
extends
IDialogPage
{
public
interface
SQLFormatterConfigurator
{
/**
/**
* Sets configuration parameters
* Sets configuration parameters
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/format/tokenized/SQLTokenizedFormatterConfigurationPage.java
→
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/
preferences/
format/tokenized/SQLTokenizedFormatterConfigurationPage.java
浏览文件 @
dd15372b
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
*/
package
org.jkiss.dbeaver.ui.editors.sql.format.tokenized
;
package
org.jkiss.dbeaver.ui.editors.sql.
preferences.
format.tokenized
;
import
org.eclipse.jface.preference.IPreferenceStore
;
import
org.eclipse.jface.preference.IPreferenceStore
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.SWT
;
...
@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.ModelPreferences;
...
@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.ModelPreferences;
import
org.jkiss.dbeaver.model.DBPIdentifierCase
;
import
org.jkiss.dbeaver.model.DBPIdentifierCase
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.editors.sql.format.BaseFormatterConfigurationPage
;
import
org.jkiss.dbeaver.ui.editors.sql.
preferences.
format.BaseFormatterConfigurationPage
;
import
org.jkiss.dbeaver.ui.editors.sql.internal.SQLEditorMessages
;
import
org.jkiss.dbeaver.ui.editors.sql.internal.SQLEditorMessages
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLFormattingStrategy.java
浏览文件 @
dd15372b
...
@@ -22,7 +22,7 @@ import org.eclipse.jface.text.source.ISourceViewer;
...
@@ -22,7 +22,7 @@ import org.eclipse.jface.text.source.ISourceViewer;
import
org.jkiss.dbeaver.model.sql.SQLSyntaxManager
;
import
org.jkiss.dbeaver.model.sql.SQLSyntaxManager
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatter
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatter
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatterConfiguration
;
import
org.jkiss.dbeaver.model.sql.format.SQLFormatterConfiguration
;
import
org.jkiss.dbeaver.
ui.editors
.sql.registry.SQLFormatterConfigurationRegistry
;
import
org.jkiss.dbeaver.
model
.sql.registry.SQLFormatterConfigurationRegistry
;
import
org.jkiss.dbeaver.ui.editors.sql.SQLEditorSourceViewerConfiguration
;
import
org.jkiss.dbeaver.ui.editors.sql.SQLEditorSourceViewerConfiguration
;
/**
/**
...
...
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/IObjectPropertyConfigurator.java
浏览文件 @
dd15372b
...
@@ -19,7 +19,7 @@ package org.jkiss.dbeaver.ui;
...
@@ -19,7 +19,7 @@ package org.jkiss.dbeaver.ui;
import
org.eclipse.swt.widgets.Composite
;
import
org.eclipse.swt.widgets.Composite
;
/**
/**
* I
DataSourceConnectionEdi
tor
* I
ObjectPropertyConfigura
tor
*/
*/
public
interface
IObjectPropertyConfigurator
<
T
>
public
interface
IObjectPropertyConfigurator
<
T
>
{
{
...
@@ -29,6 +29,8 @@ public interface IObjectPropertyConfigurator<T>
...
@@ -29,6 +29,8 @@ public interface IObjectPropertyConfigurator<T>
void
saveSettings
(
T
configuration
);
void
saveSettings
(
T
configuration
);
void
resetSettings
(
T
configuration
);
boolean
isComplete
();
boolean
isComplete
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录