Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BugFix] [Git]Fix the issue of unlimited refresh of Git project pages #3791

Merged
merged 1 commit into from
Sep 9, 2024
Merged

[BugFix] [Git]Fix the issue of unlimited refresh of Git project pages #3791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dinky-admin/src/main/java/org/dinky/configure/DatabaseFlywayMigration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion dinky-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading