Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
ab7b7f54
提交
ab7b7f54
authored
12月 07, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(数据源): 支持 db2
上级
c51a41da
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
118 行增加
和
3 行删除
+118
-3
DatasourceTypes.java
...n/java/io/dataease/commons/constants/DatasourceTypes.java
+1
-0
Db2Configuration.java
...ain/java/io/dataease/dto/datasource/Db2Configuration.java
+29
-0
SQLObj.java
backend/src/main/java/io/dataease/dto/sqlObj/SQLObj.java
+2
-0
ProviderFactory.java
...d/src/main/java/io/dataease/provider/ProviderFactory.java
+2
-0
JdbcProvider.java
...in/java/io/dataease/provider/datasource/JdbcProvider.java
+34
-3
Db2Constants.java
...ain/java/io/dataease/provider/query/db2/Db2Constants.java
+39
-0
Db2QueryProvider.java
...java/io/dataease/provider/query/db2/Db2QueryProvider.java
+0
-0
ExtractDataService.java
.../java/io/dataease/service/dataset/ExtractDataService.java
+9
-0
jcc-11.5.6.0.jar
drivers/jcc-11.5.6.0.jar
+0
-0
DsTree.vue
frontend/src/views/system/datasource/DsTree.vue
+2
-0
form.vue
frontend/src/views/system/datasource/form.vue
+0
-0
没有找到文件。
backend/src/main/java/io/dataease/commons/constants/DatasourceTypes.java
浏览文件 @
ab7b7f54
...
...
@@ -12,6 +12,7 @@ public enum DatasourceTypes {
oracle
(
"oracle"
,
"oracle"
,
"oracle.jdbc.driver.OracleDriver"
,
"\""
,
"\""
,
"\""
,
"\""
),
mongo
(
"mongo"
,
"mongodb"
,
"com.mongodb.jdbc.MongoDriver"
,
"`"
,
"`"
,
"\""
,
"\""
),
ck
(
"ch"
,
"ch"
,
"ru.yandex.clickhouse.ClickHouseDriver"
,
"`"
,
"`"
,
"'"
,
"'"
),
db2
(
"db2"
,
"db2"
,
"com.ibm.db2.jcc.DB2Driver"
,
"\""
,
"\""
,
"\""
,
"\""
),
es
(
"es"
,
"es"
,
""
,
"\""
,
"\""
,
"\""
,
"\""
),
redshift
(
"redshift"
,
"redshift"
,
"org.postgresql.Driver"
,
"\""
,
"\""
,
"\""
,
"\""
);
...
...
backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java
0 → 100644
浏览文件 @
ab7b7f54
package
io
.
dataease
.
dto
.
datasource
;
import
lombok.Getter
;
import
lombok.Setter
;
import
org.apache.commons.lang3.StringUtils
;
@Getter
@Setter
public
class
Db2Configuration
extends
JdbcConfiguration
{
private
String
driver
=
"com.ibm.db2.jcc.DB2Driver"
;
private
String
extraParams
=
""
;
public
String
getJdbc
()
{
if
(
StringUtils
.
isEmpty
(
extraParams
.
trim
())){
return
"jdbc:db2://HOSTNAME:PORT/DATABASE"
.
replace
(
"HOSTNAME"
,
getHost
().
trim
())
.
replace
(
"PORT"
,
getPort
().
toString
().
trim
())
.
replace
(
"DATABASE"
,
getDataBase
().
trim
());
}
else
{
return
"jdbc:hive2://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
.
replace
(
"HOSTNAME"
,
getHost
().
trim
())
.
replace
(
"PORT"
,
getPort
().
toString
().
trim
())
.
replace
(
"DATABASE"
,
getDataBase
().
trim
())
.
replace
(
"EXTRA_PARAMS"
,
getExtraParams
().
trim
());
}
}
}
\ No newline at end of file
backend/src/main/java/io/dataease/dto/sqlObj/SQLObj.java
浏览文件 @
ab7b7f54
...
...
@@ -26,4 +26,6 @@ public class SQLObj {
private
String
whereField
;
private
String
whereAlias
;
private
String
whereTermAndValue
;
private
String
limitFiled
;
}
backend/src/main/java/io/dataease/provider/ProviderFactory.java
浏览文件 @
ab7b7f54
...
...
@@ -55,6 +55,8 @@ public class ProviderFactory implements ApplicationContextAware {
return
context
.
getBean
(
"redshiftQuery"
,
QueryProvider
.
class
);
case
hive:
return
context
.
getBean
(
"hiveQuery"
,
QueryProvider
.
class
);
case
db2:
return
context
.
getBean
(
"db2Query"
,
QueryProvider
.
class
);
default
:
return
context
.
getBean
(
"mysqlQuery"
,
QueryProvider
.
class
);
}
...
...
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
浏览文件 @
ab7b7f54
...
...
@@ -73,7 +73,7 @@ public class JdbcProvider extends DatasourceProvider {
list
=
fetchResult
(
rs
);
if
(
dsr
.
isPageable
()
&&
dsr
.
getDatasource
().
getType
().
equalsIgnoreCase
(
DatasourceTypes
.
sqlServer
.
name
(
)))
{
if
(
dsr
.
isPageable
()
&&
(
dsr
.
getDatasource
().
getType
().
equalsIgnoreCase
(
DatasourceTypes
.
sqlServer
.
name
())
||
dsr
.
getDatasource
().
getType
().
equalsIgnoreCase
(
DatasourceTypes
.
db2
.
name
()
)))
{
Integer
realSize
=
dsr
.
getPage
()
*
dsr
.
getPageSize
()
<
list
.
size
()
?
dsr
.
getPage
()
*
dsr
.
getPageSize
()
:
list
.
size
();
list
=
list
.
subList
((
dsr
.
getPage
()
-
1
)
*
dsr
.
getPageSize
(),
realSize
);
}
...
...
@@ -245,10 +245,10 @@ public class JdbcProvider extends DatasourceProvider {
List
<
String
[]>
dataList
;
List
<
TableFiled
>
fieldList
;
try
(
Connection
connection
=
getConnectionFromPool
(
datasourceRequest
);
Statement
stat
=
connection
.
createStatement
();
ResultSet
rs
=
stat
.
executeQuery
(
rebuildSqlWithFragment
(
datasourceRequest
.
getQuery
())))
{
dataList
=
fetchResult
(
rs
);
fieldList
=
fetchResultField
(
rs
,
datasourceRequest
);
result
.
put
(
"dataList"
,
dataList
);
result
.
put
(
"fieldList"
,
fieldList
);
dataList
=
fetchResult
(
rs
);
result
.
put
(
"dataList"
,
dataList
);
return
result
;
}
catch
(
SQLException
e
)
{
DataEaseException
.
throwException
(
e
);
...
...
@@ -451,6 +451,13 @@ public class JdbcProvider extends DatasourceProvider {
driver
=
hiveConfiguration
.
getDriver
();
jdbcurl
=
hiveConfiguration
.
getJdbc
();
break
;
case
db2:
Db2Configuration
db2Configuration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
Db2Configuration
.
class
);
username
=
db2Configuration
.
getUsername
();
password
=
db2Configuration
.
getPassword
();
driver
=
db2Configuration
.
getDriver
();
jdbcurl
=
db2Configuration
.
getJdbc
();
break
;
default
:
break
;
}
...
...
@@ -543,6 +550,13 @@ public class JdbcProvider extends DatasourceProvider {
dataSource
.
setDriverClassName
(
hiveConfiguration
.
getDriver
());
dataSource
.
setUrl
(
hiveConfiguration
.
getJdbc
());
jdbcConfiguration
=
hiveConfiguration
;
break
;
case
db2:
Db2Configuration
db2Configuration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
Db2Configuration
.
class
);
dataSource
.
setPassword
(
db2Configuration
.
getPassword
());
dataSource
.
setDriverClassName
(
db2Configuration
.
getDriver
());
dataSource
.
setUrl
(
db2Configuration
.
getJdbc
());
jdbcConfiguration
=
db2Configuration
;
default
:
break
;
}
...
...
@@ -592,6 +606,12 @@ public class JdbcProvider extends DatasourceProvider {
throw
new
Exception
(
Translator
.
get
(
"i18n_schema_is_empty"
));
}
return
"SELECT tablename FROM pg_tables WHERE schemaname='SCHEMA' ;"
.
replace
(
"SCHEMA"
,
redshiftConfigration
.
getSchema
());
case
db2:
Db2Configuration
db2Configuration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
Db2Configuration
.
class
);
if
(
StringUtils
.
isEmpty
(
db2Configuration
.
getSchema
()))
{
throw
new
Exception
(
Translator
.
get
(
"i18n_schema_is_empty"
));
}
return
"select TABNAME from syscat.tables WHERE TABSCHEMA ='DE_SCHEMA' AND \"TYPE\" = 'T';"
.
replace
(
"DE_SCHEMA"
,
db2Configuration
.
getSchema
());
default
:
return
"show tables;"
;
}
...
...
@@ -632,6 +652,14 @@ public class JdbcProvider extends DatasourceProvider {
throw
new
Exception
(
Translator
.
get
(
"i18n_schema_is_empty"
));
}
return
"SELECT viewname FROM pg_views WHERE schemaname='SCHEMA' ;"
.
replace
(
"SCHEMA"
,
redshiftConfigration
.
getSchema
());
case
db2:
Db2Configuration
db2Configuration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
Db2Configuration
.
class
);
if
(
StringUtils
.
isEmpty
(
db2Configuration
.
getSchema
()))
{
throw
new
Exception
(
Translator
.
get
(
"i18n_schema_is_empty"
));
}
return
"select TABNAME from syscat.tables WHERE TABSCHEMA ='DE_SCHEMA' AND \"TYPE\" = 'V';"
.
replace
(
"DE_SCHEMA"
,
db2Configuration
.
getSchema
());
default
:
return
null
;
}
...
...
@@ -639,11 +667,14 @@ public class JdbcProvider extends DatasourceProvider {
private
String
getSchemaSql
(
DatasourceRequest
datasourceRequest
)
{
DatasourceTypes
datasourceType
=
DatasourceTypes
.
valueOf
(
datasourceRequest
.
getDatasource
().
getType
());
Db2Configuration
db2Configuration
=
new
Gson
().
fromJson
(
datasourceRequest
.
getDatasource
().
getConfiguration
(),
Db2Configuration
.
class
);
switch
(
datasourceType
)
{
case
oracle:
return
"select * from all_users"
;
case
sqlServer:
return
"select name from sys.schemas;"
;
case
db2:
return
"select SCHEMANAME from syscat.SCHEMATA WHERE \"DEFINER\" ='USER';"
.
replace
(
"USER"
,
db2Configuration
.
getUsername
().
toUpperCase
())
;
case
pg:
return
"SELECT nspname FROM pg_namespace;"
;
case
redshift:
...
...
backend/src/main/java/io/dataease/provider/query/db2/Db2Constants.java
0 → 100644
浏览文件 @
ab7b7f54
package
io
.
dataease
.
provider
.
query
.
db2
;
import
io.dataease.provider.query.SQLConstants
;
import
static
io
.
dataease
.
commons
.
constants
.
DatasourceTypes
.
db2
;
public
class
Db2Constants
extends
SQLConstants
{
public
static
final
String
KEYWORD_TABLE
=
db2
.
getKeywordPrefix
()
+
"%s"
+
db2
.
getKeywordSuffix
();
public
static
final
String
KEYWORD_FIX
=
"%s."
+
db2
.
getKeywordPrefix
()
+
"%s"
+
db2
.
getKeywordSuffix
();
public
static
final
String
UNIX_TIMESTAMP
=
"BIGINT(TIMESTAMPDIFF(2,CHAR(%s -TIMESTAMP('1970-01-01 08:00:00'))))"
;
public
static
final
String
DATE_FORMAT
=
"TO_CHAR(TIMESTAMP(%s),'%s')"
;
public
static
final
String
FROM_UNIXTIME
=
"TO_CHAR(TIMESTAMP('1970-01-01 08:00:00') +(%s)SECONDS, '%s')"
;
public
static
final
String
STR_TO_DATE
=
"timestamp(trim(char(%s)))"
;
public
static
final
String
CAST
=
"CAST(%s AS %s)"
;
public
static
final
String
DEFAULT_DATE_FORMAT
=
"YYYY-MM-DD HH24:MI:SS"
;
public
static
final
String
DEFAULT_INT_FORMAT
=
"BIGINT"
;
public
static
final
String
DEFAULT_FLOAT_FORMAT
=
"DECIMAL(20,2)"
;
public
static
final
String
WHERE_VALUE_NULL
=
"(NULL,'')"
;
public
static
final
String
WHERE_VALUE_VALUE
=
"'%s'"
;
public
static
final
String
AGG_COUNT
=
"COUNT(*)"
;
public
static
final
String
AGG_FIELD
=
"%s(%s)"
;
public
static
final
String
WHERE_BETWEEN
=
"'%s' AND '%s'"
;
public
static
final
String
BRACKETS
=
"(%s)"
;
}
backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
0 → 100644
浏览文件 @
ab7b7f54
差异被折叠。
点击展开。
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
浏览文件 @
ab7b7f54
...
...
@@ -769,6 +769,15 @@ public class ExtractDataService {
inputStep
=
inputStep
(
transMeta
,
selectSQL
);
udjcStep
=
udjc
(
datasetTableFields
,
DatasourceTypes
.
ck
);
break
;
case
db2:
Db2Configuration
db2Configuration
=
new
Gson
().
fromJson
(
datasource
.
getConfiguration
(),
Db2Configuration
.
class
);
dataMeta
=
new
DatabaseMeta
(
"db"
,
"DB2"
,
"Native"
,
db2Configuration
.
getHost
().
trim
(),
db2Configuration
.
getDataBase
().
trim
(),
db2Configuration
.
getPort
().
toString
(),
db2Configuration
.
getUsername
(),
db2Configuration
.
getPassword
());
dataMeta
.
setDatabaseType
(
"DB2"
);
transMeta
.
addDatabase
(
dataMeta
);
selectSQL
=
getSelectSQL
(
extractType
,
datasetTable
,
datasource
,
datasetTableFields
,
selectSQL
);
inputStep
=
inputStep
(
transMeta
,
selectSQL
);
udjcStep
=
udjc
(
datasetTableFields
,
DatasourceTypes
.
db2
);
break
;
case
excel:
inputStep
=
excelInputStep
(
datasetTable
.
getInfo
(),
datasetTableFields
);
udjcStep
=
udjc
(
datasetTableFields
,
DatasourceTypes
.
excel
);
...
...
drivers/jcc-11.5.6.0.jar
0 → 100644
浏览文件 @
ab7b7f54
File added
frontend/src/views/system/datasource/DsTree.vue
浏览文件 @
ab7b7f54
...
...
@@ -198,6 +198,8 @@ export default {
return
'AWS Redshift'
}
else
if
(
type
===
'hive'
)
{
return
'Apache Hive'
}
else
if
(
type
===
'db2'
)
{
return
'Db2'
}
},
...
...
frontend/src/views/system/datasource/form.vue
浏览文件 @
ab7b7f54
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论