Skip to content

Add HikariDataSource to mysql-loader #167

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

Merged
davidmayr merged 2 commits into from
Jun 28, 2025
Merged

Add HikariDataSource to mysql-loader #167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f12fe4a
feat(mysql-loader): add constructor that accepts HikariDataSource
edoardomannino Jun 21, 2025
c9e116a
feat(mysql-loader): add ApiStatus.Experimental to constructor
edoardomannino Jun 21, 2025
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
32 changes: 21 additions & 11 deletions loaders/mysql-loader/src/main/java/com/infernalsuite/asp/loaders/mysql/MysqlLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.infernalsuite.asp.api.loaders.UpdatableLoader;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import org.jetbrains.annotations.ApiStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -65,18 +66,13 @@ public MysqlLoader(String sqlURL, String host, int port, String database, boolea
hikariConfig.addDataSourceProperty("maintainTimeStats", "false");

source = new HikariDataSource(hikariConfig);
init();
}

try (Connection con = source.getConnection()) {
// Create worlds table
try (PreparedStatement statement = con.prepareStatement(CREATE_WORLDS_TABLE_QUERY)) {
statement.execute();
}

// Create versioning table
try (PreparedStatement statement = con.prepareStatement(CREATE_VERSIONING_TABLE_QUERY)) {
statement.execute();
}
}
@ApiStatus.Experimental
public MysqlLoader(HikariDataSource hikariDataSource) throws SQLException {
source = hikariDataSource;
init();
}

@Override
Expand Down Expand Up @@ -199,4 +195,18 @@ public void deleteWorld(String worldName) throws IOException, UnknownWorldExcept
}
}

private void init() throws SQLException {
try (Connection con = source.getConnection()) {
// Create worlds table
try (PreparedStatement statement = con.prepareStatement(CREATE_WORLDS_TABLE_QUERY)) {
statement.execute();
}

// Create versioning table
try (PreparedStatement statement = con.prepareStatement(CREATE_VERSIONING_TABLE_QUERY)) {
statement.execute();
}
}
}

}