From cdb824546431a9cda728d21eb62aab0e9b5b3a9e Mon Sep 17 00:00:00 2001
From: ShinDarth <borzifrancesco@gmail.com>
Date: Sat, 26 Nov 2016 21:08:10 +0100
Subject: [PATCH] Import pending SQLs

---
 .../2016_11_26_00.sql}                        | 20 +++++++++++++++++++
 .../2016_11_26_01.sql}                        | 20 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 rename data/sql/updates/{pending_db_world/rev_1478948588825091300.sql => db_world/2016_11_26_00.sql} (57%)
 rename data/sql/updates/{pending_db_world/rev_1479653240477084000.sql => db_world/2016_11_26_01.sql} (86%)

diff --git a/data/sql/updates/pending_db_world/rev_1478948588825091300.sql b/data/sql/updates/db_world/2016_11_26_00.sql
similarity index 57%
rename from data/sql/updates/pending_db_world/rev_1478948588825091300.sql
rename to data/sql/updates/db_world/2016_11_26_00.sql
index 3adccb555..a969fb2aa 100644
--- a/data/sql/updates/pending_db_world/rev_1478948588825091300.sql
+++ b/data/sql/updates/db_world/2016_11_26_00.sql
@@ -1,6 +1,26 @@
+-- DB update 2016_11_19_00 -> 2016_11_26_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2016_11_19_00 2016_11_26_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1478948588825091300'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
 INSERT INTO version_db_world(`sql_rev`) VALUES ('1478948588825091300');
 
 -- Mute for player
 DELETE FROM trinity_string WHERE entry = 30000;
 INSERT INTO trinity_string(`entry`,`content_default`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES 
 (30000, 'Speaking is allowed after playing for at least %d. You may use party and guild chat.','Podrás hablar cuando hayas jugado durante al menos %d. Puedes usar el chat de grupo y de hermandad.','Podrás hablar cuando hayas jugado durante al menos %d. Puedes usar el chat de grupo y de hermandad','Вы сможете говорить после %d проведенных минут в игре, но можете использовать чат гильдии и группы.');
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1479653240477084000.sql b/data/sql/updates/db_world/2016_11_26_01.sql
similarity index 86%
rename from data/sql/updates/pending_db_world/rev_1479653240477084000.sql
rename to data/sql/updates/db_world/2016_11_26_01.sql
index 8c24fc429..eed3c0820 100644
--- a/data/sql/updates/pending_db_world/rev_1479653240477084000.sql
+++ b/data/sql/updates/db_world/2016_11_26_01.sql
@@ -1,3 +1,14 @@
+-- DB update 2016_11_26_00 -> 2016_11_26_01
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2016_11_26_00 2016_11_26_01 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1479653240477084000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
 INSERT INTO version_db_world (`sql_rev`) VALUES ('1479653240477084000');
 
 DROP TABLE IF EXISTS `creature_questitem`;
@@ -44,3 +55,12 @@ INSERT INTO creature_questitem (`CreatureEntry`, `Idx`, `ItemId`)
 
 ALTER TABLE `creature_template` DROP `questItem1`, DROP `questItem2`, DROP `questItem3`, DROP `questItem4`, DROP `questItem5`, DROP `questItem6`;
 ALTER TABLE `gameobject_template` DROP `questItem1`, DROP `questItem2`, DROP `questItem3`, DROP `questItem4`, DROP `questItem5`, DROP `questItem6`;
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;