From f16fe3f8dc5e6fd0af8848714fab2195cb1182c1 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Wed, 7 Jul 2021 15:59:02 +0000
Subject: [PATCH] chore(DB): import pending files

Referenced commit(s): 52c0ba43e78752fd3b4f49584014482b1334500c
---
 .../2021_07_07_08.sql}                        | 26 +++++++++++++
 data/sql/updates/db_world/2021_07_07_09.sql   | 29 ++++++++++++++
 data/sql/updates/db_world/2021_07_07_10.sql   | 29 ++++++++++++++
 data/sql/updates/db_world/2021_07_07_11.sql   | 30 +++++++++++++++
 data/sql/updates/db_world/2021_07_07_12.sql   | 31 +++++++++++++++
 .../2021_07_07_13.sql}                        | 26 +++++++++++++
 data/sql/updates/db_world/2021_07_07_14.sql   | 32 ++++++++++++++++
 data/sql/updates/db_world/2021_07_07_15.sql   | 33 ++++++++++++++++
 data/sql/updates/db_world/2021_07_07_16.sql   | 31 +++++++++++++++
 data/sql/updates/db_world/2021_07_07_17.sql   | 33 ++++++++++++++++
 .../2021_07_07_18.sql}                        | 26 +++++++++++++
 data/sql/updates/db_world/2021_07_07_19.sql   | 38 +++++++++++++++++++
 data/sql/updates/db_world/2021_07_07_20.sql   | 30 +++++++++++++++
 data/sql/updates/db_world/2021_07_07_21.sql   | 33 ++++++++++++++++
 .../2021_07_07_22.sql}                        | 26 +++++++++++++
 .../rev_1625401809536592600.sql               |  3 --
 .../rev_1625406775061855034.sql               |  3 --
 .../rev_1625409146842998000.sql               |  4 --
 .../rev_1625410362418489198.sql               |  5 ---
 .../rev_1625485014381956791.sql               |  6 ---
 .../rev_1625489162833644602.sql               |  7 ----
 .../rev_1625490612430815354.sql               |  5 ---
 .../rev_1625511611223853500.sql               |  7 ----
 .../rev_1625577114142882549.sql               | 12 ------
 .../rev_1625579303979883175.sql               |  4 --
 .../rev_1625583552450565968.sql               |  7 ----
 26 files changed, 453 insertions(+), 63 deletions(-)
 rename data/sql/updates/{pending_db_world/rev_1625304053277095200.sql => db_world/2021_07_07_08.sql} (78%)
 create mode 100644 data/sql/updates/db_world/2021_07_07_09.sql
 create mode 100644 data/sql/updates/db_world/2021_07_07_10.sql
 create mode 100644 data/sql/updates/db_world/2021_07_07_11.sql
 create mode 100644 data/sql/updates/db_world/2021_07_07_12.sql
 rename data/sql/updates/{pending_db_world/rev_1625434614739025100.sql => db_world/2021_07_07_13.sql} (91%)
 create mode 100644 data/sql/updates/db_world/2021_07_07_14.sql
 create mode 100644 data/sql/updates/db_world/2021_07_07_15.sql
 create mode 100644 data/sql/updates/db_world/2021_07_07_16.sql
 create mode 100644 data/sql/updates/db_world/2021_07_07_17.sql
 rename data/sql/updates/{pending_db_world/rev_1625515191527869300.sql => db_world/2021_07_07_18.sql} (64%)
 create mode 100644 data/sql/updates/db_world/2021_07_07_19.sql
 create mode 100644 data/sql/updates/db_world/2021_07_07_20.sql
 create mode 100644 data/sql/updates/db_world/2021_07_07_21.sql
 rename data/sql/updates/{pending_db_world/rev_1625603525661258200.sql => db_world/2021_07_07_22.sql} (85%)
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625401809536592600.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625406775061855034.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625409146842998000.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625410362418489198.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625485014381956791.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625489162833644602.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625490612430815354.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625511611223853500.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625577114142882549.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625579303979883175.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625583552450565968.sql

