From d55c44c74dd8d67311e42566ae252e53b0a6d234 Mon Sep 17 00:00:00 2001
From: Travis CI <travis@build.bot>
Date: Sun, 25 Nov 2018 15:31:44 +0000
Subject: [PATCH] Importing pending sql

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

diff --git a/data/sql/updates/db_world/2018_11_25_00.sql b/data/sql/updates/db_world/2018_11_25_00.sql
new file mode 100644
index 000000000..61638995c
--- /dev/null
+++ b/data/sql/updates/db_world/2018_11_25_00.sql
@@ -0,0 +1,27 @@
+-- DB update 2018_11_24_00 -> 2018_11_25_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_24_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2018_11_24_00 2018_11_25_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1542924166930408100'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1542924166930408100');
+UPDATE `creature_equip_template` SET `ItemID1`='35' WHERE `CreatureID`=4240 AND `ID`=1;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1542924166930408100.sql b/data/sql/updates/pending_db_world/rev_1542924166930408100.sql
deleted file mode 100644
index dcd53923d..000000000
--- a/data/sql/updates/pending_db_world/rev_1542924166930408100.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1542924166930408100');
-UPDATE `creature_equip_template` SET `ItemID1`='35' WHERE `CreatureID`=4240 AND `ID`=1;