diff --git a/dinky-admin/src/main/java/org/dinky/configure/DatabaseFlywayMigration.java b/dinky-admin/src/main/java/org/dinky/configure/DatabaseFlywayMigration.java index a7bb4d90b4..8035edbd06 100644 --- a/dinky-admin/src/main/java/org/dinky/configure/DatabaseFlywayMigration.java +++ b/dinky-admin/src/main/java/org/dinky/configure/DatabaseFlywayMigration.java @@ -61,6 +61,10 @@ public class DatabaseFlywayMigration { private final FlywayProperties flywayProperties; private final DataSourceProperties dataSourceProperties; + /** + * The reason why hikariDataSource is used here is because Dinky uses a Druid connection pool, which can cause some flyway SQL to be intercepted during execution, resulting in automatic upgrade failure + * @return dataSource + */ private DataSource dataSource() { HikariDataSource hikariDataSource = new HikariDataSource(); hikariDataSource.setJdbcUrl(dataSourceProperties.getUrl()); diff --git a/dinky-web/package.json b/dinky-web/package.json index 81f1ec871a..6f75e728b6 100644 --- a/dinky-web/package.json +++ b/dinky-web/package.json @@ -40,7 +40,7 @@ "@ant-design/icons": "^5.3.7", "@ant-design/pro-components": "^2.7.10", "@ant-design/pro-layout": "^7.19.8", - "@ant-design/pro-table": "^3.16.1", + "@ant-design/pro-table": "^3.16.6", "@ant-design/use-emotion-css": "^1.0.4", "@antv/g2": "^5.2.0", "@antv/layout": "0.3.25",