From f5565c725a645c7b5111492d073919a595ce6da3 Mon Sep 17 00:00:00 2001
From: Laise <fenrisse@gmail.com>
Date: Thu, 8 Jul 2010 17:52:03 +0300
Subject: [PATCH] [10160] Fix sql for character_aura and pet_aura

---
 sql/characters.sql                                 | 6 +++---
 sql/updates/10160_01_characters_character_aura.sql | 4 ++++
 sql/updates/10160_02_characters_pet_aura.sql       | 4 ++++
 sql/updates/Makefile.am                            | 4 ++++
 src/shared/revision_nr.h                           | 2 +-
 src/shared/revision_sql.h                          | 2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 sql/updates/10160_01_characters_character_aura.sql
 create mode 100644 sql/updates/10160_02_characters_pet_aura.sql

diff --git a/sql/characters.sql b/sql/characters.sql
index 3d4c1a910..72d073851 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_10156_02_characters_pet_aura` bit(1) default NULL
+  `required_10160_02_characters_pet_aura` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
 
 --
@@ -383,7 +383,7 @@ CREATE TABLE `character_aura` (
   `remaintime1` INT(11) NOT NULL DEFAULT '0',
   `remaintime2` INT(11) NOT NULL DEFAULT '0',
   `effIndexMask` INT(11) NOT NULL DEFAULT '0',
-  PRIMARY KEY  (`guid`,`spell`,`effect_index`)
+  PRIMARY KEY  (`guid`,`spell`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
 
 --
@@ -1468,7 +1468,7 @@ CREATE TABLE `pet_aura` (
   `remaintime1` INT(11) NOT NULL DEFAULT '0',
   `remaintime2` INT(11) NOT NULL DEFAULT '0',
   `effIndexMask` INT(11) NOT NULL DEFAULT '0',
-  PRIMARY KEY  (`guid`,`spell`,`effect_index`)
+  PRIMARY KEY  (`guid`,`spell`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Pet System';
 
 --
diff --git a/sql/updates/10160_01_characters_character_aura.sql b/sql/updates/10160_01_characters_character_aura.sql
new file mode 100644
index 000000000..18f621ced
--- /dev/null
+++ b/sql/updates/10160_01_characters_character_aura.sql
@@ -0,0 +1,4 @@
+ALTER TABLE character_db_version CHANGE COLUMN required_10156_02_characters_pet_aura required_10160_01_characters_character_aura bit;
+
+alter table `character_aura` drop primary key;
+alter table `character_aura` add primary key (`guid`,`spell`);
\ No newline at end of file
diff --git a/sql/updates/10160_02_characters_pet_aura.sql b/sql/updates/10160_02_characters_pet_aura.sql
new file mode 100644
index 000000000..1e69f7e00
--- /dev/null
+++ b/sql/updates/10160_02_characters_pet_aura.sql
@@ -0,0 +1,4 @@
+ALTER TABLE character_db_version CHANGE COLUMN required_10160_01_characters_character_aura required_10160_02_characters_pet_aura bit;
+
+alter table `pet_aura` drop primary key;
+alter table `pet_aura` add primary key (`guid`,`spell`);
\ No newline at end of file
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index 95bd33ad8..2e368d8bd 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -103,6 +103,8 @@ pkgdata_DATA = \
 	10156_02_characters_pet_aura.sql \
 	10156_03_mangos_spell_proc_event.sql \
 	10159_01_mangos_spell_proc_event.sql \
+	10160_01_characters_character_aura.sql \
+	10160_02_characters_pet_aura.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -186,4 +188,6 @@ EXTRA_DIST = \
 	10156_02_characters_pet_aura.sql \
 	10156_03_mangos_spell_proc_event.sql \
 	10159_01_mangos_spell_proc_event.sql \
+	10160_01_characters_character_aura.sql \
+	10160_02_characters_pet_aura.sql \
 	README
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 4f21caad5..0647cb457 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 "10159"
+ #define REVISION_NR "10160"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
index 41dfcd01d..7e8df8e3f 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_10156_02_characters_pet_aura"
+ #define REVISION_DB_CHARACTERS "required_10160_02_characters_pet_aura"
  #define REVISION_DB_MANGOS "required_10159_01_mangos_spell_proc_event"
  #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
 #endif // __REVISION_SQL_H__