[7633] Implement support multiply basic requirements for crireria in `achievement_criteria_data`. Author: VladimirMangos

    Also implement additional basic requirements for proper implementing checks for ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE
    Req. DB support.

--HG--
branch : trunk

2 files changed, 7 insertions, 2 deletions

diff --git a/sql/mangos.sql b/sql/mangos.sql
index 4ae50613a6d..bf6fbcfcef7 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_7627_01_mangos_achievement_criteria_data` bit(1) default NULL
+  `required_7633_01_mangos_achievement_criteria_data` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -46,7 +46,7 @@ CREATE TABLE `achievement_criteria_data` (
   `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `value1` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `value2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`criteria_id`)
+  PRIMARY KEY (`criteria_id`,`type`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Achievment system';
 
 --
diff --git a/sql/updates/7633_01_mangos_achievement_criteria_data.sql b/sql/updates/7633_01_mangos_achievement_criteria_data.sql
new file mode 100644
index 00000000000..6a8905ef935
--- /dev/null
+++ b/sql/updates/7633_01_mangos_achievement_criteria_data.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_7627_01_mangos_achievement_criteria_data required_7633_01_mangos_achievement_criteria_data bit;
+
+ALTER TABLE `achievement_criteria_data`
+  DROP PRIMARY KEY,
+  ADD PRIMARY KEY (`criteria_id`,`type`);