From f145e06e89b5dd929534ef36435712dd7129a463 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 14 Feb 2010 15:23:34 +0300 Subject: [PATCH] [9375] Now really correct sql update with content --- sql/characters.sql | 2 +- .../9375_01_characters_character_glyphs.sql | 20 +++++++++++++++++++ sql/updates/Makefile.am | 2 ++ src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 4 ++-- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 sql/updates/9375_01_characters_character_glyphs.sql diff --git a/sql/characters.sql b/sql/characters.sql index 0d351cf7c..2fcab08d6 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_9374_01_characters_character_glyphs` bit(1) default NULL + `required_9375_01_characters_character_glyphs` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; -- diff --git a/sql/updates/9375_01_characters_character_glyphs.sql b/sql/updates/9375_01_characters_character_glyphs.sql new file mode 100644 index 000000000..c567c4ea8 --- /dev/null +++ b/sql/updates/9375_01_characters_character_glyphs.sql @@ -0,0 +1,20 @@ +ALTER TABLE character_db_version CHANGE COLUMN required_9374_01_characters_character_glyphs required_9375_01_characters_character_glyphs bit; + +DROP TABLE IF EXISTS `character_glyphs`; +CREATE TABLE `character_glyphs` ( + `guid` int(11) unsigned NOT NULL, + `spec` tinyint(3) unsigned NOT NULL DEFAULT '0', + `slot` tinyint(3) unsigned NOT NULL DEFAULT '0', + `glyph` int(11) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`guid`,`spec`,`slot`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Extract values from data blob fields and insert them into character_glyphs +INSERT INTO `character_glyphs` SELECT `guid`, 0, 0, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1319), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`; +INSERT INTO `character_glyphs` SELECT `guid`, 0, 1, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1320), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`; +INSERT INTO `character_glyphs` SELECT `guid`, 0, 2, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1321), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`; +INSERT INTO `character_glyphs` SELECT `guid`, 0, 3, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1322), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`; +INSERT INTO `character_glyphs` SELECT `guid`, 0, 4, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1323), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`; +INSERT INTO `character_glyphs` SELECT `guid`, 0, 5, (CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1324), ' ', -1) AS UNSIGNED)) AS `glyph` FROM `characters`; + +DELETE FROM character_glyphs WHERE glyph = 0; diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 4d30315d7..ebae7dac6 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -69,6 +69,7 @@ pkgdata_DATA = \ 9366_01_mangos_spell_bonus_data.sql \ 9366_02_mangos_spell_proc_event.sql \ 9374_01_characters_character_glyphs.sql \ + 9375_01_characters_character_glyphs.sql \ README ## Additional files to include when running 'make dist' @@ -118,4 +119,5 @@ EXTRA_DIST = \ 9366_01_mangos_spell_bonus_data.sql \ 9366_02_mangos_spell_proc_event.sql \ 9374_01_characters_character_glyphs.sql \ + 9375_01_characters_character_glyphs.sql \ README diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8bd07dad9..c8b5dbd64 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 "9374" + #define REVISION_NR "9375" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 635c586a7..f5468da1d 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_9374_01_characters_character_glyphs" + #define REVISION_DB_CHARACTERS "required_9375_01_characters_character_glyphs" #define REVISION_DB_MANGOS "required_9366_02_mangos_spell_proc_event" - #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist" + #define REVISION_DB_REALMD "required_" #endif // __REVISION_SQL_H__