From fffb925201894029748d5e53a6c78f2511858003 Mon Sep 17 00:00:00 2001
From: Travis CI <travis@build.bot>
Date: Sat, 22 Dec 2018 16:18:53 +0000
Subject: [PATCH] Importing pending sql

---
 data/sql/updates/db_world/2018_12_22_00.sql   | 33 +++++++++++++++++++
 .../rev_1544714673423311600.sql               |  8 -----
 2 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 data/sql/updates/db_world/2018_12_22_00.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1544714673423311600.sql

diff --git a/data/sql/updates/db_world/2018_12_22_00.sql b/data/sql/updates/db_world/2018_12_22_00.sql
new file mode 100644
index 000000000..cbf2e3313
--- /dev/null
+++ b/data/sql/updates/db_world/2018_12_22_00.sql
@@ -0,0 +1,33 @@
+-- DB update 2018_12_21_00 -> 2018_12_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_12_21_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2018_12_21_00 2018_12_22_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1544714673423311600'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1544714673423311600');
+-- NPC Urcos correct Creature_Text
+UPDATE `creature_text` SET `text`='My freedom means nothing if we fail to save Ursoc.  Make haste, $N.' WHERE `entry`= 27328 AND `groupid`=2 AND `id`= 0;
+-- NPC entry 40405 Kieupid, Pet Trainer in Silvermoon City
+SET @CGUID = 3548;
+DELETE FROM `creature` WHERE `id` = 40405;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@CGUID,40405,530,1,1,0,0, 9924.067, -7400.503, 13.71723, 6.073746, 120,0,0,0,0,0,0,0,0);
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1544714673423311600.sql b/data/sql/updates/pending_db_world/rev_1544714673423311600.sql
deleted file mode 100644
index e7e73d51e..000000000
--- a/data/sql/updates/pending_db_world/rev_1544714673423311600.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1544714673423311600');
--- NPC Urcos correct Creature_Text
-UPDATE `creature_text` SET `text`='My freedom means nothing if we fail to save Ursoc.  Make haste, $N.' WHERE `entry`= 27328 AND `groupid`=2 AND `id`= 0;
--- NPC entry 40405 Kieupid, Pet Trainer in Silvermoon City
-SET @CGUID = 3548;
-DELETE FROM `creature` WHERE `id` = 40405;
-INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
-(@CGUID,40405,530,1,1,0,0, 9924.067, -7400.503, 13.71723, 6.073746, 120,0,0,0,0,0,0,0,0);