* Used trinity sql coding style

--HG--
branch : trunk

12 files changed, 15 insertions, 19 deletions

diff --git a/sql/updates/3233_world_scripts_naxx.sql b/sql/updates/3233_world_scripts_naxx.sql
index 230ca99b867..fc582058259 100644
--- a/sql/updates/3233_world_scripts_naxx.sql
+++ b/sql/updates/3233_world_scripts_naxx.sql
@@ -1,4 +1,4 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-28169,28732,54097);
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (28732,54097,-29865,-55053,-28169,28059,39088,-28059,-39088,28062,39090,28084,39091,-28084,-39091,28085,39093);
 INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
 ( 28732,-28798,  1, 'Widow\'s Embrace - Frenzy'),
 ( 54097,-54100,  1, 'Widow\'s Embrace - Frenzy (H)'),
diff --git a/sql/updates/3358_world_spell_bonus_data.sql b/sql/updates/3358_world_spell_bonus_data.sql
index e2cb0aa706b..5f06839a164 100644
--- a/sql/updates/3358_world_spell_bonus_data.sql
+++ b/sql/updates/3358_world_spell_bonus_data.sql
@@ -1 +1 @@
-UPDATE `spell_bonus_data` SET `direct_bonus` = '0.6453' WHERE `spell_bonus_data`.`entry` =33763;
+UPDATE `spell_bonus_data` SET `direct_bonus` = '0.6453' WHERE `spell_bonus_data`.`entry` =33763;
\ No newline at end of file
diff --git a/sql/updates/3373_world_spell.sql b/sql/updates/3373_world_spell.sql
index 23fe9bac842..cbe123889a2 100644
--- a/sql/updates/3373_world_spell.sql
+++ b/sql/updates/3373_world_spell.sql
@@ -1,2 +1,2 @@
 DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (38528);
-DELETE FROM spell_proc_event WHERE `entry` IN (31785, 33776);
+DELETE FROM spell_proc_event WHERE `entry` IN (31785, 33776);
\ No newline at end of file
diff --git a/sql/updates/7839_01_mangos_mangos_string.sql b/sql/updates/3375_mangos_7839_01_world_trinity_string.sql
index b2fbcfa4592..3ce333869e6 100644
--- a/sql/updates/7839_01_mangos_mangos_string.sql
+++ b/sql/updates/3375_mangos_7839_01_world_trinity_string.sql
@@ -1,6 +1,4 @@
 DELETE FROM trinity_string WHERE entry IN(283);
-
 UPDATE trinity_string SET entry = 5011 WHERE entry = 171;
-
 INSERT INTO trinity_string VALUES
