Skip to content

Commit

Permalink
Fixed issues with loading data from database (#873)
Browse files Browse the repository at this point in the history
  • Loading branch information
@OmerBenGera
OmerBenGera committed Jan 24, 2022
1 parent b895512 commit c0271ef
Show file tree
Hide file tree
Showing 4 changed files with 163 additions and 85 deletions.
65 changes: 44 additions & 21 deletions src/main/java/com/bgsoftware/superiorskyblock/database/sql/session/MariaDBSession.java
View file
Expand Up @@ -13,7 +13,6 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;

public final class MariaDBSession implements SQLSession {

Expand Down Expand Up @@ -145,15 +144,13 @@ public QueryResult<Void> createTable(String tableName, Pair<String, String>... c
String prefix = plugin.getSettings().getDatabase().getPrefix();

return executeUpdate(String.format("CREATE TABLE IF NOT EXISTS %s%s (%s);",
prefix, tableName, columnsSection.substring(1)),
QueryResult.VOID, QueryResult::ofFail);
prefix, tableName, columnsSection.substring(1)));
}

@Override
public QueryResult<Void> renameTable(String tableName, String newName) {
String prefix = plugin.getSettings().getDatabase().getPrefix();
return executeUpdate(String.format("RENAME TABLE %s%s TO %s%s;", prefix, tableName, prefix, newName),
QueryResult.VOID, QueryResult::ofFail);
return executeUpdate(String.format("RENAME TABLE %s%s TO %s%s;", prefix, tableName, prefix, newName));
}

@Override
Expand All @@ -166,21 +163,20 @@ public QueryResult<Void> createIndex(String indexName, String tableName, String.
String prefix = plugin.getSettings().getDatabase().getPrefix();

return executeUpdate(String.format("CREATE UNIQUE INDEX %s ON %s%s (%s);", indexName, prefix, tableName,
columnsSection.substring(1)), QueryResult.VOID, QueryResult::ofFail);
columnsSection.substring(1)));
}

@Override
public QueryResult<Void> modifyColumnType(String tableName, String columnName, String newType) {
String prefix = plugin.getSettings().getDatabase().getPrefix();
return executeUpdate(String.format("ALTER TABLE %s%s MODIFY COLUMN %s %s;", prefix, tableName,
columnName, newType), QueryResult.VOID, QueryResult::ofFail);
return executeUpdate(String.format("ALTER TABLE %s%s MODIFY COLUMN %s %s;",
prefix, tableName, columnName, newType));
}

@Override
public QueryResult<ResultSet> select(String tableName, String filters) {
String prefix = plugin.getSettings().getDatabase().getPrefix();
return executeQuery(String.format("SELECT * FROM %s%s%s;", prefix, tableName, filters),
QueryResult::ofSuccess, QueryResult::ofFail);
return executeQuery(String.format("SELECT * FROM %s%s%s;", prefix, tableName, filters));
}

@Override
Expand Down Expand Up @@ -219,7 +215,7 @@ private void log(String message) {
SuperiorSkyblockPlugin.log(message);
}

private <T> T executeUpdate(String statement, T success, Function<SQLException, T> onFailure) {
private QueryResult<Void> executeUpdate(String statement) {
Preconditions.checkNotNull(this.dataSource, "Session was not initialized.");

String query = statement
Expand All @@ -232,24 +228,51 @@ private <T> T executeUpdate(String statement, T success, Function<SQLException,
PreparedStatement preparedStatement = conn.prepareStatement(query)) {
preparedStatement.executeUpdate();
} catch (SQLException error) {
return onFailure.apply(error);
return QueryResult.ofFail(error);
}

return success;
return QueryResult.VOID;
}

private <T> T executeQuery(String statement, Function<ResultSet, T> callback, Function<SQLException, T> onFailure) {
private QueryResult<ResultSet> executeQuery(String statement) {
Preconditions.checkNotNull(this.dataSource, "Session was not initialized.");

String prefix = plugin.getSettings().getDatabase().getPrefix();
String query = statement.replace("{prefix}", prefix);
String query = statement.replace("{prefix}", "");

try (Connection conn = dataSource.getConnection();
PreparedStatement preparedStatement = conn.prepareStatement(query);
ResultSet resultSet = preparedStatement.executeQuery()) {
return callback.apply(resultSet);
try {
Connection conn = this.dataSource.getConnection();
try {
PreparedStatement preparedStatement = conn.prepareStatement(query);
try {
return QueryResult.ofSuccess(preparedStatement.executeQuery()).onFinish(resultSet -> {
try {
resultSet.close();
preparedStatement.close();
conn.close();
} catch (SQLException ignored) {
}
});
} catch (SQLException error) {
QueryResult<ResultSet> queryResult = QueryResult.ofFail(error);
return queryResult.onFinish(v -> {
try {
preparedStatement.close();
conn.close();
} catch (SQLException ignored) {
}
});
}
} catch (SQLException error) {
QueryResult<ResultSet> queryResult = QueryResult.ofFail(error);
return queryResult.onFinish(v -> {
try {
conn.close();
} catch (SQLException ignored) {
}
});
}
} catch (SQLException error) {
return onFailure.apply(error);
return QueryResult.ofFail(error);
}
}

Expand Down
68 changes: 45 additions & 23 deletions src/main/java/com/bgsoftware/superiorskyblock/database/sql/session/MySQLSession.java
View file
Expand Up @@ -13,7 +13,6 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;

public final class MySQLSession implements SQLSession {

Expand Down Expand Up @@ -145,15 +144,13 @@ public QueryResult<Void> createTable(String tableName, Pair<String, String>... c
String prefix = plugin.getSettings().getDatabase().getPrefix();

return executeUpdate(String.format("CREATE TABLE IF NOT EXISTS %s%s (%s);",
prefix, tableName, columnsSection.substring(1)),
QueryResult.VOID, QueryResult::ofFail);
prefix, tableName, columnsSection.substring(1)));
}

@Override
public QueryResult<Void> renameTable(String tableName, String newName) {
String prefix = plugin.getSettings().getDatabase().getPrefix();
return executeUpdate(String.format("RENAME TABLE %s%s TO %s%s;", prefix, tableName, prefix, newName),
QueryResult.VOID, QueryResult::ofFail);
return executeUpdate(String.format("RENAME TABLE %s%s TO %s%s;", prefix, tableName, prefix, newName));
}

@Override
Expand All @@ -166,27 +163,25 @@ public QueryResult<Void> createIndex(String indexName, String tableName, String.
String prefix = plugin.getSettings().getDatabase().getPrefix();

return executeUpdate(String.format("CREATE UNIQUE INDEX %s ON %s%s (%s);", indexName, prefix, tableName,
columnsSection.substring(1)), QueryResult.VOID, QueryResult::ofFail);
columnsSection.substring(1)));
}

