Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-19 14:59:21 +00:00
Code Issues Releases Activity

refactor: adjust postgres statements

Browse Source
This commit is contained in:
William
2024-09-29 13:35:28 +01:00
parent a5efeecad3
commit abdf8223fc
1 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
common/src/main/java/net/william278/husksync/database/PostgresDatabase.java
View File

@@ -137,9 +137,9 @@ public class PostgresDatabase extends Database {
// Update a user's name if it has changed in the database // Update a user's name if it has changed in the database
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
UPDATE "%users_table%" UPDATE %users_table%
SET "username"=? SET username=?
WHERE "uuid"=?"""))) { WHERE uuid=?;"""))) {
statement.setString(1, user.getUsername()); statement.setString(1, user.getUsername());
statement.setObject(2, existingUser.getUuid()); statement.setObject(2, existingUser.getUuid());
@@ -155,7 +155,7 @@ public class PostgresDatabase extends Database {
// Insert new player data into the database // Insert new player data into the database
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
INSERT INTO "%users_table%" ("uuid","username") INSERT INTO %users_table% (uuid,username)
VALUES (?,?);"""))) { VALUES (?,?);"""))) {
statement.setObject(1, user.getUuid()); statement.setObject(1, user.getUuid());
@@ -174,9 +174,9 @@ public class PostgresDatabase extends Database {
public Optional<User> getUser(@NotNull UUID uuid) { public Optional<User> getUser(@NotNull UUID uuid) {
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
SELECT "uuid", "username" SELECT uuid, username
FROM "%users_table%" FROM %users_table%
WHERE "uuid"=?"""))) { WHERE uuid=?;"""))) {
statement.setObject(1, uuid); statement.setObject(1, uuid);
@@ -197,9 +197,9 @@ public class PostgresDatabase extends Database {
public Optional<User> getUserByName(@NotNull String username) { public Optional<User> getUserByName(@NotNull String username) {
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
SELECT "uuid", "username" SELECT uuid, username
FROM "%users_table%" FROM %users_table%
WHERE "username"=?"""))) { WHERE username=?;"""))) {
statement.setString(1, username); statement.setString(1, username);
final ResultSet resultSet = statement.executeQuery(); final ResultSet resultSet = statement.executeQuery();
@@ -221,8 +221,8 @@ public class PostgresDatabase extends Database {
final List<User> users = Lists.newArrayList(); final List<User> users = Lists.newArrayList();
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
SELECT `uuid`, `username` SELECT uuid, username
FROM `%users_table%`; FROM %users_table%;
"""))) { """))) {
final ResultSet resultSet = statement.executeQuery(); final ResultSet resultSet = statement.executeQuery();
while (resultSet.next()) { while (resultSet.next()) {
@@ -241,10 +241,10 @@ public class PostgresDatabase extends Database {
public Optional<DataSnapshot.Packed> getLatestSnapshot(@NotNull User user) { public Optional<DataSnapshot.Packed> getLatestSnapshot(@NotNull User user) {
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
SELECT "version_uuid", "timestamp", "data" SELECT version_uuid, timestamp, data
FROM "%user_data_table%" FROM %user_data_table%
WHERE "player_uuid"=? WHERE player_uuid=?
ORDER BY "timestamp" DESC ORDER BY timestamp DESC
LIMIT 1;"""))) { LIMIT 1;"""))) {
statement.setObject(1, user.getUuid()); statement.setObject(1, user.getUuid());
final ResultSet resultSet = statement.executeQuery(); final ResultSet resultSet = statement.executeQuery();
@@ -270,10 +270,10 @@ public class PostgresDatabase extends Database {
final List<DataSnapshot.Packed> retrievedData = Lists.newArrayList(); final List<DataSnapshot.Packed> retrievedData = Lists.newArrayList();
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
SELECT "version_uuid", "timestamp", "data" SELECT version_uuid, timestamp, data
FROM "%user_data_table%" FROM %user_data_table%
WHERE "player_uuid"=? WHERE player_uuid=?
ORDER BY "timestamp" DESC;"""))) { ORDER BY timestamp DESC;"""))) {
statement.setObject(1, user.getUuid()); statement.setObject(1, user.getUuid());
final ResultSet resultSet = statement.executeQuery(); final ResultSet resultSet = statement.executeQuery();
while (resultSet.next()) { while (resultSet.next()) {
@@ -297,10 +297,10 @@ public class PostgresDatabase extends Database {
public Optional<DataSnapshot.Packed> getSnapshot(@NotNull User user, @NotNull UUID versionUuid) { public Optional<DataSnapshot.Packed> getSnapshot(@NotNull User user, @NotNull UUID versionUuid) {
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
SELECT "version_uuid", "timestamp", "data" SELECT version_uuid, timestamp, data
FROM "%user_data_table%" FROM %user_data_table%
WHERE "player_uuid"=? AND "version_uuid"=? WHERE player_uuid=? AND version_uuid=?
ORDER BY "timestamp" DESC ORDER BY timestamp DESC
LIMIT 1;"""))) { LIMIT 1;"""))) {
statement.setObject(1, user.getUuid()); statement.setObject(1, user.getUuid());
statement.setObject(2, versionUuid); statement.setObject(2, versionUuid);
@@ -328,10 +328,10 @@ public class PostgresDatabase extends Database {
if (unpinnedUserData.size() > maxSnapshots) { if (unpinnedUserData.size() > maxSnapshots) {
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
DELETE FROM "%user_data_table%" DELETE FROM %user_data_table%
WHERE "player_uuid"=? WHERE player_uuid=?
AND "pinned" = FALSE AND pinned=FALSE
ORDER BY "timestamp" ASC ORDER BY timestamp ASC
LIMIT %entry_count%;""".replace("%entry_count%", LIMIT %entry_count%;""".replace("%entry_count%",
Integer.toString(unpinnedUserData.size() - maxSnapshots))))) { Integer.toString(unpinnedUserData.size() - maxSnapshots))))) {
statement.setObject(1, user.getUuid()); statement.setObject(1, user.getUuid());
@@ -348,8 +348,8 @@ public class PostgresDatabase extends Database {
public boolean deleteSnapshot(@NotNull User user, @NotNull UUID versionUuid) { public boolean deleteSnapshot(@NotNull User user, @NotNull UUID versionUuid) {
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
DELETE FROM "%user_data_table%" DELETE FROM %user_data_table%
WHERE "player_uuid"=? AND "version_uuid"=? WHERE player_uuid=? AND version_uuid=?
LIMIT 1;"""))) { LIMIT 1;"""))) {
statement.setObject(1, user.getUuid()); statement.setObject(1, user.getUuid());
statement.setString(2, versionUuid.toString()); statement.setString(2, versionUuid.toString());
@@ -366,12 +366,12 @@ public class PostgresDatabase extends Database {
protected void rotateLatestSnapshot(@NotNull User user, @NotNull OffsetDateTime within) { protected void rotateLatestSnapshot(@NotNull User user, @NotNull OffsetDateTime within) {
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
DELETE FROM "%user_data_table%" DELETE FROM %user_data_table%
WHERE "player_uuid"=? AND "timestamp" = ( WHERE player_uuid=? AND timestamp = (
SELECT "timestamp" SELECT timestamp
FROM "%user_data_table%" FROM %user_data_table%
WHERE "player_uuid"=? AND "timestamp" > ? AND "pinned" = FALSE WHERE player_uuid=? AND timestamp > ? AND pinned=FALSE
ORDER BY "timestamp" ASC ORDER BY timestamp ASC
LIMIT 1 LIMIT 1
);"""))) { );"""))) {
statement.setObject(1, user.getUuid()); statement.setObject(1, user.getUuid());
@@ -389,8 +389,8 @@ public class PostgresDatabase extends Database {
protected void createSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed data) { protected void createSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed data) {
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
INSERT INTO "%user_data_table%" INSERT INTO %user_data_table%
("player_uuid","version_uuid","timestamp","save_cause","pinned","data") (player_uuid,version_uuid,timestamp,save_cause,pinned,data)
VALUES (?,?,?,?,?,?);"""))) { VALUES (?,?,?,?,?,?);"""))) {
statement.setObject(1, user.getUuid()); statement.setObject(1, user.getUuid());
statement.setObject(2, data.getId()); statement.setObject(2, data.getId());
@@ -410,9 +410,9 @@ public class PostgresDatabase extends Database {
public void updateSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed data) { public void updateSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed data) {
try (Connection connection = getConnection()) { try (Connection connection = getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(formatStatementTables(""" try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
UPDATE "%user_data_table%" UPDATE %user_data_table%
SET "save_cause"=?,"pinned"=?,"data"=? SET save_cause=?,pinned=?,data=?
WHERE "player_uuid"=? AND "version_uuid"=? WHERE player_uuid=? AND version_uuid=?
LIMIT 1;"""))) { LIMIT 1;"""))) {
statement.setString(1, data.getSaveCause().name()); statement.setString(1, data.getSaveCause().name());
statement.setBoolean(2, data.isPinned()); statement.setBoolean(2, data.isPinned());