Fixed import errors on recent sql update files...

Added forgotten updates to world.sql...
Added missing lines at the end of some sql files...
Better format by adding DELETE FROM before any INSERT INTO update...

--HG--
branch : trunk

11 files changed, 19 insertions, 13 deletions

diff --git a/sql/updates/7430_world_command.sql b/sql/updates/7430_world_command.sql
index a3898c7f96e..54fd0f2f68b 100644
--- a/sql/updates/7430_world_command.sql
+++ b/sql/updates/7430_world_command.sql
@@ -1 +1,2 @@
-INSERT INTO command VALUES ('channel set public', 3, 'Syntax: .channel set public  $channel $public\r\n\r\nChange password-changing ability for a channel. 1 for possible, 0 for GM only.');
\ No newline at end of file
+DELETE FROM `command` WHERE name='channel set public';
+INSERT INTO `command` (`name`,`security`,`help`) VALUES ('channel set public', 3, 'Syntax: .channel set public  $channel $public\r\n\r\nChange password-changing ability for a channel. 1 for possible, 0 for GM only.');
diff --git a/sql/updates/7430_world_trinity_string.sql b/sql/updates/7430_world_trinity_string.sql
index 96e046590fb..92867fb2a7a 100644
--- a/sql/updates/7430_world_trinity_string.sql
+++ b/sql/updates/7430_world_trinity_string.sql
@@ -1 +1,2 @@
-INSERT INTO trinity_string (entry, content_default) VALUES (5023, 'Channel: %s publicity set to: %u');
\ No newline at end of file
+DELETE FROM `trinity_string` WHERE `entry`=5023;
+INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES (5023, 'Channel: %s publicity set to: %u');
diff --git a/sql/updates/7432_world_access_requirement.sql b/sql/updates/7432_world_access_requirement.sql
index fcaabd1de2f..d7ad35008de 100644
--- a/sql/updates/7432_world_access_requirement.sql
+++ b/sql/updates/7432_world_access_requirement.sql
@@ -1 +1 @@
-ALTER TABLE `access_requirement` ADD COLUMN `status` TINYINT UNSIGNED DEFAULT 15 COMMENT 'instance status (open/close)';
+ALTER TABLE `access_requirement` ADD COLUMN `status` TINYINT(3) UNSIGNED DEFAULT 15 COMMENT 'instance status (open/close)';
diff --git a/sql/updates/7437_world_script_texts.sql b/sql/updates/7437_world_script_texts.sql
index 75dda3fdcac..a5b1f58457e 100644
--- a/sql/updates/7437_world_script_texts.sql
+++ b/sql/updates/7437_world_script_texts.sql
@@ -2,4 +2,4 @@ DELETE FROM `script_texts` WHERE `entry` IN (-1571036,-1571037,-1571038);
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`type`,`language`,`comment`) VALUES
 (28090,-1571036, 'We''ll cleanse this place! Arthas beware!',0,0, 'crusade recruit RECRUIT_SAY1'),
 (28090,-1571037, 'Your''re right! We can do this!',0,0, 'crusade recruit RECRUIT_SAY2'),
-(28090,-1571038, 'Your''re right! What was I thinking? Bring on the Scourge!',0,0, 'crusade recruit RECRUIT_SAY3');
\ No newline at end of file
+(28090,-1571038, 'Your''re right! What was I thinking? Bring on the Scourge!',0,0, 'crusade recruit RECRUIT_SAY3');
diff --git a/sql/updates/7437_world_scriptname.sql b/sql/updates/7437_world_scriptname.sql
index 4b92598ccdc..44550d165d1 100644
--- a/sql/updates/7437_world_scriptname.sql
+++ b/sql/updates/7437_world_scriptname.sql
@@ -1 +1 @@
-UPDATE `creature_template` SET `ScriptName`='npc_crusade_recruit' WHERE `entry`=28090;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='npc_crusade_recruit' WHERE `entry`=28090;
diff --git a/sql/updates/7441_world_scriptname.sql b/sql/updates/7441_world_scriptname.sql
index d4e915f7546..7f1bec93d66 100644
--- a/sql/updates/7441_world_scriptname.sql
+++ b/sql/updates/7441_world_scriptname.sql
@@ -1,3 +1,3 @@
 UPDATE `creature_template` SET `ScriptName`='npc_squire_david' WHERE `entry`=33447;
 UPDATE `creature_template` SET `ScriptName`='npc_argent_valiant' WHERE `entry`=33448;
-UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=33518;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=33518;
diff --git a/sql/updates/7446_world_areatrigger_scripts.sql b/sql/updates/7446_world_areatrigger_scripts.sql
index 8b57a8467fc..5d69ebb0937 100644
--- a/sql/updates/7446_world_areatrigger_scripts.sql
+++ b/sql/updates/7446_world_areatrigger_scripts.sql
@@ -1,3 +1,3 @@
 -- areatrigger for Kelthuzads chamber center
 DELETE FROM `areatrigger_scripts` WHERE `entry`=4112;
-INSERT INTO `areatrigger_scripts`(`entry`,`ScriptName`) VALUES(4112,'at_kelthuzad_center');
\ No newline at end of file
+INSERT INTO `areatrigger_scripts`(`entry`,`ScriptName`) VALUES(4112,'at_kelthuzad_center');
diff --git a/sql/updates/7464_world_scriptname.sql b/sql/updates/7464_world_scriptname.sql
index 9aa5dd37177..df1304a2fed 100644
--- a/sql/updates/7464_world_scriptname.sql
+++ b/sql/updates/7464_world_scriptname.sql
@@ -1 +1 @@
-UPDATE `creature_template` SET `ScriptName`='npc_warmage_violetstand' WHERE `entry` IN (32369,32371,32372);
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='npc_warmage_violetstand' WHERE `entry` IN (32369,32371,32372);
diff --git a/sql/updates/7465_world_command.sql b/sql/updates/7465_world_command.sql
index 8d0fe064048..3f682bf37cd 100644
--- a/sql/updates/7465_world_command.sql
+++ b/sql/updates/7465_world_command.sql
@@ -1 +1,2 @@
-INSERT INTO comand VALUES ('gobject info', 2, 'Syntax: .gobject info [$object_entry]\r\n\r\nQuery Gameobject information for selected gameobject or given entry.");
\ No newline at end of file
+DELETE FROM `command` WHERE `name`='gobject info';
+INSERT INTO `command` (`name`,`security`,`help`) VALUES ('gobject info', 2, 'Syntax: .gobject info [$object_entry]\r\n\r\nQuery Gameobject information for selected gameobject or given entry.');
diff --git a/sql/updates/7465_world_trinity_string.sql b/sql/updates/7465_world_trinity_string.sql
index acb451dc38a..10ff8de31e7 100644
--- a/sql/updates/7465_world_trinity_string.sql
+++ b/sql/updates/7465_world_trinity_string.sql
@@ -1,4 +1,6 @@
-INSERT INTO trinity_string (`entry`, `content_default`) VALUES (5024, 'Entry: %u');
-INSERT INTO trinity_string (`entry`, `content_default`) VALUES (5025, 'Type: %u');
-INSERT INTO trinity_string (`entry`, `content_default`) VALUES (5026, 'DisplayID: %u');
-INSERT INTO trinity_string (`entry`, `content_default`) VALUES (5027, 'Name: %s');
+DELETE FROM `trinity_string` WHERE `entry` IN (5024,5025,5026,5027);
+INSERT INTO trinity_string (`entry`, `content_default`) VALUES 
+(5024, 'Entry: %u'),
+(5025, 'Type: %u'),
+(5026, 'DisplayID: %u'),
+(5027, 'Name: %s');
diff --git a/sql/world.sql b/sql/world.sql
index d4da956750d..41844b7b785 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -38,6 +38,7 @@ CREATE TABLE `access_requirement` (
   `heroic_quest_done` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `heroic_quest_failed_text` text,
   `comment` text,
+  `status` tinyint(3) unsigned DEFAULT '15' COMMENT 'instance status (open/close)',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Access Requirements';
 /*!40101 SET character_set_client = @saved_cs_client */;