|
|
|
@ -21,8 +21,8 @@ import com.fr.event.EventDispatcher;
|
|
|
|
|
import com.fr.file.ConnectionConfig; |
|
|
|
|
import com.fr.file.ConnectionOperator; |
|
|
|
|
import com.fr.general.NameObject; |
|
|
|
|
import com.fr.license.database.BaseDataBaseTypePoint; |
|
|
|
|
import com.fr.license.database.DBTypes; |
|
|
|
|
import com.fr.license.database.DataBaseTypePointManager; |
|
|
|
|
import com.fr.license.exception.DataBaseNotSupportedException; |
|
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
|
import com.fr.stable.ArrayUtils; |
|
|
|
@ -279,8 +279,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
|
|
|
|
|
Connection connection = bean.getConnection(); |
|
|
|
|
// 仅校验jdbc连接,其他插件数据连接不进行校验
|
|
|
|
|
if (connection instanceof JDBCDatabaseConnection) { |
|
|
|
|
BaseDataBaseTypePoint dataBaseTypePoint = BaseDataBaseTypePoint.getDataBaseTypePoint(connection.getDriver(), connection.feature()); |
|
|
|
|
|
|
|
|
|
DBTypes dataBaseTypePoint = DataBaseTypePointManager.getInstance().getDataBaseTypePoint(connection.getDriver(), connection.feature()); |
|
|
|
|
if (connectionIsNotSupported(connection, dataBaseTypePoint)) { |
|
|
|
|
notSupportedConnections.addAll(dataBaseTypePoint.getDataBaseType()); |
|
|
|
|
} |
|
|
|
@ -296,9 +295,9 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
|
|
|
|
|
/** |
|
|
|
|
* 校验当前数据连接是否被限制 |
|
|
|
|
*/ |
|
|
|
|
private static boolean connectionIsNotSupported(Connection connection, BaseDataBaseTypePoint dataBaseTypePoint) { |
|
|
|
|
private static boolean connectionIsNotSupported(Connection connection, DBTypes dataBaseTypePoint) { |
|
|
|
|
return !validateFRDemo(connection.getDriver(), connection.feature()) && |
|
|
|
|
(dataBaseTypePoint != null && !supportedDatabaseTypes.containsAll(dataBaseTypePoint.getDatabaseType())); |
|
|
|
|
(dataBaseTypePoint != null && !supportedDatabaseTypes.containsAll(dataBaseTypePoint.getDataBaseType())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|