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

Merge pull request #5743 from dataease/pr@dev@fixdatasource

Browse Source 
fix: 判断oracle timestemp类型
This commit is contained in:
taojinlong 2023-07-22 23:48:43 +08:00 committed by GitHub
commit 2c5d3d65c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -796,7 +796,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
break;
case sqlServer:
SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasource.getConfiguration(), SqlServerConfiguration.class);
if(!sqlServerConfiguration.getDataBase().matches("^[0-9a-zA-Z_.-]{1,}$")){
if(!sqlServerConfiguration.getDataBase().matches("^[0-9a-zA-Z_.-\u4E00-\u9FA5\u8FBD-\u9FBB\uFA0E-\uFA29]{1,}$")){
throw new Exception("Invalid database name");
}
break;

1
backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
View File

@ -60,6 +60,7 @@ public class OracleQueryProvider extends QueryProvider {
@Override
public Integer transFieldType(String field) {
field = field.split("()")[0];
switch (field) {
case "CHAR":
case "VARCHAR2":