diff --git a/sql/333/1_characters_mail.sql b/sql/333/1_characters_mail.sql deleted file mode 100644 index 330fee20df6..00000000000 --- a/sql/333/1_characters_mail.sql +++ /dev/null @@ -1 +0,0 @@ -alter table `mail` add column `body` longtext CHARSET utf8 COLLATE utf8_general_ci NULL after `subject`; diff --git a/sql/characters.sql b/sql/characters.sql index 2ab6fc47ffb..e03f7e8779c 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_9687_01_characters_character_queststatus_daily` bit(1) default NULL + `required_9692_02_characters_mail` 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 752f92f463f..45e2a6cd37e 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_9690_01_mangos_spell_proc_event` bit(1) default NULL + `required_9692_03_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- diff --git a/sql/updates/9692_01_characters_mail.sql b/sql/updates/9692_01_characters_mail.sql new file mode 100644 index 00000000000..4c75d4b22ba --- /dev/null +++ b/sql/updates/9692_01_characters_mail.sql @@ -0,0 +1,3 @@ +ALTER TABLE character_db_version CHANGE COLUMN required_9687_01_characters_character_queststatus_daily required_9692_01_characters_mail bit; + +alter table `mail` add column `body` longtext CHARSET utf8 COLLATE utf8_general_ci NULL after `subject`; diff --git a/sql/333/2_characters_mail.sql b/sql/updates/9692_02_characters_mail.sql similarity index 66% rename from sql/333/2_characters_mail.sql rename to sql/updates/9692_02_characters_mail.sql index 53e71d0162f..f508a6f68b9 100644 --- a/sql/333/2_characters_mail.sql +++ b/sql/updates/9692_02_characters_mail.sql @@ -1,3 +1,5 @@ +ALTER TABLE character_db_version CHANGE COLUMN required_9692_01_characters_mail required_9692_02_characters_mail bit; + UPDATE `mail` LEFT JOIN `item_text` ON `mail`.`itemtextid` = `item_text`.`id` SET `mail`.`body`=`item_text`.`text`; DELETE item_text FROM mail, item_text WHERE mail.itemtextid = item_text.id; ALTER TABLE `mail` DROP COLUMN `itemtextid`; diff --git a/sql/333/3_spell_proc_event.sql b/sql/updates/9692_03_mangos_spell_proc_event.sql similarity index 87% rename from sql/333/3_spell_proc_event.sql rename to sql/updates/9692_03_mangos_spell_proc_event.sql index dd361e34926..32be29725f4 100644 --- a/sql/333/3_spell_proc_event.sql +++ b/sql/updates/9692_03_mangos_spell_proc_event.sql @@ -1,3 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_9690_01_mangos_spell_proc_event required_9692_03_mangos_spell_proc_event bit; + -- Rampage: now passive instead of being a proc DELETE FROM `spell_proc_event` WHERE `entry` = 29801; -- Unleashed Rage: now passive instead of being a proc diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 66c9668576b..97e3c7c2be9 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -106,6 +106,9 @@ pkgdata_DATA = \ 9686_01_characters_character_queststatus_weekly.sql \ 9687_01_characters_character_queststatus_daily.sql \ 9690_01_mangos_spell_proc_event.sql \ + 9692_01_characters_mail.sql \ + 9692_02_characters_mail.sql \ + 9692_03_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -192,4 +195,7 @@ EXTRA_DIST = \ 9686_01_characters_character_queststatus_weekly.sql \ 9687_01_characters_character_queststatus_daily.sql \ 9690_01_mangos_spell_proc_event.sql \ + 9692_01_characters_mail.sql \ + 9692_02_characters_mail.sql \ + 9692_03_mangos_spell_proc_event.sql \ README diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp index a94b411bfed..8211200a4c2 100644 --- a/src/game/DBCStores.cpp +++ b/src/game/DBCStores.cpp @@ -622,13 +622,13 @@ void LoadDBCStores(const std::string& dataPath) } // Check loaded DBC files proper version - if( !sSpellStore.LookupEntry(74445) || // last added spell in 3.3.2 - !sMapStore.LookupEntry(718) || // last map added in 3.3.2 - !sGemPropertiesStore.LookupEntry(1629) || // last gem property added in 3.3.2 - !sItemExtendedCostStore.LookupEntry(2982) || // last item extended cost added in 3.3.2 - !sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.2 - !sAreaStore.LookupEntry(3461) || // last area (areaflag) added in 3.3.2 - !sItemStore.LookupEntry(52686) ) // last client known item added in 3.3.2 + if( !sAreaStore.LookupEntry(3617) || // last area (areaflag) added in 3.3.3a + !sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.3a + !sGemPropertiesStore.LookupEntry(1629) || // last added spell in 3.3.3a + !sItemStore.LookupEntry(54860) || // last gem property added in 3.3.3a + !sItemExtendedCostStore.LookupEntry(2997) || // last item extended cost added in 3.3.3a + !sMapStore.LookupEntry(724) || // last map added in 3.3.3a + !sSpellStore.LookupEntry(76567) ) // last client known item added in 3.3.3a { sLog.outError("\nYou have mixed version DBC files. Please re-extract DBC files for one from client build: %s",AcceptableClientBuildsListStr().c_str()); exit(1); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9ad477aa0fe..99bc9461611 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9691" + #define REVISION_NR "9692" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 9f95ae7c254..8d9169cadbd 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ - #define REVISION_DB_CHARACTERS "required_9687_01_characters_character_queststatus_daily" - #define REVISION_DB_MANGOS "required_9690_01_mangos_spell_proc_event" + #define REVISION_DB_CHARACTERS "required_9692_02_characters_mail" + #define REVISION_DB_MANGOS "required_9692_03_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist" #endif // __REVISION_SQL_H__