center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #7054 from dataease/pr@dev@fixSql

Browse Source 
fix: 数据源插件拼接错误
This commit is contained in:
taojinlong 2023-12-06 04:15:28 -06:00 committed by GitHub
commit eed807dc09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -371,9 +371,11 @@ public class DatasourceService {
String datasourceStatus = null;
try {
Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
System.out.println(datasourceProvider.getClass());
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource);
datasourceStatus = datasourceProvider.checkStatus(datasourceRequest);
System.out.println(datasourceStatus);
if (datasource.getType().equalsIgnoreCase("api")) {
List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<List<ApiDefinition>>() {
}.getType());
@ -398,6 +400,7 @@ public class DatasourceService {
return ResultHolder.success("Success");
} catch (Exception e) {
e.printStackTrace();
datasourceStatus = "Error";
return ResultHolder.error(Translator.get("I18N_DS_INVALID") + ": " + e.getMessage());
} finally {
@ -405,6 +408,7 @@ public class DatasourceService {
record.setStatus(datasourceStatus);
DatasourceExample example = new DatasourceExample();
example.createCriteria().andIdEqualTo(datasource.getId());
System.out.println(new Gson().toJson(record));
datasourceMapper.updateByExampleSelective(record, example);
}
}

1
extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java
View File

@ -4,6 +4,7 @@ package io.dataease.plugins.datasource.dm.query;
import io.dataease.plugins.common.constants.datasource.SQLConstants;
import static io.dataease.plugins.common.constants.DatasourceTypes.mysql;
import static io.dataease.plugins.common.constants.DatasourceTypes.oracle;
public class DmConstants extends SQLConstants {

2
extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java
View File

@ -9,7 +9,7 @@ public class KylinConstants extends SQLConstants {
public static final String KEYWORD_FIX = "%s." + "%s";
public static final String ALIAS_FIX = "%s";
public static final String CAST = "CAST(%s AS %s)";
public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";

1
extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java
View File

@ -11,6 +11,7 @@ public class MaxConstants extends SQLConstants {
public static final String KEYWORD_FIX = "%s." + "%s";
public static final String ALIAS_FIX = "%s";
public static final String UNIX_TIMESTAMP = "TO_MILLIS(%s)";
public static final String DATE_FORMAT = "to_char(%s, '%s')";

1
extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java
View File

@ -11,6 +11,7 @@ public class PrestoConstants extends SQLConstants {
public static final String KEYWORD_FIX = "%s." + "%s";
public static final String ALIAS_FIX = "%s";
public static final String UNIX_TIMESTAMP = "to_unixtime(%s)";
public static final String FROM_UNIXTIME = "from_unixtime(%s)";