From 5f894bf4221f7ca9eb7886fc9ec1007c907443a3 Mon Sep 17 00:00:00 2001 From: DiSlord Date: Wed, 7 Jan 2009 21:48:32 +0300 Subject: [PATCH] Fix prev commit --- sql/characters.sql | 2 +- sql/mangos.sql | 2 +- ...ter_spell.sql => 7047_01_characters_character_spell.sql} | 2 ++ ...ction.sql => 7047_02_mangos_playercreateinfo_action.sql} | 2 ++ ..._spell.sql => 7047_03_mangos_playercreateinfo_spell.sql} | 2 ++ sql/updates/Makefile.am | 6 ++++++ 6 files changed, 14 insertions(+), 2 deletions(-) rename sql/updates/{01_characters_character_spell.sql => 7047_01_characters_character_spell.sql} (88%) rename sql/updates/{02_mangos_playercreateinfo_action.sql => 7047_02_mangos_playercreateinfo_action.sql} (69%) rename sql/updates/{03_mangos_playercreateinfo_spell.sql => 7047_03_mangos_playercreateinfo_spell.sql} (74%) diff --git a/sql/characters.sql b/sql/characters.sql index 4cbaab5da..1a1753b34 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS `character_db_version`; CREATE TABLE `character_db_version` ( - `required_6976_02_characters_character_db_version` bit(1) default NULL + `required_7047_01_characters_character_spell` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; -- diff --git a/sql/mangos.sql b/sql/mangos.sql index 3472a58b6..bd799f281 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7044_01_mangos_spell_proc_event` bit(1) default NULL + `required_7047_03_mangos_playercreateinfo_spell` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- diff --git a/sql/updates/01_characters_character_spell.sql b/sql/updates/7047_01_characters_character_spell.sql similarity index 88% rename from sql/updates/01_characters_character_spell.sql rename to sql/updates/7047_01_characters_character_spell.sql index fa17e0c4c..7d0458d81 100644 --- a/sql/updates/01_characters_character_spell.sql +++ b/sql/updates/7047_01_characters_character_spell.sql @@ -1,3 +1,5 @@ +ALTER TABLE character_db_version CHANGE COLUMN required_6976_02_characters_character_db_version required_7047_01_characters_character_spell bit; + DELETE FROM `character_spell` WHERE `spell` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548); INSERT INTO character_spell SELECT characters.guid as guid, 28880, -1, 1, 0 FROM `characters` WHERE characters.race=11 AND characters.class = 1; diff --git a/sql/updates/02_mangos_playercreateinfo_action.sql b/sql/updates/7047_02_mangos_playercreateinfo_action.sql similarity index 69% rename from sql/updates/02_mangos_playercreateinfo_action.sql rename to sql/updates/7047_02_mangos_playercreateinfo_action.sql index 834753dcd..894334b86 100644 --- a/sql/updates/02_mangos_playercreateinfo_action.sql +++ b/sql/updates/7047_02_mangos_playercreateinfo_action.sql @@ -1,3 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_7044_01_mangos_spell_proc_event required_7047_02_mangos_playercreateinfo_action bit; + DELETE FROM `playercreateinfo_action` WHERE `action` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548); INSERT INTO `playercreateinfo_action` VALUES (11,1,74,28880,0,0), diff --git a/sql/updates/03_mangos_playercreateinfo_spell.sql b/sql/updates/7047_03_mangos_playercreateinfo_spell.sql similarity index 74% rename from sql/updates/03_mangos_playercreateinfo_spell.sql rename to sql/updates/7047_03_mangos_playercreateinfo_spell.sql index cd55d875a..c82490788 100644 --- a/sql/updates/03_mangos_playercreateinfo_spell.sql +++ b/sql/updates/7047_03_mangos_playercreateinfo_spell.sql @@ -1,3 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_7047_02_mangos_playercreateinfo_action required_7047_03_mangos_playercreateinfo_spell bit; + DELETE FROM `playercreateinfo_spell` WHERE `Spell` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548); INSERT INTO `playercreateinfo_spell` VALUES diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index b02628e6d..9d3b30057 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -116,6 +116,9 @@ pkgdata_DATA = \ 7034_01_mangos_spell_proc_event.sql \ 7040_01_mangos_achievement_reward.sql \ 7044_01_mangos_spell_proc_event.sql \ + 7047_01_characters_character_spell.sql \ + 7047_02_mangos_playercreateinfo_action.sql \ + 7047_03_mangos_playercreateinfo_spell.sql \ README ## Additional files to include when running 'make dist' @@ -212,4 +215,7 @@ EXTRA_DIST = \ 7034_01_mangos_spell_proc_event.sql \ 7040_01_mangos_achievement_reward.sql \ 7044_01_mangos_spell_proc_event.sql \ + 7047_01_characters_character_spell.sql \ + 7047_02_mangos_playercreateinfo_action.sql \ + 7047_03_mangos_playercreateinfo_spell.sql \ README