@ -123,7 +123,7 @@ public class TableViewList extends UIList {
if ( refresh ) {
if ( refresh ) {
clearCache ( datasource ) ;
clearCache ( datasource ) ;
}
}
return processDataInAnotherThread ( databaseNam e , searchFilter , typesFilter ) ;
return processDataInAnotherThread ( datasourc e , searchFilter , typesFilter ) ;
}
}
@Override
@Override
@ -166,9 +166,8 @@ public class TableViewList extends UIList {
* @param searchFilter
* @param searchFilter
* @param typesFilter
* @param typesFilter
* /
* /
private DefaultListModel processDataInAnotherThread ( String databaseNam e, String searchFilter , String . . . typesFilter ) throws Exception {
private DefaultListModel processDataInAnotherThread ( Connection datasourc e, String searchFilter , String . . . typesFilter ) throws Exception {
DefaultListModel defaultListModel = new DefaultListModel ( ) ;
DefaultListModel defaultListModel = new DefaultListModel ( ) ;
Connection datasource = ConnectionInfoBeanHelper . createConnection ( ConnectionRepository . getInstance ( ) . getByName ( databaseName ) ) ;
if ( datasource = = null ) {
if ( datasource = = null ) {
return defaultListModel ;
return defaultListModel ;
}
}
@ -177,7 +176,7 @@ public class TableViewList extends UIList {
searchFilter = searchFilter . toLowerCase ( ) ;
searchFilter = searchFilter . toLowerCase ( ) ;
boolean isOracleSystemSpace = DesignerEnvManager . getEnvManager ( ) . isOracleSystemSpace ( ) ;
boolean isOracleSystemSpace = DesignerEnvManager . getEnvManager ( ) . isOracleSystemSpace ( ) ;
// oracle不勾选显示所有表,则只显示用户下的(包括存储过程和table表)
// oracle不勾选显示所有表,则只显示用户下的(包括存储过程和table表)
DataBaseDetail detail = DataOperator . getInstance ( ) . getDataBaseDetail ( databaseName , isOracleSystemSpace ) ;
DataBaseDetail detail = DataOperator . getInstance ( ) . getDataBaseDetail ( datasource . getConnectionName ( ) , isOracleSystemSpace ) ;
if ( ArrayUtils . isNotEmpty ( detail . getSchemas ( ) ) ) {
if ( ArrayUtils . isNotEmpty ( detail . getSchemas ( ) ) ) {
schemas = detail . getSchemas ( ) ;
schemas = detail . getSchemas ( ) ;
}
}