chore(DB): import pending files

Referenced commit(s): 5249f830a4249da8c88dda467bf1f7fd35f2a2dc

3 files changed, 56 insertions, 4 deletions

diff --git a/data/sql/updates/db_world/2022_04_07_04.sql b/data/sql/updates/db_world/2022_04_07_04.sql
new file mode 100644
index 0000000000..3090e53e7e
--- /dev/null
+++ b/data/sql/updates/db_world/2022_04_07_04.sql
@@ -0,0 +1,30 @@
+-- DB update 2022_04_07_03 -> 2022_04_07_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 = '2022_04_07_03';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2022_04_07_03 2022_04_07_04 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1643928221060796100'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1643928221060796100');
+
+UPDATE `gossip_menu` SET `TextID`=3218 WHERE `MenuID`=12726 AND `TextID`=17861;
+DELETE FROM `npc_text` WHERE `ID`=17861;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2022_04_07_04' WHERE sql_rev = '1643928221060796100';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1649126786433718200.sql b/data/sql/updates/db_world/2022_04_07_05.sql
index 2393633902..1d4f433288 100644
--- a/data/sql/updates/pending_db_world/rev_1649126786433718200.sql
+++ b/data/sql/updates/db_world/2022_04_07_05.sql
@@ -1,3 +1,19 @@
+-- DB update 2022_04_07_04 -> 2022_04_07_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 = '2022_04_07_04';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2022_04_07_04 2022_04_07_05 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1649126786433718200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1649126786433718200');
 
 UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 14081;
@@ -101,3 +117,13 @@ INSERT INTO `linked_respawn` (`guid`, `linkedGuid`, `linkType`) VALUES
 (84181,85601,0),
 (84163,85601,0),
 (84164,85601,0);
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2022_04_07_05' WHERE sql_rev = '1649126786433718200';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1643928221060796100.sql b/data/sql/updates/pending_db_world/rev_1643928221060796100.sql
deleted file mode 100644
index 8669090f42..0000000000
--- a/data/sql/updates/pending_db_world/rev_1643928221060796100.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1643928221060796100');
-
-UPDATE `gossip_menu` SET `TextID`=3218 WHERE `MenuID`=12726 AND `TextID`=17861;
-DELETE FROM `npc_text` WHERE `ID`=17861;