From 1f4e317f518fdc96b964ecd9b2f65cca9619577a Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Fri, 12 Feb 2021 15:22:05 +0000
Subject: [PATCH] chore(DB): import pending SQL update file

Referenced commit(s): a63e41e5b39f53b1a00f83aaaf8b11da84f8976a
---
 data/sql/updates/db_world/2021_02_12_05.sql   | 34 +++++++++++++++++++
 data/sql/updates/db_world/2021_02_12_06.sql   | 30 ++++++++++++++++
 .../rev_1612566366687490200.sql               |  9 -----
 .../rev_1613116811025045289.sql               |  5 ---
 4 files changed, 64 insertions(+), 14 deletions(-)
 create mode 100644 data/sql/updates/db_world/2021_02_12_05.sql
 create mode 100644 data/sql/updates/db_world/2021_02_12_06.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1612566366687490200.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1613116811025045289.sql

diff --git a/data/sql/updates/db_world/2021_02_12_05.sql b/data/sql/updates/db_world/2021_02_12_05.sql
new file mode 100644
index 000000000..cd09cf97f
--- /dev/null
+++ b/data/sql/updates/db_world/2021_02_12_05.sql
@@ -0,0 +1,34 @@
+-- DB update 2021_02_12_04 -> 2021_02_12_05
+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_02_12_04';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_02_12_04 2021_02_12_05 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1612566366687490200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1612566366687490200');
+
+-- Relocate Strange Lockbox and add Bubbly Fissure near it.
+
+UPDATE `gameobject` SET `position_x` = 842.715, `position_y` = 2208.32, `position_z` = -136.765 WHERE `guid` = 27813;
+DELETE FROM `gameobject` WHERE (`id` = 177524) AND (`guid` = 2134520);
+INSERT INTO `gameobject` (`guid`, `id`, `position_x`, `position_y`, `position_z`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
+(2134520, 177524, 838.26, 2208.14, -136.906, -0.753998, -0.656877, 900, 100, 1);
+
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_02_12_06.sql b/data/sql/updates/db_world/2021_02_12_06.sql
new file mode 100644
index 000000000..a4d5596d5
--- /dev/null
+++ b/data/sql/updates/db_world/2021_02_12_06.sql
@@ -0,0 +1,30 @@
+-- DB update 2021_02_12_05 -> 2021_02_12_06
+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_02_12_05';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_02_12_05 2021_02_12_06 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1613116811025045289'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1613116811025045289');
+
+-- Fix prequest requirement for Encrypted Scroll
+
+UPDATE `quest_template_addon` SET `PrevQuestID`=364 WHERE `ID`=3096;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1612566366687490200.sql b/data/sql/updates/pending_db_world/rev_1612566366687490200.sql
deleted file mode 100644
index 8db10fce2..000000000
--- a/data/sql/updates/pending_db_world/rev_1612566366687490200.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1612566366687490200');
-
--- Relocate Strange Lockbox and add Bubbly Fissure near it.
-
-UPDATE `gameobject` SET `position_x` = 842.715, `position_y` = 2208.32, `position_z` = -136.765 WHERE `guid` = 27813;
-DELETE FROM `gameobject` WHERE (`id` = 177524) AND (`guid` = 2134520);
-INSERT INTO `gameobject` (`guid`, `id`, `position_x`, `position_y`, `position_z`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
-(2134520, 177524, 838.26, 2208.14, -136.906, -0.753998, -0.656877, 900, 100, 1);
-
diff --git a/data/sql/updates/pending_db_world/rev_1613116811025045289.sql b/data/sql/updates/pending_db_world/rev_1613116811025045289.sql
deleted file mode 100644
index f3f240b60..000000000
--- a/data/sql/updates/pending_db_world/rev_1613116811025045289.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1613116811025045289');
-
--- Fix prequest requirement for Encrypted Scroll
-
-UPDATE `quest_template_addon` SET `PrevQuestID`=364 WHERE `ID`=3096;