From e1bf18374124ff05ab41f8014f001d27af1ab865 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sat, 18 Jul 2020 14:43:14 +0000
Subject: [PATCH] Import pending SQL update file...

Referenced commit(s): 8de2b063b281f9d916d390bc7bdb5e659324b148
---
 data/sql/updates/db_world/2020_07_18_00.sql   | 30 +++++++++++++++++++
 .../rev_1590769251197902700.sql               |  5 ----
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 data/sql/updates/db_world/2020_07_18_00.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1590769251197902700.sql

diff --git a/data/sql/updates/db_world/2020_07_18_00.sql b/data/sql/updates/db_world/2020_07_18_00.sql
new file mode 100644
index 000000000..080f8c7a2
--- /dev/null
+++ b/data/sql/updates/db_world/2020_07_18_00.sql
@@ -0,0 +1,30 @@
+-- DB update 2020_07_17_00 -> 2020_07_18_00
+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 = '2020_07_17_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2020_07_17_00 2020_07_18_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1590769251197902700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1590769251197902700');
+
+-- Change maraudon portal faction to 0 (usable by both factions)
+UPDATE `gameobject_template_addon` SET `faction` = 0 WHERE `entry` = 178404;
+DELETE FROM `gameobject` WHERE `guid` = 265127 AND `id` = 178404;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1590769251197902700.sql b/data/sql/updates/pending_db_world/rev_1590769251197902700.sql
deleted file mode 100644
index 51ade2a64..000000000
--- a/data/sql/updates/pending_db_world/rev_1590769251197902700.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1590769251197902700');
-
--- Change maraudon portal faction to 0 (usable by both factions)
-UPDATE `gameobject_template_addon` SET `faction` = 0 WHERE `entry` = 178404;
-DELETE FROM `gameobject` WHERE `guid` = 265127 AND `id` = 178404;