[fix][headless]Fix expr conversion issue.
Some checks failed
supersonic CentOS CI / build (21) (push) Has been cancelled
supersonic mac CI / build (21) (push) Has been cancelled
supersonic ubuntu CI / build (21) (push) Has been cancelled
supersonic windows CI / build (21) (push) Has been cancelled

This commit is contained in:
jerryjzhang
2025-01-17 20:43:05 +08:00
parent 416488b919
commit 65f0096724
4 changed files with 11 additions and 15 deletions

View File

@@ -202,8 +202,7 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
@Override
public List<String> getDbNames(Long id) throws SQLException {
DatabaseResp databaseResp = getDatabase(id);
DbAdaptor dbAdaptor =
DbAdaptorFactory.getEngineAdaptor(databaseResp.getType().toUpperCase());
DbAdaptor dbAdaptor = DbAdaptorFactory.getEngineAdaptor(databaseResp.getType());
return dbAdaptor.getDBs(DatabaseConverter.getConnectInfo(databaseResp));
}

View File

@@ -271,26 +271,24 @@ public class ModelConverter {
if (measures != null) {
for (Measure measure : measures) {
if (StringUtils.isBlank(measure.getBizName())) {
continue;
if (StringUtils.isNotBlank(measure.getBizName())
&& StringUtils.isBlank(measure.getExpr())) {
measure.setExpr(measure.getBizName());
}
measure.setExpr(measure.getBizName());
}
}
if (dimensions != null) {
for (Dimension dimension : dimensions) {
if (StringUtils.isBlank(dimension.getBizName())) {
continue;
if (StringUtils.isNotBlank(dimension.getBizName())
&& StringUtils.isBlank(dimension.getExpr())) {
dimension.setExpr(dimension.getBizName());
}
dimension.setExpr(dimension.getBizName());
}
}
if (identifiers != null) {
for (Identify identify : identifiers) {
if (StringUtils.isBlank(identify.getBizName())) {
continue;
}
if (StringUtils.isBlank(identify.getName())) {
if (StringUtils.isNotBlank(identify.getBizName())
&& StringUtils.isBlank(identify.getName())) {
identify.setName(identify.getBizName());
}
identify.setIsCreateDimension(1);