From 45715880311dbc0317393fb48d985a683aedc95e Mon Sep 17 00:00:00 2001
From: Travis CI <travis@build.bot>
Date: Tue, 8 Jan 2019 13:17:56 +0000
Subject: [PATCH] Importing pending sql

---
 data/sql/updates/db_world/2019_01_08_01.sql   | 36 +++++++++++++++++++
 .../rev_1546538959760274673.sql               | 11 ------
 2 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 data/sql/updates/db_world/2019_01_08_01.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1546538959760274673.sql

diff --git a/data/sql/updates/db_world/2019_01_08_01.sql b/data/sql/updates/db_world/2019_01_08_01.sql
new file mode 100644
index 000000000..9b34e2e2f
--- /dev/null
+++ b/data/sql/updates/db_world/2019_01_08_01.sql
@@ -0,0 +1,36 @@
+-- DB update 2019_01_08_00 -> 2019_01_08_01
+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 = '2019_01_08_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2019_01_08_00 2019_01_08_01 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1546538959760274673'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1546538959760274673');
+
+ALTER TABLE `game_event`
+ADD COLUMN `announce` tinyint(3) unsigned NOT NULL DEFAULT 2 COMMENT '0 dont announce, 1 announce, 2 value from config' AFTER `world_event`;
+
+ALTER TABLE `game_event`
+  CHANGE `start_time` `start_time` TIMESTAMP NULL DEFAULT NULL COMMENT 'Absolute start date, the event will never start before',
+  CHANGE `end_time` `end_time` TIMESTAMP NULL DEFAULT NULL COMMENT 'Absolute end date, the event will never start after';
+
+UPDATE `game_event` SET `start_time`=NULL WHERE `start_time`='0000-00-00 00:00:00';
+UPDATE `game_event` SET `end_time`=NULL WHERE `end_time`='0000-00-00 00:00:00';
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1546538959760274673.sql b/data/sql/updates/pending_db_world/rev_1546538959760274673.sql
deleted file mode 100644
index 4903888f8..000000000
--- a/data/sql/updates/pending_db_world/rev_1546538959760274673.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1546538959760274673');
-
-ALTER TABLE `game_event`
-ADD COLUMN `announce` tinyint(3) unsigned NOT NULL DEFAULT 2 COMMENT '0 dont announce, 1 announce, 2 value from config' AFTER `world_event`;
-
-ALTER TABLE `game_event`
-  CHANGE `start_time` `start_time` TIMESTAMP NULL DEFAULT NULL COMMENT 'Absolute start date, the event will never start before',
-  CHANGE `end_time` `end_time` TIMESTAMP NULL DEFAULT NULL COMMENT 'Absolute end date, the event will never start after';
-
-UPDATE `game_event` SET `start_time`=NULL WHERE `start_time`='0000-00-00 00:00:00';
-UPDATE `game_event` SET `end_time`=NULL WHERE `end_time`='0000-00-00 00:00:00';