From 6cac04d990c7f938a37907520b0ed941e7886baf Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Fri, 5 Nov 2021 14:58:56 +0000
Subject: [PATCH] chore(DB): import pending files

Referenced commit(s): c24fcc7efda937b6cb6b91db04e2ddbabc1de717
---
 data/sql/updates/db_world/2021_11_05_06.sql   | 32 +++++++++++++++++++
 data/sql/updates/db_world/2021_11_05_07.sql   | 31 ++++++++++++++++++
 .../rev_1633787767742446400.sql               |  6 ----
 .../rev_1635875025536424855.sql               |  5 ---
 4 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 data/sql/updates/db_world/2021_11_05_06.sql
 create mode 100644 data/sql/updates/db_world/2021_11_05_07.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1633787767742446400.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1635875025536424855.sql

diff --git a/data/sql/updates/db_world/2021_11_05_06.sql b/data/sql/updates/db_world/2021_11_05_06.sql
new file mode 100644
index 000000000..ced265812
--- /dev/null
+++ b/data/sql/updates/db_world/2021_11_05_06.sql
@@ -0,0 +1,32 @@
+-- DB update 2021_11_05_05 -> 2021_11_05_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_11_05_05';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_11_05_05 2021_11_05_06 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1633787767742446400'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1633787767742446400');
+
+-- Raise Ally control aura should not be saved
+DELETE FROM `spell_custom_attr` WHERE `spell_id` = '46619';
+INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES
+('46619', '268435456');
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_11_05_06' WHERE sql_rev = '1633787767742446400';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_11_05_07.sql b/data/sql/updates/db_world/2021_11_05_07.sql
new file mode 100644
index 000000000..93456f000
--- /dev/null
+++ b/data/sql/updates/db_world/2021_11_05_07.sql
@@ -0,0 +1,31 @@
+-- DB update 2021_11_05_06 -> 2021_11_05_07
+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_11_05_06';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_11_05_06 2021_11_05_07 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1635875025536424855'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1635875025536424855');
+
+-- Add missing gosip for Witch Doctor Uzer'i
+DELETE FROM `gossip_menu` WHERE `MenuID` IN (1289);
+INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES (1289,1924);
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_11_05_07' WHERE sql_rev = '1635875025536424855';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1633787767742446400.sql b/data/sql/updates/pending_db_world/rev_1633787767742446400.sql
deleted file mode 100644
index 61e986ee2..000000000
--- a/data/sql/updates/pending_db_world/rev_1633787767742446400.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1633787767742446400');
-
--- Raise Ally control aura should not be saved
-DELETE FROM `spell_custom_attr` WHERE `spell_id` = '46619';
-INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES
-('46619', '268435456');
diff --git a/data/sql/updates/pending_db_world/rev_1635875025536424855.sql b/data/sql/updates/pending_db_world/rev_1635875025536424855.sql
deleted file mode 100644
index efe8c1516..000000000
--- a/data/sql/updates/pending_db_world/rev_1635875025536424855.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1635875025536424855');
-
--- Add missing gosip for Witch Doctor Uzer'i
-DELETE FROM `gossip_menu` WHERE `MenuID` IN (1289);
-INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES (1289,1924);