From 00e44285a77ee7ab0c42786f2ad763d13c453c2b Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Sat, 8 Sep 2018 00:09:14 -0400 Subject: [PATCH] Fix column cases to make people happy If you already sourced, too fucking bad. --- utils/sql/db_update_manifest.txt | 2 +- utils/sql/git/required/2018_09_07_FastRegen.sql | 6 +++--- zone/zonedb.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/sql/db_update_manifest.txt b/utils/sql/db_update_manifest.txt index fc2fb2391..d0efc8d74 100644 --- a/utils/sql/db_update_manifest.txt +++ b/utils/sql/db_update_manifest.txt @@ -379,7 +379,7 @@ 9123|2018_07_07_data_buckets.sql|SHOW TABLES LIKE 'data_buckets'|empty| 9124|2018_07_09_tasks.sql|SHOW COLUMNS FROM `tasks` LIKE 'type'|empty| 9125|2018_07_20_task_emote.sql|SHOW COLUMNS FROM `tasks` LIKE 'completion_emote'|empty| -9126|2018_09_07_FastRegen.sql|SHOW COLUMNS FROM `zone` LIKE 'FastRegenHP'|empty| +9126|2018_09_07_FastRegen.sql|SHOW COLUMNS FROM `zone` LIKE 'fast_regen_hp'|empty| # Upgrade conditions: # This won't be needed after this system is implemented, but it is used database that are not diff --git a/utils/sql/git/required/2018_09_07_FastRegen.sql b/utils/sql/git/required/2018_09_07_FastRegen.sql index de44b147d..d9c52acf7 100644 --- a/utils/sql/git/required/2018_09_07_FastRegen.sql +++ b/utils/sql/git/required/2018_09_07_FastRegen.sql @@ -1,3 +1,3 @@ -ALTER TABLE `zone` ADD `FastRegenHP` INT NOT NULL DEFAULT '180'; -ALTER TABLE `zone` ADD `FastRegenMana` INT NOT NULL DEFAULT '180'; -ALTER TABLE `zone` ADD `FastRegenEndurance` INT NOT NULL DEFAULT '180'; +ALTER TABLE `zone` ADD `fast_regen_hp` INT NOT NULL DEFAULT '180'; +ALTER TABLE `zone` ADD `fast_regen_mana` INT NOT NULL DEFAULT '180'; +ALTER TABLE `zone` ADD `fast_regen_endurance` INT NOT NULL DEFAULT '180'; diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 0db41f51c..b08b0d32d 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -143,10 +143,10 @@ bool ZoneDatabase::GetZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct "snow_duration2, " // 53 "snow_duration3, " // 54 "snow_duration4, " // 55 - "gravity, " // 56 - "FastRegenHP, " // 57 - "FastRegenMana, " // 58 - "FastRegenEndurance " // 59 + "gravity, " // 56 + "fast_regen_hp, " // 57 + "fast_regen_mana, " // 58 + "fast_regen_endurance " // 59 "FROM zone WHERE zoneidnumber = %i AND version = %i", zoneid, instance_id); auto results = QueryDatabase(query);