issue-23 fix postgreSQL

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "org.lushplugins"
-version = "3.3.0"
+version = "3.3.1"
 
 repositories {
     mavenLocal()

src/main/java/org/lushplugins/lushrewards/storage/type/AbstractSQLStorage.java

@@ -44,7 +44,7 @@ public JsonObject loadModuleUserDataJson(UUID uuid, String moduleId) {
         assertJsonColumn(table, column);
 
         try (Connection conn = conn();
-             PreparedStatement stmt = conn.prepareStatement(String.format("SELECT `%s` FROM `%s` WHERE uuid = ?;", column, table))
+             PreparedStatement stmt = conn.prepareStatement(String.format("SELECT %s FROM %s WHERE uuid = ?;", column, table))
         ) {
             setUUIDToStatement(stmt, 1, uuid);
 
@@ -101,7 +101,7 @@ public void saveModuleUserData(UserDataModule.UserData userData) {
     protected void assertTable(String table) {
         try (Connection conn = conn();
              PreparedStatement stmt = conn.prepareStatement(
-                 String.format("CREATE TABLE IF NOT EXISTS `%s`(uuid CHAR(36) NOT NULL, PRIMARY KEY (uuid));", table))
+                 String.format("CREATE TABLE IF NOT EXISTS %s(uuid CHAR(36) NOT NULL, PRIMARY KEY (uuid));", table))
         ) {
             stmt.execute();
         } catch (SQLException e) {

src/main/java/org/lushplugins/lushrewards/storage/type/PostgreSQLStorage.java

@@ -20,8 +20,8 @@ public class PostgreSQLStorage extends AbstractSQLStorage {
     @Override
     protected String getInsertOrUpdateStatement(String table, String column) {
         return MessageFormat.format(
-            "INSERT INTO `{0}`(uuid, `{1}`) VALUES(?, ?) ON CONFLICT (uuid) DO UPDATE SET `{1}` = EXCLUDED.`{1}`;",
-            table, column
+                "INSERT INTO {0}(uuid, {1}) VALUES(?, ?) ON CONFLICT (uuid) DO UPDATE SET {1} = EXCLUDED.{1};",
+                table, column
         );
     }
 
@@ -48,13 +48,13 @@ protected void assertColumn(String table, String column, String type) {
         assertTable(table);
 
         try (Connection conn = conn();
-             PreparedStatement stmt = conn.prepareStatement(String.format("SELECT `%s` FROM `%s`", column, table))
+             PreparedStatement stmt = conn.prepareStatement(String.format("SELECT %s FROM %s", column, table))
         ) {
             stmt.executeQuery();
         } catch (SQLException assertException) {
             if (Objects.equals(assertException.getSQLState(), "42703")) { // Undefined column error code
                 try (Connection conn = conn();
-                     PreparedStatement stmt = conn.prepareStatement(String.format("ALTER TABLE `%s` ADD COLUMN `%s` %s;", table, column, type))
+                     PreparedStatement stmt = conn.prepareStatement(String.format("ALTER TABLE %s ADD COLUMN %s %s;", table, column, type))
                 ) {
                     stmt.execute();
                 } catch (SQLException alterException) {
@@ -66,6 +66,18 @@ protected void assertColumn(String table, String column, String type) {
         }
     }
 
+    @Override
+    protected void assertTable(String table) {
+        try (Connection conn = conn();
+             PreparedStatement stmt = conn.prepareStatement(
+                     String.format("CREATE TABLE IF NOT EXISTS %s(uuid UUID NOT NULL, PRIMARY KEY (uuid));", table))
+        ) {
+            stmt.execute();
+        } catch (SQLException e) {
+            LushRewards.getInstance().getLogger().log(Level.SEVERE, "Failed to assert table: ", e);
+        }
+    }
+
     @Override
     protected String formatHeader(String string) {
         return string.replace("-", "_");