-(171,'You can\'t teleport self to self!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+(171,'You can\'t teleport self to self!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
\ No newline at end of file
diff --git a/sql/updates/7839_02_mangos_command.sql b/sql/updates/3375_mangos_7839_02_world_command.sql
index b66d6f556fa..597f5fd6cf8 100644
--- a/sql/updates/7839_02_mangos_command.sql
+++ b/sql/updates/3375_mangos_7839_02_world_command.sql
@@ -1,4 +1,4 @@
--- ALTER TABLE db_version CHANGE COLUMN required_7839_01_mangos_mangos_string required_7839_02_mangos_command bit;
+/* ALTER TABLE db_version CHANGE COLUMN required_7839_01_mangos_mangos_string required_7839_02_mangos_command bit;*/
 
 DELETE FROM `command` WHERE `name` IN (
    'baninfo account','baninfo character','baninfo ip','goname','groupgo',
@@ -19,4 +19,4 @@ INSERT INTO `command` VALUES
 ('mute',1,'Syntax: .mute [$playerName] $timeInMinutes\r\n\r\nDisible chat messaging for any character from account of character $playerName (or currently selected) at $timeInMinutes minutes. Player can be offline.'),
 ('namego',1,'Syntax: .namego [$charactername]\r\n\r\nTeleport the given character to you. Character can be offline.'),
 ('tele name',1,'Syntax: .tele name [#playername] #location\r\n\r\nTeleport the given character to a given location. Character can be offline.'),
-('unmute',1,'Syntax: .unmute [$playerName]\r\n\r\nRestore chat messaging for any character from account of character $playerName (or selected). Character can be ofline.');
+('unmute',1,'Syntax: .unmute [$playerName]\r\n\r\nRestore chat messaging for any character from account of character $playerName (or selected). Character can be ofline.');
\ No newline at end of file
diff --git a/sql/updates/3392_world_spell_proc_event.sql b/sql/updates/3392_world_spell_proc_event.sql
index d0965c1a7ab..6358fe166a3 100644
--- a/sql/updates/3392_world_spell_proc_event.sql
+++ b/sql/updates/3392_world_spell_proc_event.sql
@@ -17,4 +17,4 @@ VALUES
 (60529, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (60717, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 100.000000, 0),
 (62147, 0x00, 15, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
-(57907, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
+(57907, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/3394_world_spell_bonus_data.sql b/sql/updates/3394_world_spell_bonus_data.sql
index d960ae5ca06..9c4443b0a19 100644
--- a/sql/updates/3394_world_spell_bonus_data.sql
+++ b/sql/updates/3394_world_spell_bonus_data.sql
@@ -7,4 +7,4 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`
 (53194, 0.05, 0, 0, 'Druid - Starfall rank 3'),
 (53189, 0.012, 0, 0, 'Druid - Starfall AOE rank 3'),
 (53195, 0.05, 0, 0, 'Druid - Starfall rank 4'),
-(53190, 0.012, 0, 0, 'Druid - Starfall AOE rank 4');
+(53190, 0.012, 0, 0, 'Druid - Starfall AOE rank 4');
\ No newline at end of file
diff --git a/sql/updates/3409_world_spell_proc_event.sql b/sql/updates/3409_world_spell_proc_event.sql
index 47b1fab8aa9..9e78b36bae8 100644
--- a/sql/updates/3409_world_spell_proc_event.sql
+++ b/sql/updates/3409_world_spell_proc_event.sql
@@ -1,9 +1,8 @@
 DELETE FROM `spell_proc_event` WHERE `entry` IN (31878, 31877, 31876, 46913, 46914, 46915);
-
 INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
 (31876, 0, 10, 8388608, 0, 0, 0, 0, 0, 0, 0),
 (31877, 0, 10, 8388608, 0, 0, 0, 0, 0, 0, 0),
 (31878, 0, 10, 8388608, 0, 0, 0, 0, 0, 0, 0),
 (46913, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0),
 (46914, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0),
-(46915, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0);
+(46915, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0);
\ No newline at end of file
diff --git a/sql/updates/3410_world.sql b/sql/updates/3410_world_SD2_scripts.sql
index 9a54cea49db..57e8f4d37c2 100644
--- a/sql/updates/3410_world.sql
+++ b/sql/updates/3410_world_SD2_scripts.sql
@@ -28,4 +28,4 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `langua
 (-1000403, 'We showed that one!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_1'),
 (-1000404, 'One more down!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_2'),
 (-1000405, 'We\'ve done it! We won!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_3'),
-(-1000406, 'Meet me down by the orchard--I just need to put my gun away.', 0, 0, 7, 0, 'stilwell SAY_DS_PROLOGUE');
+(-1000406, 'Meet me down by the orchard--I just need to put my gun away.', 0, 0, 7, 0, 'stilwell SAY_DS_PROLOGUE');
\ No newline at end of file
diff --git a/sql/updates/7850_01_mangos_command.sql b/sql/updates/3414_mangos_7850_01_world_command.sql
index 5dd0274bc26..b4bc7ce12be 100644
--- a/sql/updates/7850_01_mangos_command.sql
+++ b/sql/updates/3414_mangos_7850_01_world_command.sql
@@ -1,7 +1,6 @@
-ALTER TABLE db_version CHANGE COLUMN required_7839_02_mangos_command required_7850_01_mangos_command bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7839_02_mangos_command required_7850_01_mangos_command bit;*/
 
 DELETE FROM `command` WHERE `name` IN ('character reputation','pinfo');
-
 INSERT INTO `command` VALUES
 ('pinfo',2,'Syntax: .pinfo [$player_name]\r\n\r\nOutput account information for selected player or player find by $player_name.'),
-('character reputation',2,'Syntax: .character reputation [$player_name]\r\n\r\nShow reputation information for selected player or player find by $player_name.');
+('character reputation',2,'Syntax: .character reputation [$player_name]\r\n\r\nShow reputation information for selected player or player find by $player_name.');
\ No newline at end of file
diff --git a/sql/updates/7855_01_mangos_pools.sql b/sql/updates/3416_mangos_7855_01_world_pools.sql
index b5ac676c3e1..6a9d879d728 100644
--- a/sql/updates/7855_01_mangos_pools.sql
+++ b/sql/updates/3416_mangos_7855_01_world_pools.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7850_01_mangos_command required_7855_01_mangos_pools bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7850_01_mangos_command required_7855_01_mangos_pools bit;*/
 
 ALTER TABLE pool_creature
   ADD COLUMN description varchar(255) NOT NULL AFTER chance;
@@ -10,4 +10,4 @@ ALTER TABLE pool_pool
   ADD COLUMN description varchar(255) NOT NULL AFTER chance;
 
 ALTER TABLE pool_template
-  ADD COLUMN description varchar(255) NOT NULL AFTER max_limit;
+  ADD COLUMN description varchar(255) NOT NULL AFTER max_limit;
\ No newline at end of file
diff --git a/sql/updates/3419_world.sql b/sql/updates/3419_world_SD2_scripts.sql
index 5cccad6bce5..ba0fcc53445 100644
--- a/sql/updates/3419_world.sql
+++ b/sql/updates/3419_world_SD2_scripts.sql
@@ -48,4 +48,4 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
 (-1060003, 'CLUCK! Sensors detect spatial anomaly -- danger imminent! CLUCK', NULL, NULL, 'GLUCK! Sensoren haben räumliche Anomalie entdeckt - Gefahr im Verzug! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AMBUSH'),
 (-1060002, 'Threat analyzed! Activating combat plan beta! CLUCK!', NULL, NULL, 'Bedrohung analysiert! Gefechtsplan Beta wird aktiviert! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AGGRO2'),
 (-1060001, 'Physical threat detected! Evasive action! CLUCK!', NULL, NULL, 'Körperliche Bedrohung entdeckt! Ausweichmanöver! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AGGRO1'),
-(-1060000, 'Emergency power activated! Initializing ambulatory motor! CLUCK!', NULL, NULL, 'Notfallenergie aktiviert! Ambulatorenantrieb wird gestartet! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_START');
+(-1060000, 'Emergency power activated! Initializing ambulatory motor! CLUCK!', NULL, NULL, 'Notfallenergie aktiviert! Ambulatorenantrieb wird gestartet! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_START');
\ No newline at end of file