topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-12 12:37:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(fix)(semantic) fix database db name modify error (#99)

Browse Source
This commit is contained in:
LXW
2023-09-19 09:11:14 +08:00
committed by GitHub
parent 4991efe50c
commit 7bc64bc53b
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DatabaseReq.java
View File

@@ -3,6 +3,7 @@ package com.tencent.supersonic.semantic.api.model.request;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.tencent.supersonic.semantic.api.model.enums.DataTypeEnum; import com.tencent.supersonic.semantic.api.model.enums.DataTypeEnum;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.util.List; import java.util.List;
@@ -39,10 +40,16 @@ public class DatabaseReq {
if (type.equalsIgnoreCase(DataTypeEnum.H2.getFeature())) { if (type.equalsIgnoreCase(DataTypeEnum.H2.getFeature())) {
return url; return url;
} }
if (type.equalsIgnoreCase(DataTypeEnum.MYSQL.getFeature())) { String databaseUrl = database;
return String.format("jdbc:%s://%s:%s?sessionVariables=sql_mode='IGNORE_SPACE'&allowMultiQueries=true", if (StringUtils.isBlank(databaseUrl)) {
type, host, port); databaseUrl = "";
} else {
databaseUrl = "/" + database;
} }
return String.format("jdbc:%s://%s:%s", type, host, port); if (type.equalsIgnoreCase(DataTypeEnum.MYSQL.getFeature())) {
return String.format("jdbc:%s://%s:%s%s?sessionVariables=sql_mode='IGNORE_SPACE'&allowMultiQueries=true",
type, host, port, databaseUrl);
}
return String.format("jdbc:%s://%s:%s%s", type, host, port, databaseUrl);
} }
} }

2
semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/ConnectInfo.java
View File

@@ -13,4 +13,6 @@ public class ConnectInfo {
private String password; private String password;
private String database;
} }

2
semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatabaseConverter.java
View File

@@ -22,6 +22,7 @@ public class DatabaseConverter {
connectInfo.setUserName(databaseReq.getUsername()); connectInfo.setUserName(databaseReq.getUsername());
connectInfo.setPassword(databaseReq.getPassword()); connectInfo.setPassword(databaseReq.getPassword());
connectInfo.setUrl(databaseReq.getUrl()); connectInfo.setUrl(databaseReq.getUrl());
connectInfo.setDatabase(databaseReq.getDatabase());
database.setConnectInfo(connectInfo); database.setConnectInfo(connectInfo);
database.setCreatedAt(new Date()); database.setCreatedAt(new Date());
database.setCreatedBy(user.getName()); database.setCreatedBy(user.getName());
@@ -58,6 +59,7 @@ public class DatabaseConverter {
databaseResp.setUrl(connectInfo.getUrl()); databaseResp.setUrl(connectInfo.getUrl());
databaseResp.setPassword(connectInfo.getPassword()); databaseResp.setPassword(connectInfo.getPassword());
databaseResp.setUsername(connectInfo.getUserName()); databaseResp.setUsername(connectInfo.getUserName());
databaseResp.setDatabase(connectInfo.getDatabase());
if (StringUtils.isNotBlank(databaseDO.getAdmin())) { if (StringUtils.isNotBlank(databaseDO.getAdmin())) {
databaseResp.setAdmins(Arrays.asList(databaseDO.getAdmin().split(","))); databaseResp.setAdmins(Arrays.asList(databaseDO.getAdmin().split(",")));
} }