diff --git a/data/sql/updates/pending_db_world/rev_1625304053277095200.sql b/data/sql/updates/db_world/2021_07_07_08.sql
similarity index 78%
rename from data/sql/updates/pending_db_world/rev_1625304053277095200.sql
rename to data/sql/updates/db_world/2021_07_07_08.sql
index 3bbcdd3b7..f05f78ac1 100644
--- a/data/sql/updates/pending_db_world/rev_1625304053277095200.sql
+++ b/data/sql/updates/db_world/2021_07_07_08.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_07_07_07 -> 2021_07_07_08
+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_07_07_07';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_07 2021_07_07_08 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625304053277095200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625304053277095200');
 
 -- Quest: The Divination (2992)
@@ -22,3 +38,13 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan
 (8022,1,0,"Now, watch...",12,0,100,0,0,0,4127,0,"Thadius Grimshade"),
 (8022,2,0,"There.  It is done.",12,0,100,0,0,0,4128,0,"Thadius Grimshade");
 
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_08' WHERE sql_rev = '1625304053277095200';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_09.sql b/data/sql/updates/db_world/2021_07_07_09.sql
new file mode 100644
index 000000000..0e6a1ff82
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_09.sql
@@ -0,0 +1,29 @@
+-- DB update 2021_07_07_08 -> 2021_07_07_09
+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_07_07_08';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_08 2021_07_07_09 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625401809536592600'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625401809536592600');
+
+UPDATE `creature_template_locale` SET `Title`='Schurkenlehrerin' WHERE  `entry`=16279 AND `locale`='deDE';
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_09' WHERE sql_rev = '1625401809536592600';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_10.sql b/data/sql/updates/db_world/2021_07_07_10.sql
new file mode 100644
index 000000000..c5bc5c955
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_10.sql
@@ -0,0 +1,29 @@
+-- DB update 2021_07_07_09 -> 2021_07_07_10
+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_07_07_09';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_09 2021_07_07_10 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625406775061855034'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625406775061855034');
+
+UPDATE `quest_template_addon` SET `RequiredSkillPoints` = 210 WHERE `ID` = 2203;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_10' WHERE sql_rev = '1625406775061855034';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_11.sql b/data/sql/updates/db_world/2021_07_07_11.sql
new file mode 100644
index 000000000..792c8fb84
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_11.sql
@@ -0,0 +1,30 @@
+-- DB update 2021_07_07_10 -> 2021_07_07_11
+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_07_07_10';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_10 2021_07_07_11 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625409146842998000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625409146842998000');
+
+-- Fix https://github.com/azerothcore/azerothcore-wotlk/issues/6720
+UPDATE `quest_template_addon` SET `PrevQuestID` = 1418 WHERE `ID` = 1420;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_11' WHERE sql_rev = '1625409146842998000';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_12.sql b/data/sql/updates/db_world/2021_07_07_12.sql
new file mode 100644
index 000000000..42f4e3871
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_12.sql
@@ -0,0 +1,31 @@
+-- DB update 2021_07_07_11 -> 2021_07_07_12
+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_07_07_11';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_11 2021_07_07_12 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625410362418489198'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625410362418489198');
+
+UPDATE `gameobject` SET `spawntimesecs` = 0 WHERE `id` = 2842 AND `guid` = 10643;
+UPDATE `gameobject` SET `spawntimesecs` = 0 WHERE `id` = 2848 AND `guid` = 10644;
+UPDATE `gameobject` SET `spawntimesecs` = 0 WHERE `id` = 2858 AND `guid` = 10830;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_12' WHERE sql_rev = '1625410362418489198';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1625434614739025100.sql b/data/sql/updates/db_world/2021_07_07_13.sql
similarity index 91%
rename from data/sql/updates/pending_db_world/rev_1625434614739025100.sql
rename to data/sql/updates/db_world/2021_07_07_13.sql
index 92fb66e47..57f95c6f7 100644
--- a/data/sql/updates/pending_db_world/rev_1625434614739025100.sql
+++ b/data/sql/updates/db_world/2021_07_07_13.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_07_07_12 -> 2021_07_07_13
+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_07_07_12';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_12 2021_07_07_13 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625434614739025100'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625434614739025100');
 
