Skip to content

Commit

Permalink
2.0.1-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
hteppl committed Sep 9, 2021
1 parent f66ff41 commit 0ba1cc5
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>me.hteppl</groupId>
<artifactId>DataManager</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/me/hteppl/data/DataManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class DataManager extends PluginBase {

private static String sqliteFolder;

private static String mysqlTimezone;
private static String mysqlFlags;

public static int mysqlValidation;

Expand All @@ -22,7 +22,7 @@ public void onEnable() {
Config config = this.getConfig();

sqliteFolder = Server.getInstance().getFilePath() + config.getString("sqlite");
mysqlTimezone = config.getString("mysql-timezone");
mysqlFlags = config.getString("mysql-flags");
mysqlValidation = config.getInt("mysql-validation");

new File(sqliteFolder).mkdirs();
Expand All @@ -39,8 +39,7 @@ public static Sql2o getMySQLConnection(String database, String host, int port, S
StringBuilder url = new StringBuilder(host);
if (port >= 0) url.append(":").append(port);
url.append("/").append(database)
.append("?useSSL=false&autoReconnect=true&useUnicode=true&serverTimezone=")
.append(mysqlTimezone);
.append("?").append(mysqlFlags);

return new Sql2o("jdbc:mysql://" + url, user, password);
} catch (Exception exception) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/me/hteppl/data/Sql2oDatabase.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ public interface Sql2oDatabase {

void executeScheme(String scheme);

String getDbName();

}
7 changes: 7 additions & 0 deletions src/main/java/me/hteppl/data/database/MySQLDatabase.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ public class MySQLDatabase implements Sql2oDatabase {

private Connection connection;

private final String dbName;

public MySQLDatabase(String database, String host, String user, String password) {
this.dbName = database;
this.database = DataManager.getMySQLConnection(database, host, user, password);
this.connection = this.database.open();
}
Expand Down Expand Up @@ -44,4 +47,8 @@ public void executeScheme(String scheme) {
public Sql2o getDatabase() {
return this.database;
}

public String getDbName() {
return dbName;
}
}
8 changes: 8 additions & 0 deletions src/main/java/me/hteppl/data/database/SQLiteDatabase.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ public class SQLiteDatabase implements Sql2oDatabase {

private final Sql2o database;

private final String dbName;

public SQLiteDatabase(String dbName) {
this.dbName = dbName;
this.database = DataManager.getSQLiteConnection(dbName);
}

public SQLiteDatabase(String dbName, String folder) {
this.dbName = dbName;
this.database = DataManager.getSQLiteConnection(dbName, folder);
}

Expand All @@ -36,4 +40,8 @@ public Connection getConnection() {
public Sql2o getDatabase() {
return this.database;
}

public String getDbName() {
return dbName;
}
}
6 changes: 3 additions & 3 deletions src/main/resources/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# default folder for saving sqlite tables
# default folder for saving sqlite tables (near worlds, plugins, etc.)
sqlite: database

# mysql server timezone
mysql-timezone: UTC
# mysql connection flags
mysql-flags: useSSL=false&autoReconnect=true&useUnicode=true&serverTimezone=UTC

# mysql connection validation (in seconds)
mysql-validation: 20

0 comments on commit 0ba1cc5

Please sign in to comment.