From 1503f7c07ec06856bd5a052651f4bdb7558b8bdc Mon Sep 17 00:00:00 2001
From: Travis CI <travis@build.bot>
Date: Mon, 15 Oct 2018 18:38:41 +0000
Subject: [PATCH] Importing pending sql

---
 data/sql/updates/db_world/2018_10_15_00.sql   | 30 +++++++++++++++++++
 .../rev_1528129508252853447.sql               |  5 ----
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 data/sql/updates/db_world/2018_10_15_00.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1528129508252853447.sql

diff --git a/data/sql/updates/db_world/2018_10_15_00.sql b/data/sql/updates/db_world/2018_10_15_00.sql
new file mode 100644
index 000000000..77fe32768
--- /dev/null
+++ b/data/sql/updates/db_world/2018_10_15_00.sql
@@ -0,0 +1,30 @@
+-- DB update 2018_10_13_00 -> 2018_10_15_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 = '2018_10_13_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2018_10_13_00 2018_10_15_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1528129508252853447'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1528129508252853447');
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1969,1971);
+UPDATE `creature_template` SET `gossip_menu_id` = 2441 WHERE `entry` = 3149;
+UPDATE `creature_template` SET `gossip_menu_id` = 3842 WHERE `entry` = 12137;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1528129508252853447.sql b/data/sql/updates/pending_db_world/rev_1528129508252853447.sql
deleted file mode 100644
index 409ecef21..000000000
--- a/data/sql/updates/pending_db_world/rev_1528129508252853447.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1528129508252853447');
-
-DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (1969,1971);
-UPDATE `creature_template` SET `gossip_menu_id` = 2441 WHERE `entry` = 3149;
-UPDATE `creature_template` SET `gossip_menu_id` = 3842 WHERE `entry` = 12137;