Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
59e991ca
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,发现更多精彩内容 >>
提交
59e991ca
编写于
8月 30, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SQL Server model refactoring
Former-commit-id:
8689f6b1
上级
5f7258ff
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
11 addition
and
9 deletion
+11
-9
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerUtils.java
...mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerUtils.java
+4
-6
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDataType.java
.../org/jkiss/dbeaver/ext/mssql/model/SQLServerDataType.java
+1
-0
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerObject.java
...rc/org/jkiss/dbeaver/ext/mssql/model/SQLServerObject.java
+3
-1
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerProcedure.java
...org/jkiss/dbeaver/ext/mssql/model/SQLServerProcedure.java
+1
-1
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java
...rc/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java
+1
-0
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerView.java
.../src/org/jkiss/dbeaver/ext/mssql/model/SQLServerView.java
+1
-1
未找到文件。
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerUtils.java
浏览文件 @
59e991ca
...
@@ -144,13 +144,11 @@ public class SQLServerUtils {
...
@@ -144,13 +144,11 @@ public class SQLServerUtils {
}
}
}
}
public
static
String
extractSource
(
@NotNull
DBRProgressMonitor
monitor
,
@NotNull
SQLServer
Database
database
,
@Nullable
SQLServer
Schema
schema
,
@NotNull
String
objectName
)
throws
DBException
{
public
static
String
extractSource
(
@NotNull
DBRProgressMonitor
monitor
,
@NotNull
SQLServerSchema
schema
,
@NotNull
String
objectName
)
throws
DBException
{
SQLServerDataSource
dataSource
=
database
.
getDataSource
();
SQLServerDataSource
dataSource
=
schema
.
getDataSource
();
String
systemSchema
=
getSystemSchemaFQN
(
dataSource
,
database
.
getName
(),
SQLServerConstants
.
SQL_SERVER_SYSTEM_SCHEMA
);
String
systemSchema
=
getSystemSchemaFQN
(
dataSource
,
schema
.
getDatabase
()
.
getName
(),
SQLServerConstants
.
SQL_SERVER_SYSTEM_SCHEMA
);
try
(
JDBCSession
session
=
DBUtils
.
openMetaSession
(
monitor
,
dataSource
,
"Read source code"
))
{
try
(
JDBCSession
session
=
DBUtils
.
openMetaSession
(
monitor
,
dataSource
,
"Read source code"
))
{
String
objectFQN
=
schema
==
null
?
String
objectFQN
=
DBUtils
.
getQuotedIdentifier
(
dataSource
,
schema
.
getName
())
+
"."
+
DBUtils
.
getQuotedIdentifier
(
dataSource
,
objectName
);
DBUtils
.
getQuotedIdentifier
(
dataSource
,
objectName
)
:
DBUtils
.
getQuotedIdentifier
(
dataSource
,
schema
.
getName
())
+
"."
+
DBUtils
.
getQuotedIdentifier
(
dataSource
,
objectName
);
try
(
JDBCPreparedStatement
dbStat
=
session
.
prepareStatement
(
systemSchema
+
".sp_helptext '"
+
objectFQN
+
"'"
))
{
try
(
JDBCPreparedStatement
dbStat
=
session
.
prepareStatement
(
systemSchema
+
".sp_helptext '"
+
objectFQN
+
"'"
))
{
try
(
JDBCResultSet
dbResult
=
dbStat
.
executeQuery
())
{
try
(
JDBCResultSet
dbResult
=
dbStat
.
executeQuery
())
{
StringBuilder
sql
=
new
StringBuilder
();
StringBuilder
sql
=
new
StringBuilder
();
...
...
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDataType.java
浏览文件 @
59e991ca
...
@@ -96,6 +96,7 @@ public class SQLServerDataType implements DBSDataType, SQLServerObject, DBPQuali
...
@@ -96,6 +96,7 @@ public class SQLServerDataType implements DBSDataType, SQLServerObject, DBPQuali
this
.
valueType
=
valueType
;
this
.
valueType
=
valueType
;
}
}
@NotNull
@Override
@Override
public
SQLServerDataSource
getDataSource
()
{
public
SQLServerDataSource
getDataSource
()
{
return
(
SQLServerDataSource
)
owner
.
getDataSource
();
return
(
SQLServerDataSource
)
owner
.
getDataSource
();
...
...
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerObject.java
浏览文件 @
59e991ca
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
*/
*/
package
org.jkiss.dbeaver.ext.mssql.model
;
package
org.jkiss.dbeaver.ext.mssql.model
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.model.DBPNamedObject
;
import
org.jkiss.dbeaver.model.DBPNamedObject
;
import
org.jkiss.dbeaver.model.DBPObjectWithLongId
;
import
org.jkiss.dbeaver.model.DBPObjectWithLongId
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
...
@@ -26,5 +27,6 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
...
@@ -26,5 +27,6 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
*/
*/
public
interface
SQLServerObject
extends
DBPNamedObject
,
DBSObject
,
DBPObjectWithLongId
public
interface
SQLServerObject
extends
DBPNamedObject
,
DBSObject
,
DBPObjectWithLongId
{
{
@NotNull
SQLServerDataSource
getDataSource
();
}
}
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerProcedure.java
浏览文件 @
59e991ca
...
@@ -137,7 +137,7 @@ public class SQLServerProcedure extends AbstractProcedure<SQLServerDataSource, S
...
@@ -137,7 +137,7 @@ public class SQLServerProcedure extends AbstractProcedure<SQLServerDataSource, S
"AS "
+
GeneralUtils
.
getDefaultLineSeparator
()
+
"AS "
+
GeneralUtils
.
getDefaultLineSeparator
()
+
"SELECT 1"
;
"SELECT 1"
;
}
else
{
}
else
{
this
.
body
=
SQLServerUtils
.
extractSource
(
monitor
,
getContainer
()
.
getDatabase
(),
getContainer
()
,
getName
());
this
.
body
=
SQLServerUtils
.
extractSource
(
monitor
,
getContainer
(),
getName
());
}
}
}
}
return
body
;
return
body
;
...
...
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java
浏览文件 @
59e991ca
...
@@ -106,6 +106,7 @@ public class SQLServerSchema implements DBSSchema, DBPSaveableObject, DBPQualifi
...
@@ -106,6 +106,7 @@ public class SQLServerSchema implements DBSSchema, DBPSaveableObject, DBPQualifi
return
triggerCache
;
return
triggerCache
;
}
}
@NotNull
@Override
@Override
public
SQLServerDataSource
getDataSource
()
{
public
SQLServerDataSource
getDataSource
()
{
return
database
.
getDataSource
();
return
database
.
getDataSource
();
...
...
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerView.java
浏览文件 @
59e991ca
...
@@ -153,7 +153,7 @@ public class SQLServerView extends SQLServerTableBase implements DBSView
...
@@ -153,7 +153,7 @@ public class SQLServerView extends SQLServerTableBase implements DBSView
}
}
if
(
ddl
==
null
)
{
if
(
ddl
==
null
)
{
if
(
isPersisted
())
{
if
(
isPersisted
())
{
ddl
=
SQLServerUtils
.
extractSource
(
monitor
,
get
Database
(),
get
Schema
(),
getName
());
ddl
=
SQLServerUtils
.
extractSource
(
monitor
,
getSchema
(),
getName
());
}
else
{
}
else
{
ddl
=
"CREATE VIEW "
+
this
.
getFullyQualifiedName
(
DBPEvaluationContext
.
DDL
)
+
" AS\n"
;
ddl
=
"CREATE VIEW "
+
this
.
getFullyQualifiedName
(
DBPEvaluationContext
.
DDL
)
+
" AS\n"
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录