Browse Source

Merge pull request #3666 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '4a7fd1f109e6ebb9cfd93318a4d7faa7151a8a8e':
  REPORT-48046    额外删除schema为null的缓存
feature/10.0
superman 4 years ago
parent
commit
8f27e24b3f
  1. 11
      designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java

11
designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java

@ -109,10 +109,9 @@ public class TableViewList extends UIList {
String[] schemas = DataCoreUtils.getDatabaseSchema(datasource); String[] schemas = DataCoreUtils.getDatabaseSchema(datasource);
schemas = (schemas == null || schemas.length == 0) ? new String[]{null} : schemas; schemas = (schemas == null || schemas.length == 0) ? new String[]{null} : schemas;
for (String schema : schemas) { for (String schema : schemas) {
DataCoreUtils.refreshTables(datasource, TableProcedure.TABLE, schema); clearCache(datasource, schema);
DataCoreUtils.refreshTables(datasource, TableProcedure.VIEW, schema);
DataCoreUtils.refreshTables(datasource, TableProcedure.PROCEDURE, schema);
} }
clearCache(datasource, null);
return processDataInAnotherThread(databaseName, searchFilter, typesFilter); return processDataInAnotherThread(databaseName, searchFilter, typesFilter);
} }
@ -133,6 +132,12 @@ public class TableViewList extends UIList {
} }
} }
private void clearCache(Connection datasource, String schema) {
DataCoreUtils.refreshTables(datasource, TableProcedure.TABLE, schema);
DataCoreUtils.refreshTables(datasource, TableProcedure.VIEW, schema);
DataCoreUtils.refreshTables(datasource, TableProcedure.PROCEDURE, schema);
}
/** /**
* augustdatabaseName是数据库名字searchFilter是输入的过滤条件,typesFilter是视图 * augustdatabaseName是数据库名字searchFilter是输入的过滤条件,typesFilter是视图
* 存储过程中的一者或者几者 * 存储过程中的一者或者几者

Loading…
Cancel
Save