From 08e205d44b5d06f505047b77295b1a67931ef612 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sun, 20 Jun 2021 16:24:17 +0000
Subject: [PATCH] chore(DB): import pending files

Referenced commit(s): b870fe53ef58e1d9be8c266c12870b7f5d2faa15
---
 .../2021_06_20_02.sql}                        | 26 +++++++++++++++++++
 .../2021_06_20_03.sql}                        | 26 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 rename data/sql/updates/{pending_db_world/rev_1623852796811454700.sql => db_world/2021_06_20_02.sql} (89%)
 rename data/sql/updates/{pending_db_world/rev_1624112508117718400.sql => db_world/2021_06_20_03.sql} (64%)

diff --git a/data/sql/updates/pending_db_world/rev_1623852796811454700.sql b/data/sql/updates/db_world/2021_06_20_02.sql
similarity index 89%
rename from data/sql/updates/pending_db_world/rev_1623852796811454700.sql
rename to data/sql/updates/db_world/2021_06_20_02.sql
index 303ef15f6..2d55c67ca 100644
--- a/data/sql/updates/pending_db_world/rev_1623852796811454700.sql
+++ b/data/sql/updates/db_world/2021_06_20_02.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_06_20_01 -> 2021_06_20_02
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_06_20_01';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_06_20_01 2021_06_20_02 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1623852796811454700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1623852796811454700');
 
 /* Fix NPC's gossips for locales Europe Spanish and Latin America Spanish in all cities including Shattarth and Dalaran */
@@ -78,3 +94,13 @@ UPDATE `gossip_menu_option` SET `OptionBroadcastTextID` = 80006 WHERE `MenuID` =
 UPDATE `gossip_menu_option` SET `OptionBroadcastTextID` = 80006 WHERE `MenuID` = 435 AND `OptionID` = 11;
 UPDATE `gossip_menu_option` SET `OptionBroadcastTextID` = 80006 WHERE `MenuID` = 8282 AND `OptionID` = 6;
 UPDATE `gossip_menu_option` SET `OptionBroadcastTextID` = 80007 WHERE `MenuID` = 435 AND `OptionID` = 10;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_06_20_02' WHERE sql_rev = '1623852796811454700';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1624112508117718400.sql b/data/sql/updates/db_world/2021_06_20_03.sql
similarity index 64%
rename from data/sql/updates/pending_db_world/rev_1624112508117718400.sql
rename to data/sql/updates/db_world/2021_06_20_03.sql
index 968585f64..c4c156f58 100644
--- a/data/sql/updates/pending_db_world/rev_1624112508117718400.sql
+++ b/data/sql/updates/db_world/2021_06_20_03.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_06_20_02 -> 2021_06_20_03
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_06_20_02';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_06_20_02 2021_06_20_03 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1624112508117718400'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1624112508117718400');
 
 
@@ -20,3 +36,13 @@ DELETE FROM `creature` WHERE `id` = 2870 AND `guid` = 86176;
 /* Delete npc from in-game world, not from acore_world.creature_template
 See issue #6435 */
 
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_06_20_03' WHERE sql_rev = '1624112508117718400';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;