@Override
public QueryResult<Void> modifyColumnType(String tableName, String columnName, String newType) {
String prefix = plugin.getSettings().getDatabase().getPrefix();
return executeUpdate(String.format("ALTER TABLE %s%s MODIFY COLUMN %s %s;", prefix, tableName,
columnName, newType), QueryResult.VOID, QueryResult::ofFail);
return executeUpdate(String.format("ALTER TABLE %s%s MODIFY COLUMN %s %s;",
prefix, tableName, columnName, newType));
}

@Override
public QueryResult<ResultSet> select(String tableName, String filters) {
String prefix = plugin.getSettings().getDatabase().getPrefix();
return executeQuery(String.format("SELECT * FROM %s%s%s;", prefix, tableName, filters),
QueryResult::ofSuccess, QueryResult::ofFail);
return executeQuery(String.format("SELECT * FROM %s%s%s;", prefix, tableName, filters));
}

@Override
public QueryResult<ResultSet> setJournalMode(String jounralMode) {
return executeQuery(String.format("PRAGMA journal_mode=%s;", jounralMode),
QueryResult::ofSuccess, QueryResult::ofFail);
return executeQuery(String.format("PRAGMA journal_mode=%s;", jounralMode));
}

@Override
Expand Down Expand Up @@ -220,7 +215,7 @@ private void log(String message) {
SuperiorSkyblockPlugin.log(message);
}

private <T> T executeUpdate(String statement, T success, Function<SQLException, T> onFailure) {
private QueryResult<Void> executeUpdate(String statement) {
Preconditions.checkNotNull(this.dataSource, "Session was not initialized.");

String query = statement
Expand All @@ -233,24 +228,51 @@ private <T> T executeUpdate(String statement, T success, Function<SQLException,
PreparedStatement preparedStatement = conn.prepareStatement(query)) {
preparedStatement.executeUpdate();
} catch (SQLException error) {
return onFailure.apply(error);
return QueryResult.ofFail(error);
}

return success;
return QueryResult.VOID;
}

private <T> T executeQuery(String statement, Function<ResultSet, T> callback, Function<SQLException, T> onFailure) {
private QueryResult<ResultSet> executeQuery(String statement) {
Preconditions.checkNotNull(this.dataSource, "Session was not initialized.");

String prefix = plugin.getSettings().getDatabase().getPrefix();
String query = statement.replace("{prefix}", prefix);
String query = statement.replace("{prefix}", "");

try (Connection conn = dataSource.getConnection();
PreparedStatement preparedStatement = conn.prepareStatement(query);
ResultSet resultSet = preparedStatement.executeQuery()) {
return callback.apply(resultSet);
try {
Connection conn = this.dataSource.getConnection();
try {
PreparedStatement preparedStatement = conn.prepareStatement(query);
try {
return QueryResult.ofSuccess(preparedStatement.executeQuery()).onFinish(resultSet -> {
try {
resultSet.close();
preparedStatement.close();
conn.close();
} catch (SQLException ignored) {
}
});
} catch (SQLException error) {
QueryResult<ResultSet> queryResult = QueryResult.ofFail(error);
return queryResult.onFinish(v -> {
try {
preparedStatement.close();
conn.close();
} catch (SQLException ignored) {
}
});
}
} catch (SQLException error) {
QueryResult<ResultSet> queryResult = QueryResult.ofFail(error);
return queryResult.onFinish(v -> {
try {
conn.close();
} catch (SQLException ignored) {
}
});
}
} catch (SQLException error) {
return onFailure.apply(error);
return QueryResult.ofFail(error);
}
}

Expand Down
65 changes: 44 additions & 21 deletions src/main/java/com/bgsoftware/superiorskyblock/database/sql/session/PostgreSQLSession.java
View file
Expand Up @@ -13,7 +13,6 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;

public final class PostgreSQLSession implements SQLSession {

Expand Down Expand Up @@ -136,15 +135,13 @@ public QueryResult<Void> createTable(String tableName, Pair<String, String>... c
String prefix = plugin.getSettings().getDatabase().getPrefix();

return executeUpdate(String.format("CREATE TABLE IF NOT EXISTS %s%s (%s);",
prefix, tableName, columnsSection.substring(1)),
QueryResult.VOID, QueryResult::ofFail);
prefix, tableName, columnsSection.substring(1)));
}

@Override
public QueryResult<Void> renameTable(String tableName, String newName) {
String prefix = plugin.getSettings().getDatabase().getPrefix();
return executeUpdate(String.format("RENAME TABLE %s%s TO %s%s;", prefix, tableName, prefix, newName),
QueryResult.VOID, QueryResult::ofFail);
return executeUpdate(String.format("RENAME TABLE %s%s TO %s%s;", prefix, tableName, prefix, newName));
}

@Override
Expand All @@ -157,21 +154,20 @@ public QueryResult<Void> createIndex(String indexName, String tableName, String.
String prefix = plugin.getSettings().getDatabase().getPrefix();

return executeUpdate(String.format("CREATE UNIQUE INDEX %s ON %s%s (%s);", indexName, prefix, tableName,
columnsSection.substring(1)), QueryResult.VOID, QueryResult::ofFail);
columnsSection.substring(1)));
}

