From f9f21b5f7ff61e11202491bb25c60d47aa303f0d Mon Sep 17 00:00:00 2001 From: Wowka321 Date: Wed, 31 Mar 2010 00:05:20 +0200 Subject: [PATCH] [9646] Really restore titles from data_backup table. Signed-off-by: hunuza --- sql/characters.sql | 2 +- sql/updates/9632_01_characters_characters.sql | 5 ----- sql/updates/9646_01_characters_characters.sql | 7 +++++++ sql/updates/Makefile.am | 2 ++ src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 sql/updates/9646_01_characters_characters.sql diff --git a/sql/characters.sql b/sql/characters.sql index 069ab3f26..cd14803d8 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_9635_01_characters_characters` bit(1) default NULL + `required_9646_01_characters_characters` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; -- diff --git a/sql/updates/9632_01_characters_characters.sql b/sql/updates/9632_01_characters_characters.sql index 97255e153..d7e281675 100644 --- a/sql/updates/9632_01_characters_characters.sql +++ b/sql/updates/9632_01_characters_characters.sql @@ -2,8 +2,3 @@ ALTER TABLE character_db_version CHANGE COLUMN required_9630_01_characters_chara ALTER TABLE characters ADD COLUMN `knownTitles` longtext AFTER ammoId; - -UPDATE characters, data_backup -SET characters.knownTitles = SUBSTRING(data_backup.data, -length(SUBSTRING_INDEX(data_backup.data, ' ', 626))+2, -length(SUBSTRING_INDEX(data_backup.data, ' ', 631+1))- length(SUBSTRING_INDEX(data_backup.data, ' ', 626)) - 1); diff --git a/sql/updates/9646_01_characters_characters.sql b/sql/updates/9646_01_characters_characters.sql new file mode 100644 index 000000000..e7d6c9b2c --- /dev/null +++ b/sql/updates/9646_01_characters_characters.sql @@ -0,0 +1,7 @@ +ALTER TABLE character_db_version CHANGE COLUMN required_9635_01_characters_characters required_9646_01_characters_characters bit; + +UPDATE characters, data_backup +SET characters.knownTitles = SUBSTRING(data_backup.data, +length(SUBSTRING_INDEX(data_backup.data, ' ', 626))+2, +length(SUBSTRING_INDEX(data_backup.data, ' ', 631+1))- length(SUBSTRING_INDEX(data_backup.data, ' ', 626)) - 1) +WHERE characters.guid=data_backup.guid; diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index a8f63ee8f..449c05baf 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -96,6 +96,7 @@ pkgdata_DATA = \ 9634_01_characters_corpse.sql \ 9635_01_characters_characters.sql \ 9636_01_mangos_item_template.sql \ + 9646_01_characters_characters.sql \ README ## Additional files to include when running 'make dist' @@ -172,4 +173,5 @@ EXTRA_DIST = \ 9634_01_characters_corpse.sql \ 9635_01_characters_characters.sql \ 9636_01_mangos_item_template.sql \ + 9646_01_characters_characters.sql \ README diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 6cbde909a..af1d6743a 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 "9645" + #define REVISION_NR "9646" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index ab52b04fa..6d2f87090 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_9635_01_characters_characters" + #define REVISION_DB_CHARACTERS "required_9646_01_characters_characters" #define REVISION_DB_MANGOS "required_9636_01_mangos_item_template" #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist" #endif // __REVISION_SQL_H__