From a44af7e32c32163c3b93f2d23e5b7b80d8b415f2 Mon Sep 17 00:00:00 2001 From: SamB440 Date: Mon, 4 Dec 2023 14:32:26 +0000 Subject: [PATCH] Fix SQL queries due to migration --- .../managers/data/SQLCommonStorage.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/SQLCommonStorage.java b/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/SQLCommonStorage.java index 255677b..3114805 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/SQLCommonStorage.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/SQLCommonStorage.java @@ -30,9 +30,9 @@ import java.util.concurrent.TimeUnit; public abstract class SQLCommonStorage implements IStorageManager { protected static final String SELECT_REGION = "SELECT * FROM rpgregions_discoveries WHERE uuid = ?"; - protected static final String INSERT_DISCOVERY = "INSERT INTO rpgregions_discoveries (uuid, region, time) VALUES (?, ?, ?)"; + protected static final String INSERT_DISCOVERY = "INSERT INTO rpgregions_discoveries (uuid, discovery_id, time) VALUES (?, ?, ?)"; protected static final String DELETE_DISCOVERIES = "DELETE * FROM rpgregions_discoveries WHERE uuid = ?"; - protected static final String DELETE_DISCOVERY = "DELETE * FROM rpgregions_discoveries WHERE uuid = ? AND region = ?"; + protected static final String DELETE_DISCOVERY = "DELETE * FROM rpgregions_discoveries WHERE uuid = ? AND discovery_id = ?"; private final AsyncCache cachedAccounts; @@ -128,8 +128,8 @@ public abstract class SQLCommonStorage implements IStorageManager { final List results = DB.getResultsAsync(SELECT_REGION, getDatabaseUuid(uuid)).join(); Map regions = new HashMap<>(); for (DbRow row : results) { - String region = row.getString("region"); - regions.put(region, new WorldDiscovery(LocalDateTime.parse(row.getString("time")), region)); + String discoveryId = row.getString("discovery_id"); + regions.put(discoveryId, new WorldDiscovery(LocalDateTime.parse(row.getString("time")), discoveryId)); } plugin.debug("Created user account: " + uuid); @@ -196,12 +196,12 @@ public abstract class SQLCommonStorage implements IStorageManager { return DB.getResultsAsync(SELECT_REGION, getDatabaseUuid(uuid)).thenAccept(results -> { List current = new ArrayList<>(); for (DbRow row : results) { - current.add(row.getString("region")); + current.add(row.getString("discovery_id")); } - for (Discovery region : account.getDiscoveries().values()) { - if (!current.contains(region.getDiscoveredName())) { - executeInsert(INSERT_DISCOVERY, getDatabaseUuid(uuid), region.getDiscoveredName(), DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(region.getDate())); + for (Discovery discovery : account.getDiscoveries().values()) { + if (!current.contains(discovery.getDiscoveredName())) { + executeInsert(INSERT_DISCOVERY, getDatabaseUuid(uuid), discovery.getDiscoveredName(), DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(discovery.getDate())); } } }).exceptionally(t -> {