Skip to content

Commit 7a640c4

Browse files
authored
1.2.3-SNAPSHOT
1 parent a1eeb6a commit 7a640c4

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
lines changed

pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>net.herospvp</groupId>
88
<artifactId>database-lib</artifactId>
9-
<version>1.2.2-SNAPSHOT</version>
9+
<version>1.2.3-SNAPSHOT</version>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>
@@ -29,6 +29,16 @@
2929
<artifactId>annotations</artifactId>
3030
<version>16.0.1</version>
3131
</dependency>
32+
<dependency>
33+
<groupId>org.mariadb.jdbc</groupId>
34+
<artifactId>mariadb-java-client</artifactId>
35+
<version>2.1.2</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>mysql</groupId>
39+
<artifactId>mysql-connector-java</artifactId>
40+
<version>8.0.23</version>
41+
</dependency>
3242
</dependencies>
3343

3444
</project>

src/main/java/net/herospvp/database/Director.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Director {
1818
public Director() {
1919
this.instrumentsCollection = new HashMap<>();
2020
this.musicians = new ArrayList<>();
21-
System.out.println("[database-lib] Currently using version: 1.2.2-SNAPSHOT");
21+
System.out.println("[database-lib] Currently using version: 1.2.3-SNAPSHOT");
2222
}
2323

2424
public void addInstrument(String name, Instrument instrument) {

src/main/java/net/herospvp/database/items/Instrument.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,33 @@ public class Instrument {
1616
@Getter
1717
private final DataSource dataSource;
1818
@Getter
19-
private final String ip, port, user, password, database;
19+
private final String ip, port, user, password, database, flags, url, driverClassName;
2020

2121
public Instrument(String ip, String port, String user, String password, String database, @Nullable String flags,
22+
@Nullable String url, @Nullable String driverClassName,
2223
@Nullable Map<String, String> properties, boolean useDefaults, int poolSize) {
2324

2425
this.ip = ip;
2526
this.port = port;
2627
this.user = user;
2728
this.password = password;
2829
this.database = database;
30+
this.flags = flags;
31+
this.url = url;
32+
this.driverClassName = driverClassName;
2933

3034
HikariConfig config = new HikariConfig();
31-
config.setJdbcUrl("jdbc:mysql://" + ip + ":" + port + "/" + database + (flags == null ? "" : flags));
35+
36+
if (driverClassName != null) {
37+
config.setDriverClassName(driverClassName);
38+
}
39+
40+
config.setJdbcUrl(
41+
url == null ? "jdbc:mysql" : url +
42+
"://" + ip + ":" + port + "/" + database
43+
+ (flags == null ? "" : flags)
44+
);
45+
3246
config.setUsername(user);
3347
config.setPassword(password);
3448

0 commit comments

Comments
 (0)