Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
一剑流云
dbeaver
提交
223e94d6
D
dbeaver
项目概览
一剑流云
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
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,发现更多精彩内容 >>
提交
223e94d6
编写于
8月 12, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
DDL generation fix
上级
8e903cb0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
8 deletion
+8
-8
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectBase.java
...aver/ui/actions/navigator/NavigatorHandlerObjectBase.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
...src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
+1
-3
plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModel.java
...kiss/dbeaver/ext/generic/model/meta/GenericMetaModel.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBUtils.java
...ss.dbeaver.model/src/org/jkiss/dbeaver/model/DBUtils.java
+5
-3
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectBase.java
浏览文件 @
223e94d6
...
...
@@ -200,7 +200,7 @@ public abstract class NavigatorHandlerObjectBase extends AbstractHandler {
Collection
<?
extends
DBECommand
>
commands
=
commandContext
.
getFinalCommands
();
StringBuilder
script
=
new
StringBuilder
();
for
(
DBECommand
command
:
commands
)
{
script
.
append
(
DBUtils
.
generateScript
(
command
.
getPersistActions
()));
script
.
append
(
DBUtils
.
generateScript
(
command
.
getPersistActions
()
,
false
));
}
DatabaseNavigatorView
view
=
UIUtils
.
findView
(
workbenchWindow
,
DatabaseNavigatorView
.
class
);
if
(
view
!=
null
)
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
浏览文件 @
223e94d6
...
...
@@ -19,7 +19,6 @@ package org.jkiss.dbeaver.ui.editors.entity;
import
org.eclipse.core.runtime.IProgressMonitor
;
import
org.eclipse.jface.dialogs.IDialogConstants
;
import
org.eclipse.jface.viewers.Viewer
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.events.SelectionAdapter
;
import
org.eclipse.swt.events.SelectionEvent
;
...
...
@@ -65,7 +64,6 @@ import org.jkiss.dbeaver.ui.editors.DatabaseEditorInput;
import
org.jkiss.dbeaver.ui.editors.ErrorEditorInput
;
import
org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput
;
import
org.jkiss.dbeaver.ui.editors.MultiPageDatabaseEditor
;
import
org.jkiss.dbeaver.ui.navigator.INavigatorModelView
;
import
org.jkiss.utils.CommonUtils
;
import
java.lang.reflect.InvocationTargetException
;
...
...
@@ -347,7 +345,7 @@ public class EntityEditor extends MultiPageDatabaseEditor
return
IDialogConstants
.
CANCEL_ID
;
}
script
.
append
(
DBUtils
.
generateScript
(
command
.
getPersistActions
()));
command
.
getPersistActions
()
,
false
));
}
ChangesPreviewer
changesPreviewer
=
new
ChangesPreviewer
(
script
,
allowSave
);
...
...
plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModel.java
浏览文件 @
223e94d6
...
...
@@ -237,7 +237,7 @@ public class GenericMetaModel {
public
String
getTableDDL
(
DBRProgressMonitor
monitor
,
GenericTable
sourceObject
)
throws
DBException
{
GenericTableManager
tableManager
=
new
GenericTableManager
();
DBEPersistAction
[]
ddlActions
=
tableManager
.
getTableDDL
(
monitor
,
sourceObject
);
return
DBUtils
.
generateScript
(
ddlActions
);
return
DBUtils
.
generateScript
(
ddlActions
,
true
);
}
public
String
getProcedureDDL
(
DBRProgressMonitor
monitor
,
GenericProcedure
sourceObject
)
throws
DBException
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBUtils.java
浏览文件 @
223e94d6
...
...
@@ -1107,12 +1107,14 @@ public final class DBUtils {
}
@NotNull
public
static
String
generateScript
(
DBEPersistAction
[]
persistActions
)
public
static
String
generateScript
(
DBEPersistAction
[]
persistActions
,
boolean
existingObject
)
{
String
lineSeparator
=
GeneralUtils
.
getDefaultLineSeparator
();
StringBuilder
script
=
new
StringBuilder
(
64
);
script
.
append
(
DBEAVER_DDL_COMMENT
).
append
(
Platform
.
getProduct
().
getName
()).
append
(
lineSeparator
)
.
append
(
DBEAVER_DDL_WARNING
).
append
(
lineSeparator
);
if
(
existingObject
)
{
script
.
append
(
DBEAVER_DDL_COMMENT
).
append
(
Platform
.
getProduct
().
getName
()).
append
(
lineSeparator
)
.
append
(
DBEAVER_DDL_WARNING
).
append
(
lineSeparator
);
}
for
(
DBEPersistAction
action
:
ArrayUtils
.
safeArray
(
persistActions
))
{
String
scriptLine
=
action
.
getScript
();
if
(
CommonUtils
.
isEmpty
(
scriptLine
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录