@Override
public QueryResult<Void> modifyColumnType(String tableName, String columnName, String newType) {
String prefix = plugin.getSettings().getDatabase().getPrefix();
return executeUpdate(String.format("ALTER TABLE %s%s MODIFY COLUMN %s %s;", prefix, tableName,
columnName, newType), QueryResult.VOID, QueryResult::ofFail);
return executeUpdate(String.format("ALTER TABLE %s%s MODIFY COLUMN %s %s;",
prefix, tableName, columnName, newType));
}

@Override
public QueryResult<ResultSet> select(String tableName, String filters) {
String prefix = plugin.getSettings().getDatabase().getPrefix();
return executeQuery(String.format("SELECT * FROM %s%s%s;", prefix, tableName, filters),
QueryResult::ofSuccess, QueryResult::ofFail);
return executeQuery(String.format("SELECT * FROM %s%s%s;", prefix, tableName, filters));
}

@Override
Expand Down Expand Up @@ -210,7 +206,7 @@ private void log(String message) {
SuperiorSkyblockPlugin.log(message);
}

private <T> T executeUpdate(String statement, T success, Function<SQLException, T> onFailure) {
private QueryResult<Void> executeUpdate(String statement) {
Preconditions.checkNotNull(this.dataSource, "Session was not initialized.");

String query = statement
Expand All @@ -223,24 +219,51 @@ private <T> T executeUpdate(String statement, T success, Function<SQLException,
PreparedStatement preparedStatement = conn.prepareStatement(query)) {
preparedStatement.executeUpdate();
} catch (SQLException error) {
return onFailure.apply(error);
return QueryResult.ofFail(error);
}

return success;
return QueryResult.VOID;
}

private <T> T executeQuery(String statement, Function<ResultSet, T> callback, Function<SQLException, T> onFailure) {
private QueryResult<ResultSet> executeQuery(String statement) {
Preconditions.checkNotNull(this.dataSource, "Session was not initialized.");

String prefix = plugin.getSettings().getDatabase().getPrefix();
String query = statement.replace("{prefix}", prefix);
String query = statement.replace("{prefix}", "");

try (Connection conn = dataSource.getConnection();
PreparedStatement preparedStatement = conn.prepareStatement(query);
ResultSet resultSet = preparedStatement.executeQuery()) {
return callback.apply(resultSet);
try {
Connection conn = this.dataSource.getConnection();
try {
PreparedStatement preparedStatement = conn.prepareStatement(query);
try {
return QueryResult.ofSuccess(preparedStatement.executeQuery()).onFinish(resultSet -> {
try {
resultSet.close();
preparedStatement.close();
conn.close();
} catch (SQLException ignored) {
}
});
} catch (SQLException error) {
QueryResult<ResultSet> queryResult = QueryResult.ofFail(error);
return queryResult.onFinish(v -> {
try {
preparedStatement.close();
conn.close();
} catch (SQLException ignored) {
}
});
}
} catch (SQLException error) {
QueryResult<ResultSet> queryResult = QueryResult.ofFail(error);
return queryResult.onFinish(v -> {
try {
conn.close();
} catch (SQLException ignored) {
}
});
}
} catch (SQLException error) {
return onFailure.apply(error);
return QueryResult.ofFail(error);
}
}

Expand Down

0 comments on commit c0271ef

Please sign in to comment.