@@ -66,3 +82,13 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan
 (8480, 8, 0, 'The legion of Blackrock comes, dwarflings! We shall scorch the earth and set fire to the heavens. None shall survive...', 14, 0, 100, 0, 0, 0, 4465, 0, 'Kalaran the Deceiver');
 
 
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_13' WHERE sql_rev = '1625434614739025100';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_14.sql b/data/sql/updates/db_world/2021_07_07_14.sql
new file mode 100644
index 000000000..319acd983
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_14.sql
@@ -0,0 +1,32 @@
+-- DB update 2021_07_07_13 -> 2021_07_07_14
+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_07_07_13';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_13 2021_07_07_14 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625485014381956791'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625485014381956791');
+
+-- Relocate Dread Swoop
+DELETE FROM `creature` WHERE `id` = 4692 AND `guid` = 27980;
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+(27980, 4692, 1, 0, 0, 1, 1, 1192, 0, 52.892, 1563.021, 124.512, 3.459, 300, 3, 0, 1163, 0, 1, 0, 0, 0, '', 0);
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_14' WHERE sql_rev = '1625485014381956791';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_15.sql b/data/sql/updates/db_world/2021_07_07_15.sql
new file mode 100644
index 000000000..adadd69e9
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_15.sql
@@ -0,0 +1,33 @@
+-- DB update 2021_07_07_14 -> 2021_07_07_15
+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_07_07_14';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_14 2021_07_07_15 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625489162833644602'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625489162833644602');
+
+-- Add gossip to Maggran Earthbinder
+DELETE FROM `gossip_menu` WHERE `MenuID` = 50008;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES
+(50008, 5443);
+UPDATE `creature_template` SET `gossip_menu_id` = 50008 WHERE `entry` = 11860;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_15' WHERE sql_rev = '1625489162833644602';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_16.sql b/data/sql/updates/db_world/2021_07_07_16.sql
new file mode 100644
index 000000000..e604a7044
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_16.sql
@@ -0,0 +1,31 @@
+-- DB update 2021_07_07_15 -> 2021_07_07_16
+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_07_07_15';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_15 2021_07_07_16 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625490612430815354'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625490612430815354');
+
+-- Remove Whit Wantmal's loot table
+UPDATE `creature_template` SET `lootid` = 0 WHERE `entry` = 275;
+DELETE FROM `creature_loot_template` WHERE `Entry` = 275;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_16' WHERE sql_rev = '1625490612430815354';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_17.sql b/data/sql/updates/db_world/2021_07_07_17.sql
new file mode 100644
index 000000000..b7846affc
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_17.sql
@@ -0,0 +1,33 @@
+-- DB update 2021_07_07_16 -> 2021_07_07_17
+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_07_07_16';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_16 2021_07_07_17 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625511611223853500'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625511611223853500');
+
+-- It was set to waypoint movement
+UPDATE `creature_template` SET `MovementType` = 0 WHERE (`entry` = 16916);
+
+-- It was set to random movement
+UPDATE `creature` SET `MovementType` = 0 WHERE (`id` = 16916) AND (`guid` IN (58691));
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_17' WHERE sql_rev = '1625511611223853500';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1625515191527869300.sql b/data/sql/updates/db_world/2021_07_07_18.sql
similarity index 64%
rename from data/sql/updates/pending_db_world/rev_1625515191527869300.sql
rename to data/sql/updates/db_world/2021_07_07_18.sql
index a1a6e1801..f3c9417f2 100644
--- a/data/sql/updates/pending_db_world/rev_1625515191527869300.sql
+++ b/data/sql/updates/db_world/2021_07_07_18.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_07_07_17 -> 2021_07_07_18
+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_07_07_17';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_17 2021_07_07_18 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625515191527869300'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625515191527869300');
 
 UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` = 178908;
@@ -8,3 +24,13 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (178908, 1, 1, 0, 8, 0, 100, 0, 21885, 0, 0, 0, 0, 12, 13696, 4, 30000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Vylestem Vine - On Spellhit \'Heal Vylestem Vine\' - Summon Creature \'Noxxious Scion\''),
 (178908, 1, 2, 0, 8, 0, 100, 0, 21885, 0, 0, 0, 0, 12, 13696, 4, 30000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Vylestem Vine - On Spellhit \'Heal Vylestem Vine\' - Summon Creature \'Noxxious Scion\''),
 (178908, 1, 3, 0, 8, 0, 100, 0, 21885, 0, 0, 0, 0, 99, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Vylestem Vine - On Spellhit \'Heal Vylestem Vine\' - Set Lootstate Deactivated');
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_18' WHERE sql_rev = '1625515191527869300';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_19.sql b/data/sql/updates/db_world/2021_07_07_19.sql
new file mode 100644
index 000000000..c9f9b4aca
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_19.sql
@@ -0,0 +1,38 @@
+-- DB update 2021_07_07_18 -> 2021_07_07_19
+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_07_07_18';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_18 2021_07_07_19 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625577114142882549'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625577114142882549');
+
+-- Delete various incorrect items from Torwa's Pouch
+DELETE FROM `item_loot_template` WHERE `Entry` = 11568 AND `Item` IN (2450, 3820, 8838, 11018, 16204);
+-- Make Preserved Pheromone Mixture drop with 100% chance
+UPDATE `item_loot_template` SET `Chance` = 100 WHERE `Entry` = 11568 AND `Item` = 11570;
+
+-- Delete Threshadon Meat/Preserved Pheromone from Hoard of the Black Dragonflight
+DELETE FROM `item_loot_template` WHERE `Entry` = 10569 AND `Item` IN (11569, 11570);
+
+-- Delete Threshadon Meat/Preserved Pheromone from A Small Pack
+DELETE FROM `item_loot_template` WHERE `Entry` = 11107 AND `Item` IN (11569, 11570);
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_19' WHERE sql_rev = '1625577114142882549';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_20.sql b/data/sql/updates/db_world/2021_07_07_20.sql
new file mode 100644
index 000000000..9b1e801c9
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_20.sql
@@ -0,0 +1,30 @@
+-- DB update 2021_07_07_19 -> 2021_07_07_20
+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_07_07_19';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_19 2021_07_07_20 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625579303979883175'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625579303979883175');
+
+-- Correct Glasshide Gazer position and movement
+UPDATE `creature`  SET `position_z` = 16.25, `MovementType` = 1, `wander_distance` = 25 where `id` = 5420 AND `guid` = 21996;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_20' WHERE sql_rev = '1625579303979883175';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_07_07_21.sql b/data/sql/updates/db_world/2021_07_07_21.sql
new file mode 100644
index 000000000..8bcb49760
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_07_21.sql
@@ -0,0 +1,33 @@
+-- DB update 2021_07_07_20 -> 2021_07_07_21
+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_07_07_20';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_20 2021_07_07_21 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625583552450565968'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625583552450565968');
+
+-- Correct Ironfur Bear spawn position
+UPDATE `creature` SET `position_x` = -4120.52, `position_y` = -621.2, `position_z` = -18.74 WHERE `id` = 5268 AND `guid` = 50650;
+
+-- Correct Longtooth Runner spawn position
+UPDATE `creature` SET `position_x` = -4270.84, `position_y` = 36.42,  `position_z` =  55.14 WHERE `id` = 5286 AND `guid` = 50875;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_21' WHERE sql_rev = '1625583552450565968';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1625603525661258200.sql b/data/sql/updates/db_world/2021_07_07_22.sql
similarity index 85%
rename from data/sql/updates/pending_db_world/rev_1625603525661258200.sql
rename to data/sql/updates/db_world/2021_07_07_22.sql
index 1c9275693..b678014fa 100644
--- a/data/sql/updates/pending_db_world/rev_1625603525661258200.sql
+++ b/data/sql/updates/db_world/2021_07_07_22.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_07_07_21 -> 2021_07_07_22
+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_07_07_21';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_07_21 2021_07_07_22 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625603525661258200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625603525661258200');
 
 -- Witch Doctor Unbagwa
@@ -33,3 +49,13 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (1514, 0, 2, 3, 2, 0, 100, 1, 0, 30, 0, 0, 0, 11, 8269, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mokk the Savage - Between 0-30% Health - Cast \'Frenzy\' (No Repeat)'),
 (1514, 0, 3, 0, 61, 0, 100, 0, 0, 30, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mokk the Savage - Between 0-30% Health - Say Line 0 (No Repeat)'),
 (1514, 0, 4, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 10, 1219, 1449, 0, 0, 0, 0, 0, 0, 'Mokk the Savage - On Just Died - Set Data 1 1');
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_07_22' WHERE sql_rev = '1625603525661258200';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1625401809536592600.sql b/data/sql/updates/pending_db_world/rev_1625401809536592600.sql
deleted file mode 100644
index 0479e2c63..000000000
--- a/data/sql/updates/pending_db_world/rev_1625401809536592600.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625401809536592600');
-
-UPDATE `creature_template_locale` SET `Title`='Schurkenlehrerin' WHERE  `entry`=16279 AND `locale`='deDE';
diff --git a/data/sql/updates/pending_db_world/rev_1625406775061855034.sql b/data/sql/updates/pending_db_world/rev_1625406775061855034.sql
deleted file mode 100644
index ede720a38..000000000
--- a/data/sql/updates/pending_db_world/rev_1625406775061855034.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625406775061855034');
-
-UPDATE `quest_template_addon` SET `RequiredSkillPoints` = 210 WHERE `ID` = 2203;
diff --git a/data/sql/updates/pending_db_world/rev_1625409146842998000.sql b/data/sql/updates/pending_db_world/rev_1625409146842998000.sql
deleted file mode 100644
index 88f9bd480..000000000
--- a/data/sql/updates/pending_db_world/rev_1625409146842998000.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625409146842998000');
-
--- Fix https://github.com/azerothcore/azerothcore-wotlk/issues/6720
-UPDATE `quest_template_addon` SET `PrevQuestID` = 1418 WHERE `ID` = 1420;
diff --git a/data/sql/updates/pending_db_world/rev_1625410362418489198.sql b/data/sql/updates/pending_db_world/rev_1625410362418489198.sql
deleted file mode 100644
index b47aeaf9f..000000000
--- a/data/sql/updates/pending_db_world/rev_1625410362418489198.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625410362418489198');
-
-UPDATE `gameobject` SET `spawntimesecs` = 0 WHERE `id` = 2842 AND `guid` = 10643;
-UPDATE `gameobject` SET `spawntimesecs` = 0 WHERE `id` = 2848 AND `guid` = 10644;
-UPDATE `gameobject` SET `spawntimesecs` = 0 WHERE `id` = 2858 AND `guid` = 10830;
diff --git a/data/sql/updates/pending_db_world/rev_1625485014381956791.sql b/data/sql/updates/pending_db_world/rev_1625485014381956791.sql
deleted file mode 100644
index 0274954cf..000000000
--- a/data/sql/updates/pending_db_world/rev_1625485014381956791.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625485014381956791');
-
--- Relocate Dread Swoop
-DELETE FROM `creature` WHERE `id` = 4692 AND `guid` = 27980;
-INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
-(27980, 4692, 1, 0, 0, 1, 1, 1192, 0, 52.892, 1563.021, 124.512, 3.459, 300, 3, 0, 1163, 0, 1, 0, 0, 0, '', 0);
diff --git a/data/sql/updates/pending_db_world/rev_1625489162833644602.sql b/data/sql/updates/pending_db_world/rev_1625489162833644602.sql
deleted file mode 100644
index c81131159..000000000
--- a/data/sql/updates/pending_db_world/rev_1625489162833644602.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625489162833644602');
-
--- Add gossip to Maggran Earthbinder
-DELETE FROM `gossip_menu` WHERE `MenuID` = 50008;
-INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES
-(50008, 5443);
-UPDATE `creature_template` SET `gossip_menu_id` = 50008 WHERE `entry` = 11860;
diff --git a/data/sql/updates/pending_db_world/rev_1625490612430815354.sql b/data/sql/updates/pending_db_world/rev_1625490612430815354.sql
deleted file mode 100644
index efc26f1a8..000000000
--- a/data/sql/updates/pending_db_world/rev_1625490612430815354.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625490612430815354');
-
--- Remove Whit Wantmal's loot table
-UPDATE `creature_template` SET `lootid` = 0 WHERE `entry` = 275;
-DELETE FROM `creature_loot_template` WHERE `Entry` = 275;
diff --git a/data/sql/updates/pending_db_world/rev_1625511611223853500.sql b/data/sql/updates/pending_db_world/rev_1625511611223853500.sql
deleted file mode 100644
index 4dc3bed7b..000000000
--- a/data/sql/updates/pending_db_world/rev_1625511611223853500.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625511611223853500');
-
--- It was set to waypoint movement
-UPDATE `creature_template` SET `MovementType` = 0 WHERE (`entry` = 16916);
-
--- It was set to random movement
-UPDATE `creature` SET `MovementType` = 0 WHERE (`id` = 16916) AND (`guid` IN (58691));
diff --git a/data/sql/updates/pending_db_world/rev_1625577114142882549.sql b/data/sql/updates/pending_db_world/rev_1625577114142882549.sql
deleted file mode 100644
index 3482d46ba..000000000
--- a/data/sql/updates/pending_db_world/rev_1625577114142882549.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625577114142882549');
-
--- Delete various incorrect items from Torwa's Pouch
-DELETE FROM `item_loot_template` WHERE `Entry` = 11568 AND `Item` IN (2450, 3820, 8838, 11018, 16204);
--- Make Preserved Pheromone Mixture drop with 100% chance
-UPDATE `item_loot_template` SET `Chance` = 100 WHERE `Entry` = 11568 AND `Item` = 11570;
-
--- Delete Threshadon Meat/Preserved Pheromone from Hoard of the Black Dragonflight
-DELETE FROM `item_loot_template` WHERE `Entry` = 10569 AND `Item` IN (11569, 11570);
-
--- Delete Threshadon Meat/Preserved Pheromone from A Small Pack
-DELETE FROM `item_loot_template` WHERE `Entry` = 11107 AND `Item` IN (11569, 11570);
diff --git a/data/sql/updates/pending_db_world/rev_1625579303979883175.sql b/data/sql/updates/pending_db_world/rev_1625579303979883175.sql
deleted file mode 100644
index 72b819b40..000000000
--- a/data/sql/updates/pending_db_world/rev_1625579303979883175.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625579303979883175');
-
--- Correct Glasshide Gazer position and movement
-UPDATE `creature`  SET `position_z` = 16.25, `MovementType` = 1, `wander_distance` = 25 where `id` = 5420 AND `guid` = 21996;
diff --git a/data/sql/updates/pending_db_world/rev_1625583552450565968.sql b/data/sql/updates/pending_db_world/rev_1625583552450565968.sql
deleted file mode 100644
index 30b87abac..000000000
--- a/data/sql/updates/pending_db_world/rev_1625583552450565968.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625583552450565968');
-
--- Correct Ironfur Bear spawn position
-UPDATE `creature` SET `position_x` = -4120.52, `position_y` = -621.2, `position_z` = -18.74 WHERE `id` = 5268 AND `guid` = 50650;
-
--- Correct Longtooth Runner spawn position
-UPDATE `creature` SET `position_x` = -4270.84, `position_y` = 36.42,  `position_z` =  55.14 WHERE `id` = 5286 AND `guid` = 50875;