From 46273b33012c0ce2da5e6d3d79d618053e9785a6 Mon Sep 17 00:00:00 2001 From: Paldiu Date: Mon, 1 Mar 2021 23:03:13 -0600 Subject: [PATCH] Revert "SQL PreparedStatement Fixes" This reverts commit 17347c23a58f6bc22ecf9082f01ffa84f989ca7d. --- .../totalfreedommod/sql/SQLite.java | 43 ++++++------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java index 9fc041cb..09551e02 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java @@ -16,6 +16,8 @@ import me.totalfreedom.totalfreedommod.util.FUtil; public class SQLite extends FreedomService { + private final String FILE_NAME = "database.db"; + private Connection connection; @Override @@ -35,7 +37,6 @@ public class SQLite extends FreedomService { try { - String FILE_NAME = "database.db"; connection = DriverManager.getConnection("jdbc:sqlite:" + plugin.getDataFolder() + "/" + FILE_NAME); FLog.info("Successfully connected to the database."); } @@ -110,9 +111,7 @@ public class SQLite extends FreedomService { try { - PreparedStatement statement = connection.prepareStatement("DELETE FROM ?"); - statement.setString(1, table); - statement.execute(); + connection.createStatement().execute("DELETE FROM " + table); } catch (SQLException e) { @@ -135,8 +134,7 @@ public class SQLite extends FreedomService try { Object[] data = {key, admin.getName()}; - PreparedStatement statement = connection.prepareStatement("?"); - statement.setString(1, MessageFormat.format("UPDATE admins SET {0}=? WHERE username=''{1}''", data)); + PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE username=''{1}''", data)); statement = setUnknownType(statement, 1, value); statement.executeUpdate(); @@ -153,8 +151,7 @@ public class SQLite extends FreedomService try { Object[] data = {key, player.getName()}; - PreparedStatement statement = connection.prepareStatement("?"); - statement.setString(1, MessageFormat.format("UPDATE players SET {0}=? WHERE username=''{1}''", data)); + PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE username=''{1}''", data)); statement = setUnknownType(statement, 1, value); statement.executeUpdate(); @@ -169,8 +166,7 @@ public class SQLite extends FreedomService { try { - PreparedStatement statement = connection.prepareStatement("?"); - statement.setString(1, MessageFormat.format("UPDATE admins SET username=? WHERE username=''{0}''", oldName)); + PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET username=? WHERE username=''{0}''", oldName)); statement = setUnknownType(statement, 1, newName); statement.executeUpdate(); @@ -185,8 +181,7 @@ public class SQLite extends FreedomService { try { - PreparedStatement statement = connection.prepareStatement("?"); - statement.setString(1, MessageFormat.format("UPDATE players SET username=? WHERE username=''{0}''", oldName)); + PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET username=? WHERE username=''{0}''", oldName)); statement = setUnknownType(statement, 1, newName); statement.executeUpdate(); @@ -304,9 +299,7 @@ public class SQLite extends FreedomService { try { - PreparedStatement statement = connection.prepareStatement("?"); - statement.setString(1, MessageFormat.format("SELECT * FROM admins WHERE username=''{0}''", name)); - ResultSet resultSet = statement.executeQuery(); + ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM admins WHERE username=''{0}''", name)); if (resultSet.next()) { return resultSet; @@ -325,9 +318,7 @@ public class SQLite extends FreedomService { try { - PreparedStatement statement = connection.prepareStatement("?"); - statement.setString(1, MessageFormat.format("SELECT * FROM players WHERE username=''{0}''", name)); - ResultSet resultSet = statement.executeQuery(); + ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM players WHERE username=''{0}''", name)); if (resultSet.next()) { return resultSet; @@ -361,9 +352,7 @@ public class SQLite extends FreedomService { try { - PreparedStatement statement = connection.prepareStatement("?"); - statement.setString(1, MessageFormat.format("SELECT * FROM players WHERE ips LIKE ''%{0}%''", ip)); - ResultSet resultSet = statement.executeQuery(); + ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM players WHERE ips LIKE ''%{0}%''", ip)); if (resultSet.next()) { return resultSet; @@ -382,9 +371,7 @@ public class SQLite extends FreedomService { try { - PreparedStatement statement = connection.prepareStatement("?"); - statement.setString(1, MessageFormat.format("DELETE FROM admins where name=''{0}''", admin.getName())); - statement.executeUpdate(); + connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM admins where name=''{0}''", admin.getName())); } catch (SQLException e) { @@ -422,14 +409,10 @@ public class SQLite extends FreedomService { try { - PreparedStatement statement = connection.prepareStatement("?"); - statement.setString(1, MessageFormat.format("DELETE FROM bans WHERE name=''{0}''", ban.getUsername())); - statement.executeUpdate(); + connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM bans WHERE name=''{0}''", ban.getUsername())); for (String ip : ban.getIps()) { - PreparedStatement statement1 = connection.prepareStatement("?"); - statement1.setString(1, MessageFormat.format("DELETE FROM bans WHERE ips LIKE ''%{0}%''", ip)); - statement1.executeUpdate(); + connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM bans WHERE ips LIKE ''%{0}%''", ip)); } } catch (SQLException e)