From 1b8ea19e1a811e859d6a9349a7e3bc9ac1009b36 Mon Sep 17 00:00:00 2001
From: Travis CI <travis@build.bot>
Date: Sat, 26 May 2018 17:16:28 +0000
Subject: [PATCH] Importing pending sql

---
 data/sql/updates/db_world/2018_05_26_00.sql   | 28 +++++++++++++++++++
 .../rev_1525369154910150908.sql               |  3 --
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 data/sql/updates/db_world/2018_05_26_00.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1525369154910150908.sql

diff --git a/data/sql/updates/db_world/2018_05_26_00.sql b/data/sql/updates/db_world/2018_05_26_00.sql
new file mode 100644
index 000000000..d1efaac33
--- /dev/null
+++ b/data/sql/updates/db_world/2018_05_26_00.sql
@@ -0,0 +1,28 @@
+-- DB update 2018_05_24_00 -> 2018_05_26_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_05_24_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2018_05_24_00 2018_05_26_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1525369154910150908'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1525369154910150908');
+
+UPDATE `waypoint_data` SET `action` = 484 WHERE `id` = 297790 AND `point` = 13;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1525369154910150908.sql b/data/sql/updates/pending_db_world/rev_1525369154910150908.sql
deleted file mode 100644
index 41fa2bfc3..000000000
--- a/data/sql/updates/pending_db_world/rev_1525369154910150908.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1525369154910150908');
-
-UPDATE `waypoint_data` SET `action` = 484 WHERE `id` = 297790 AND `point` = 13;