From 498e01e7fcb461346ae703b7ac413b14bae43979 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Thu, 29 Jul 2021 12:18:36 +0000
Subject: [PATCH] chore(DB): import pending files

Referenced commit(s): b4f2f57a44979001a1c64fe8f75447b613fc9af0
---
 data/sql/updates/db_world/2021_07_29_04.sql   | 34 +++++++++++++++++++
 .../rev_1627133872787794145.sql               |  8 -----
 2 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 data/sql/updates/db_world/2021_07_29_04.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1627133872787794145.sql

diff --git a/data/sql/updates/db_world/2021_07_29_04.sql b/data/sql/updates/db_world/2021_07_29_04.sql
new file mode 100644
index 000000000..df6a64fd3
--- /dev/null
+++ b/data/sql/updates/db_world/2021_07_29_04.sql
@@ -0,0 +1,34 @@
+-- DB update 2021_07_29_03 -> 2021_07_29_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_07_29_03';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_07_29_03 2021_07_29_04 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1627133872787794145'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1627133872787794145');
+
+-- Set Bingles' tools to all have consistent respawn
+UPDATE `gameobject` SET `spawntimesecs` = 8 WHERE `id` = 104564 AND `guid` = 12863;
+UPDATE `gameobject` SET `spawntimesecs` = 8 WHERE `id` = 104569 AND `guid` = 12872;
+UPDATE `gameobject` SET `spawntimesecs` = 8 WHERE `id` = 104574 AND `guid` = 12864;
+UPDATE `gameobject` SET `spawntimesecs` = 8 WHERE `id` = 104575 AND `guid` = 12871;
+
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2021_07_29_04' WHERE sql_rev = '1627133872787794145';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1627133872787794145.sql b/data/sql/updates/pending_db_world/rev_1627133872787794145.sql
deleted file mode 100644
index 7c3fbf6f4..000000000
--- a/data/sql/updates/pending_db_world/rev_1627133872787794145.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1627133872787794145');
-
--- Set Bingles' tools to all have consistent respawn
-UPDATE `gameobject` SET `spawntimesecs` = 8 WHERE `id` = 104564 AND `guid` = 12863;
-UPDATE `gameobject` SET `spawntimesecs` = 8 WHERE `id` = 104569 AND `guid` = 12872;
-UPDATE `gameobject` SET `spawntimesecs` = 8 WHERE `id` = 104574 AND `guid` = 12864;
-UPDATE `gameobject` SET `spawntimesecs` = 8 WHERE `id` = 104575 AND `guid` = 12871;
-