Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2025-12-29 03:39:08 +00:00
Code Issues Releases Activity

Fix SQL queries due to migration

Browse Source
This commit is contained in:
SamB440
2023-12-04 14:32:26 +00:00
parent e2fec886f5
commit a44af7e32c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/SQLCommonStorage.java
View File

@@ -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<UUID, RPGRegionsAccount> cachedAccounts;
@@ -128,8 +128,8 @@ public abstract class SQLCommonStorage implements IStorageManager {
final List<DbRow> results = DB.getResultsAsync(SELECT_REGION, getDatabaseUuid(uuid)).join();
Map<String, Discovery> 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<String> 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 -> {