From b3c7d52449583538e06ee77ef980adad19e27e58 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Mon, 29 Nov 2021 23:59:13 +0000
Subject: [PATCH] chore(DB): import pending files

Referenced commit(s): 201fb580a41f36ee317b66b6ee57cec2150b5c7e
---
 data/sql/updates/db_world/2021_11_29_06.sql   | 33 +++++++++++++++++++
 .../rev_1637860809744969300.sql               |  7 ----
 2 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 data/sql/updates/db_world/2021_11_29_06.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1637860809744969300.sql

diff --git a/data/sql/updates/db_world/2021_11_29_06.sql b/data/sql/updates/db_world/2021_11_29_06.sql
new file mode 100644
index 000000000..a461b3187
--- /dev/null
+++ b/data/sql/updates/db_world/2021_11_29_06.sql
@@ -0,0 +1,33 @@
+-- DB update 2021_11_29_05 -> 2021_11_29_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_29_05';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_11_29_05 2021_11_29_06 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1637860809744969300'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1637860809744969300');
+
+-- Set proper modelid
+UPDATE `creature_template` SET `modelid1`=31248, `modelid2`=31007 WHERE `entry`=38545; -- Invincible
+UPDATE `creature_template` SET `modelid1`=31957, `modelid2`=31958 WHERE `entry`=40625; -- Celestial Steed
+-- Invincible wrong otherGender displayID
+UPDATE `creature_model_info` SET `DisplayID_Other_Gender`=0 WHERE `DisplayID` IN (31007,31248);
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_11_29_06' WHERE sql_rev = '1637860809744969300';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1637860809744969300.sql b/data/sql/updates/pending_db_world/rev_1637860809744969300.sql
deleted file mode 100644
index 89886ca04..000000000
--- a/data/sql/updates/pending_db_world/rev_1637860809744969300.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1637860809744969300');
-
--- Set proper modelid
-UPDATE `creature_template` SET `modelid1`=31248, `modelid2`=31007 WHERE `entry`=38545; -- Invincible
-UPDATE `creature_template` SET `modelid1`=31957, `modelid2`=31958 WHERE `entry`=40625; -- Celestial Steed
--- Invincible wrong otherGender displayID
-UPDATE `creature_model_info` SET `DisplayID_Other_Gender`=0 WHERE `DisplayID` IN (31007,31248);