From b2f08934bcc60491f8fa8971f98837b2d48a489e Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Mon, 27 Sep 2021 22:15:03 +0000
Subject: [PATCH] chore(DB): import pending files

Referenced commit(s): 2cfb0d307d0130f6d2bb20ab31ad7f39ddeab198
---
 .../2021_09_27_03.sql}                        | 26 ++++++++++++++++
 data/sql/updates/db_world/2021_09_27_04.sql   | 31 +++++++++++++++++++
 .../rev_1632332436826853639.sql               |  5 ---
 3 files changed, 57 insertions(+), 5 deletions(-)
 rename data/sql/updates/{pending_db_world/rev_1632243404005705911.sql => db_world/2021_09_27_03.sql} (83%)
 create mode 100644 data/sql/updates/db_world/2021_09_27_04.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1632332436826853639.sql

diff --git a/data/sql/updates/pending_db_world/rev_1632243404005705911.sql b/data/sql/updates/db_world/2021_09_27_03.sql
similarity index 83%
rename from data/sql/updates/pending_db_world/rev_1632243404005705911.sql
rename to data/sql/updates/db_world/2021_09_27_03.sql
index cb549c978..6904a8e55 100644
--- a/data/sql/updates/pending_db_world/rev_1632243404005705911.sql
+++ b/data/sql/updates/db_world/2021_09_27_03.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_09_27_02 -> 2021_09_27_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_09_27_02';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_09_27_02 2021_09_27_03 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1632243404005705911'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1632243404005705911');
 
 DELETE FROM `spell_script_names` WHERE `spell_id` = 7102 AND `ScriptName` = "spell_contagion_of_rot";
@@ -33,3 +49,13 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
 DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` = 2) AND (`SourceEntry` = 7103) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 1) AND (`ConditionTarget` = 0) AND (`ConditionValue1` = 7102) AND (`ConditionValue2` = 0) AND (`ConditionValue3` = 0);
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
 (13, 2, 7103, 0, 0, 1, 0, 7102, 0, 0, 1, 0, 0, '', '');
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_09_27_03' WHERE sql_rev = '1632243404005705911';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_09_27_04.sql b/data/sql/updates/db_world/2021_09_27_04.sql
new file mode 100644
index 000000000..176c19a1f
--- /dev/null
+++ b/data/sql/updates/db_world/2021_09_27_04.sql
@@ -0,0 +1,31 @@
+-- DB update 2021_09_27_03 -> 2021_09_27_04
+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_09_27_03';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_09_27_03 2021_09_27_04 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1632332436826853639'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1632332436826853639');
+
+-- Delete incorrect DisplayID Other Gender for captain Halyndor
+UPDATE `creature_model_info` SET `DisplayID_Other_Gender`= 0 WHERE `DisplayID`= 3494;
+
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_09_27_04' WHERE sql_rev = '1632332436826853639';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1632332436826853639.sql b/data/sql/updates/pending_db_world/rev_1632332436826853639.sql
deleted file mode 100644
index 82193a542..000000000
--- a/data/sql/updates/pending_db_world/rev_1632332436826853639.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1632332436826853639');
-
--- Delete incorrect DisplayID Other Gender for captain Halyndor
-UPDATE `creature_model_info` SET `DisplayID_Other_Gender`= 0 WHERE `DisplayID`= 3494;
-