Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
9ecaba3f
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,发现更多精彩内容 >>
提交
9ecaba3f
编写于
10月 15, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Oracle NULL/NOT NULL alter fixed.
Default value quotes fixed
上级
f18e982c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
9 deletion
+32
-9
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableColumnManager.java
...iss/dbeaver/ext/oracle/edit/OracleTableColumnManager.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableColumnManager.java
...ver/model/impl/sql/edit/struct/SQLTableColumnManager.java
+31
-8
未找到文件。
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableColumnManager.java
浏览文件 @
9ecaba3f
...
...
@@ -52,7 +52,7 @@ public class OracleTableColumnManager extends SQLTableColumnManager<OracleTableC
protected
ColumnModifier
[]
getSupportedModifiers
()
{
return
new
ColumnModifier
[]
{
DataTypeModifier
,
DefaultModifier
,
NullNotNullModifier
};
return
new
ColumnModifier
[]
{
DataTypeModifier
,
DefaultModifier
,
NullNotNullModifier
Conditional
};
}
@Override
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableColumnManager.java
浏览文件 @
9ecaba3f
...
...
@@ -18,6 +18,7 @@
package
org.jkiss.dbeaver.model.impl.sql.edit.struct
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.edit.prop.DBECommandComposite
;
import
org.jkiss.dbeaver.model.impl.DBObjectNameCaseTransformer
;
import
org.jkiss.dbeaver.model.impl.edit.DBECommandAbstract
;
import
org.jkiss.dbeaver.model.messages.ModelMessages
;
...
...
@@ -41,13 +42,13 @@ public abstract class SQLTableColumnManager<OBJECT_TYPE extends JDBCTableColumn<
public
static
final
long
DDL_FEATURE_OMIT_COLUMN_CLAUSE_IN_DROP
=
1
;
public
static
final
String
QUOTE
=
"'"
;
protected
interface
ColumnModifier
<
OBJECT_TYPE
>
{
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
);
protected
interface
ColumnModifier
<
OBJECT_TYPE
extends
DBPObject
>
{
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
,
DBECommandAbstract
<
OBJECT_TYPE
>
command
);
}
protected
final
ColumnModifier
<
OBJECT_TYPE
>
DataTypeModifier
=
new
ColumnModifier
<
OBJECT_TYPE
>()
{
@Override
public
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
)
{
public
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
,
DBECommandAbstract
<
OBJECT_TYPE
>
command
)
{
final
String
typeName
=
column
.
getTypeName
();
final
DBSDataType
dataType
=
findDataType
(
column
.
getDataSource
(),
typeName
);
sql
.
append
(
' '
).
append
(
typeName
);
...
...
@@ -72,7 +73,7 @@ public abstract class SQLTableColumnManager<OBJECT_TYPE extends JDBCTableColumn<
protected
final
ColumnModifier
<
OBJECT_TYPE
>
NotNullModifier
=
new
ColumnModifier
<
OBJECT_TYPE
>()
{
@Override
public
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
)
{
public
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
,
DBECommandAbstract
<
OBJECT_TYPE
>
command
)
{
if
(
column
.
isRequired
())
{
sql
.
append
(
" NOT NULL"
);
//$NON-NLS-1$
}
...
...
@@ -81,19 +82,41 @@ public abstract class SQLTableColumnManager<OBJECT_TYPE extends JDBCTableColumn<
protected
final
ColumnModifier
<
OBJECT_TYPE
>
NullNotNullModifier
=
new
ColumnModifier
<
OBJECT_TYPE
>()
{
@Override
public
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
)
{
public
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
,
DBECommandAbstract
<
OBJECT_TYPE
>
command
)
{
sql
.
append
(
column
.
isRequired
()
?
" NOT NULL"
:
" NULL"
);
}
};
protected
final
ColumnModifier
<
OBJECT_TYPE
>
NullNotNullModifierConditional
=
new
ColumnModifier
<
OBJECT_TYPE
>()
{
@Override
public
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
,
DBECommandAbstract
<
OBJECT_TYPE
>
command
)
{
if
(
command
instanceof
DBECommandComposite
)
{
if
(((
DBECommandComposite
)
command
).
getProperty
(
"required"
)
==
null
)
{
// Do not set NULL/NOT NULL if it wasn't chaged
return
;
}
}
NullNotNullModifier
.
appendModifier
(
column
,
sql
,
command
);
}
};
protected
final
ColumnModifier
<
OBJECT_TYPE
>
DefaultModifier
=
new
ColumnModifier
<
OBJECT_TYPE
>()
{
@Override
public
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
)
{
public
void
appendModifier
(
OBJECT_TYPE
column
,
StringBuilder
sql
,
DBECommandAbstract
<
OBJECT_TYPE
>
command
)
{
String
defaultValue
=
CommonUtils
.
toString
(
column
.
getDefaultValue
());
if
(!
CommonUtils
.
isEmpty
(
defaultValue
))
{
boolean
useQuotes
=
false
;
boolean
useQuotes
=
column
.
getDataKind
()
==
DBPDataKind
.
STRING
||
column
.
getDataKind
()
==
DBPDataKind
.
DATETIME
;
if
(
useQuotes
&&
defaultValue
.
trim
().
startsWith
(
QUOTE
))
{
useQuotes
=
false
;
}
sql
.
append
(
" DEFAULT "
);
//$NON-NLS-1$
if
(
useQuotes
)
sql
.
append
(
QUOTE
);
sql
.
append
(
defaultValue
);
if
(
useQuotes
)
sql
.
append
(
QUOTE
);
}
}
};
...
...
@@ -201,7 +224,7 @@ public abstract class SQLTableColumnManager<OBJECT_TYPE extends JDBCTableColumn<
StringBuilder
decl
=
new
StringBuilder
(
40
);
decl
.
append
(
columnName
);
for
(
ColumnModifier
modifier
:
getSupportedModifiers
())
{
modifier
.
appendModifier
(
column
,
decl
);
modifier
.
appendModifier
(
column
,
decl
,
command
);
}
return
decl
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录