From f49e65110714bc495104a1ce858b911ba278ff70 Mon Sep 17 00:00:00 2001
From: Travis CI <travis@build.bot>
Date: Thu, 22 Nov 2018 14:24:06 +0000
Subject: [PATCH] Importing pending sql

---
 data/sql/updates/db_world/2018_11_22_00.sql   | 27 +++++++++++++++++++
 .../rev_1542756898843297200.sql               |  2 --
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 data/sql/updates/db_world/2018_11_22_00.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1542756898843297200.sql

diff --git a/data/sql/updates/db_world/2018_11_22_00.sql b/data/sql/updates/db_world/2018_11_22_00.sql
new file mode 100644
index 000000000..bc1d6e3f1
--- /dev/null
+++ b/data/sql/updates/db_world/2018_11_22_00.sql
@@ -0,0 +1,27 @@
+-- DB update 2018_11_15_00 -> 2018_11_22_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_11_15_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2018_11_15_00 2018_11_22_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1542756898843297200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1542756898843297200');
+UPDATE `quest_template` SET `OfferRewardText`='Another one of Eitrigg\'s recruits, hm?$B$BA sorry state of affairs we find ourselves in if this is the best the Horde can produce. No matter. By the time we think you\'re ready to leave the Valley, you\'ll be a proud warrior of the Horde.' WHERE  `ID`=787;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1542756898843297200.sql b/data/sql/updates/pending_db_world/rev_1542756898843297200.sql
deleted file mode 100644
index 91f7d35fb..000000000
--- a/data/sql/updates/pending_db_world/rev_1542756898843297200.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1542756898843297200');
-UPDATE `quest_template` SET `OfferRewardText`='Another one of Eitrigg\'s recruits, hm?$B$BA sorry state of affairs we find ourselves in if this is the best the Horde can produce. No matter. By the time we think you\'re ready to leave the Valley, you\'ll be a proud warrior of the Horde.' WHERE  `ID`=787;