diff --git a/src/main/java/netneutrality/db/MysqlDatabase.java b/src/main/java/netneutrality/db/MysqlDatabase.java index a3be18d..ba7aab7 100644 --- a/src/main/java/netneutrality/db/MysqlDatabase.java +++ b/src/main/java/netneutrality/db/MysqlDatabase.java @@ -135,9 +135,10 @@ public class MysqlDatabase { * * @param sql The SQL query to execute * @param params The parameters to include in the query - * @return a ResultSet object, which can be converted to a model using {@link MysqlDatabase#convertToTableModel(ResultSet)} + * @return a ResultSet object, which can be converted to a model using {@link MysqlDatabase#convertToTableModel(ResultSet, String)} */ protected synchronized ResultSet prepareAndExecute(String sql, Object... params) { + logger.debug(sql); try { PreparedStatement query = connection.prepareStatement(sql); @@ -157,7 +158,7 @@ public class MysqlDatabase { * * @param sql The SQL query to execute * @param params The parameters to include in the query - * @return a ResultSet object, which can be converted to a model using {@link MysqlDatabase#convertToTableModel(ResultSet)} + * @return a ResultSet object, which can be converted to a model using {@link MysqlDatabase#convertToTableModel(ResultSet, String)} */ public AsyncMySqlAction prepareAndExecuteAsync(String sql, Object... params) { return new AsyncMySqlAction(this, sql, params); diff --git a/src/main/java/netneutrality/db/controllers/DBLogging.java b/src/main/java/netneutrality/db/controllers/DBLogging.java index d7fc6b4..f874553 100644 --- a/src/main/java/netneutrality/db/controllers/DBLogging.java +++ b/src/main/java/netneutrality/db/controllers/DBLogging.java @@ -23,7 +23,7 @@ import java.util.function.Consumer; public class DBLogging extends AbstractController { public void getLoggingChannel(String serverId, Consumer success) { - database.prepareAndExecuteAsync("SELECT channelId FROM logging WHERE serverId = ?", serverId).async((table) -> { + database.prepareAndExecuteAsync("SELECT channelId FROM logging WHERE guild_id = ?", serverId).async((table) -> { TextChannel txt = MusicBot.getJDA().getGuildById(serverId).getTextChannelById((String) table.getRow(0).get(0)); success.accept(txt); @@ -36,11 +36,11 @@ public class DBLogging extends AbstractController { } public void toggleLog(String serverId, String channelId) { - database.prepareAndExecuteAsync("UPDATE logging SET enabled = NOT enabled WHERE serverId = ? AND channelId = ?", serverId, channelId).blocking(); + database.prepareAndExecuteAsync("UPDATE logging SET enabled = NOT enabled WHERE guild_id = ? AND channelId = ?", serverId, channelId).blocking(); } public boolean isLoggingEnabled(String serverId, String channelId) { - MTableModel table = database.prepareAndExecuteAsync("SELECT enabled FROM logging WHERE serverId = ? AND channelId = ?", serverId, channelId).blocking(); + MTableModel table = database.prepareAndExecuteAsync("SELECT enabled FROM logging WHERE guild_id = ? AND channelId = ?", serverId, channelId).blocking(); return Boolean.parseBoolean((String) table.getRow(0).get(0)); }