From f874c951c4afad7a53a8155d6d4f10bc664dcd30 Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Sat, 25 Jul 2015 15:34:13 -0500 Subject: [PATCH] Improved SQL query and renamed the two tables --- serverdata/static/spawns.db | Bin 35840 -> 0 bytes .../server_info/RelationalServerData.java | 2 +- src/services/spawn/StaticService.java | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 serverdata/static/spawns.db diff --git a/serverdata/static/spawns.db b/serverdata/static/spawns.db deleted file mode 100644 index b6deebec98646af60caf77527b2a6d6bdbfa1c79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35840 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 imported) { - updateQuery("DROP TABLE " + table); + updateQuery("DROP TABLE IF EXISTS " + table); importFromSdb(table, sdb); updateLastImported(table, System.currentTimeMillis()); } diff --git a/src/services/spawn/StaticService.java b/src/services/spawn/StaticService.java index 059cb35cf..41ff5557b 100644 --- a/src/services/spawn/StaticService.java +++ b/src/services/spawn/StaticService.java @@ -41,7 +41,7 @@ import services.objects.ObjectManager; public class StaticService extends Service { - private static final String GET_SUPPORTING_SQL = "SELECT spawn.* FROM static_spawns spawn, static_types types WHERE types.iff = ? AND spawn.iff_type = types.iff_type"; + private static final String GET_SUPPORTING_SQL = "SELECT spawns.* FROM spawns, types WHERE types.iff = ? AND spawns.iff_type = types.iff_type"; private final Object databaseMutex; private final ObjectManager objectManager; @@ -54,8 +54,8 @@ public class StaticService extends Service { spawnDatabase = new RelationalServerData("serverdata/static/spawns.db"); try { - spawnDatabase.linkTableWithSdb("static_spawns", "serverdata/static/spawns.sdb"); - spawnDatabase.linkTableWithSdb("static_types", "serverdata/static/types.sdb"); + spawnDatabase.linkTableWithSdb("spawns", "serverdata/static/spawns.sdb"); + spawnDatabase.linkTableWithSdb("types", "serverdata/static/types.sdb"); } catch (FileNotFoundException e) { e.printStackTrace(); throw new main.ProjectSWG.CoreException("Unable to load sdb files for StaticService");