Upstream
/
Minepacks
mirror of https://github.com/GeorgH93/Minepacks.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary replaceAll

This commit is contained in:
GeorgH93 2023-12-19 14:56:32 +01:00
parent ad22323fce
commit 6f6106fe62
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/MySQL.java
View File

@ -38,7 +38,7 @@ public class MySQL extends SQL
protected void updateQueriesForDialect()
{
queryDeleteOldBackpacks = "DELETE FROM {TableBackpacks} WHERE {FieldBPLastUpdate} + INTERVAL {VarMaxAge} day < NOW()";
queryUpdateBp = queryUpdateBp.replaceAll("\\{NOW}", "NOW()");
queryUpdateBp = queryUpdateBp.replace("{NOW}", "NOW()");
}
@Override

12
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQL.java
View File

@ -32,6 +32,7 @@ import org.intellij.lang.annotations.Language;
import org.jetbrains.annotations.NotNull;
import java.sql.*;
import java.util.logging.Level;
public abstract class SQL extends Database
{
@ -163,10 +164,10 @@ public abstract class SQL extends Database
protected String replacePlaceholders(@Language("SQL") String query)
{
return query.replaceAll("(\\{\\w+})", "`$1`").replaceAll("`(\\{\\w+})`_(\\w+)", "`$1_$2`").replaceAll("fk_`(\\{\\w+})`_`(\\{\\w+})`_`(\\{\\w+})`", "`fk_$1_$2_$3`") // Fix name formatting
.replaceAll("\\{TablePlayers}", tablePlayers).replaceAll("\\{FieldName}", fieldPlayerName).replaceAll("\\{FieldUUID}", fieldPlayerUUID).replaceAll("\\{FieldPlayerID}", fieldPlayerID) // Players
.replaceAll("\\{TableBackpacks}", tableBackpacks).replaceAll("\\{FieldBPOwner}", fieldBpOwner).replaceAll("\\{FieldBPITS}", fieldBpIts) // Backpacks
.replaceAll("\\{FieldBPVersion}", fieldBpVersion).replaceAll("\\{FieldBPLastUpdate}", fieldBpLastUpdate) // Backpacks
.replaceAll("\\{TableCooldowns}", tableCooldowns).replaceAll("\\{FieldCDPlayer}", fieldCdPlayer).replaceAll("\\{FieldCDTime}", fieldCdTime); // Cooldowns
.replace("{TablePlayers}", tablePlayers).replace("{FieldName}", fieldPlayerName).replace("{FieldUUID}", fieldPlayerUUID).replace("{FieldPlayerID}", fieldPlayerID) // Players
.replace("{TableBackpacks}", tableBackpacks).replace("{FieldBPOwner}", fieldBpOwner).replace("{FieldBPITS}", fieldBpIts) // Backpacks
.replace("{FieldBPVersion}", fieldBpVersion).replace("{FieldBPLastUpdate}", fieldBpLastUpdate) // Backpacks
.replace("{TableCooldowns}", tableCooldowns).replace("{FieldCDPlayer}", fieldCdPlayer).replace("{FieldCDTime}", fieldCdTime); // Cooldowns
}
protected void runStatementAsync(final String query, final Object... args)
@ -186,8 +187,7 @@ public abstract class SQL extends Database
}
catch(SQLException e)
{
plugin.getLogger().severe("Query: " + query);
e.printStackTrace();
plugin.getLogger().log(Level.SEVERE, e, () -> "Query: " + query);
}
}