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

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

Browse Source 
refactor: 回滚
This commit is contained in:
taojinlong 2023-11-20 20:50:55 -06:00 committed by GitHub
commit 80a5c893fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/backend/pom.xml
View File

@ -342,12 +342,6 @@
<artifactId>ashot</artifactId>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-common</artifactId>
<version>1.18.11</version>
<scope>compile</scope>
</dependency>
</dependencies>

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

@ -122,11 +122,9 @@ public class JdbcProvider extends DefaultJdbcProvider {
list.add(tableField);
}
} else {
System.out.println(database);
if (database != null) {
if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) {
TableField tableField = getTableFiled(resultSet, datasourceRequest);
System.out.println(new Gson().toJson(tableField));
list.add(tableField);
}
} else {