From 02d14df9b8d366ab4685442b4ececf5041c8f035 Mon Sep 17 00:00:00 2001
From: Travis CI <travis@build.bot>
Date: Thu, 12 Jul 2018 13:43:52 +0000
Subject: [PATCH] Importing pending sql

---
 data/sql/updates/db_world/2018_07_12_00.sql   | 29 +++++++++++++++++++
 .../rev_1530734106945512205.sql               |  4 ---
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 data/sql/updates/db_world/2018_07_12_00.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1530734106945512205.sql

diff --git a/data/sql/updates/db_world/2018_07_12_00.sql b/data/sql/updates/db_world/2018_07_12_00.sql
new file mode 100644
index 000000000..07e73013e
--- /dev/null
+++ b/data/sql/updates/db_world/2018_07_12_00.sql
@@ -0,0 +1,29 @@
+-- DB update 2018_07_04_00 -> 2018_07_12_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_07_04_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2018_07_04_00 2018_07_12_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1530734106945512205'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1530734106945512205');
+
+UPDATE `creature_template` SET `unit_flags` = 0 WHERE `entry` = 7856;
+UPDATE `smart_scripts` SET `event_type` = 9, `event_param1` = 2, `event_param2` = 30, `comment` = 'Southsea Freebooter - Within 2-30 Range - Shoot' WHERE `entryorguid` = 7856 AND `id` = 0;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1530734106945512205.sql b/data/sql/updates/pending_db_world/rev_1530734106945512205.sql
deleted file mode 100644
index be7f4f6a9..000000000
--- a/data/sql/updates/pending_db_world/rev_1530734106945512205.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1530734106945512205');
-
-UPDATE `creature_template` SET `unit_flags` = 0 WHERE `entry` = 7856;
-UPDATE `smart_scripts` SET `event_type` = 9, `event_param1` = 2, `event_param2` = 30, `comment` = 'Southsea Freebooter - Within 2-30 Range - Shoot' WHERE `entryorguid` = 7856 AND `id` = 0;