From aaa1387ad60e6b54ffc555b46ae80f2146dac8fb Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Fri, 9 Jul 2021 14:46:59 +0000
Subject: [PATCH] chore(DB): import pending files

Referenced commit(s): e753aed3a977310025b85b49820456b25d317a4b
---
 data/sql/updates/db_world/2021_07_09_05.sql   | 35 +++++++++++++++++++
 .../rev_1625663426005917331.sql               |  9 -----
 2 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 data/sql/updates/db_world/2021_07_09_05.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1625663426005917331.sql

diff --git a/data/sql/updates/db_world/2021_07_09_05.sql b/data/sql/updates/db_world/2021_07_09_05.sql
new file mode 100644
index 000000000..4fb9562d7
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_09_05.sql
@@ -0,0 +1,35 @@
+-- DB update 2021_07_09_04 -> 2021_07_09_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 = '2021_07_09_04';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_09_04 2021_07_09_05 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1625663426005917331'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625663426005917331');
+
+-- Move 5 ore nodes up by 6 units so they do not spawn underground
+UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 1735 AND `guid` = 71090;
+UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 2040 AND `guid` = 71091;
+UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 1734 AND `guid` = 71092;
+UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 1733 AND `guid` = 71093;
+UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 2047 AND `guid` = 71094;
+
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_09_05' WHERE sql_rev = '1625663426005917331';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1625663426005917331.sql b/data/sql/updates/pending_db_world/rev_1625663426005917331.sql
deleted file mode 100644
index 9324f6400..000000000
--- a/data/sql/updates/pending_db_world/rev_1625663426005917331.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1625663426005917331');
-
--- Move 5 ore nodes up by 6 units so they do not spawn underground
-UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 1735 AND `guid` = 71090;
-UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 2040 AND `guid` = 71091;
-UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 1734 AND `guid` = 71092;
-UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 1733 AND `guid` = 71093;
-UPDATE `gameobject` SET `position_z` = 263.1 WHERE `id` = 2047 AND `guid` = 71094;
-