From f54f7ce7dc5ec748c1e38710e140fba4b1157330 Mon Sep 17 00:00:00 2001
From: ShinDarth <borzifrancesco@gmail.com>
Date: Sat, 5 Nov 2016 19:02:24 +0100
Subject: [PATCH] Fix SQL syntax + import pending SQLs

---
 data/sql/updates/db_world/2016_11_05_03.sql   | 23 +++++++++++++++++++
 .../2016_11_05_04.sql}                        | 20 ++++++++++++++++
 .../rev_1477427695797942400.sql               |  3 ---
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 data/sql/updates/db_world/2016_11_05_03.sql
 rename data/sql/updates/{pending_db_world/rev_1478360753169893400.sql => db_world/2016_11_05_04.sql} (99%)
 delete mode 100644 data/sql/updates/pending_db_world/rev_1477427695797942400.sql

diff --git a/data/sql/updates/db_world/2016_11_05_03.sql b/data/sql/updates/db_world/2016_11_05_03.sql
new file mode 100644
index 000000000..483709720
--- /dev/null
+++ b/data/sql/updates/db_world/2016_11_05_03.sql
@@ -0,0 +1,23 @@
+-- DB update 2016_11_05_02 -> 2016_11_05_03
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2016_11_05_02 2016_11_05_03 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1477427695797942400'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1477427695797942400');
+
+INSERT into `creature_queststarter` VALUES (26500, 12238);
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1478360753169893400.sql b/data/sql/updates/db_world/2016_11_05_04.sql
similarity index 99%
rename from data/sql/updates/pending_db_world/rev_1478360753169893400.sql
rename to data/sql/updates/db_world/2016_11_05_04.sql
index 623f85bb7..cba7cc9f6 100644
--- a/data/sql/updates/pending_db_world/rev_1478360753169893400.sql
+++ b/data/sql/updates/db_world/2016_11_05_04.sql
@@ -1,3 +1,14 @@
+-- DB update 2016_11_05_03 -> 2016_11_05_04
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2016_11_05_03 2016_11_05_04 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1478360753169893400'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
 INSERT INTO version_db_world(`sql_rev`) VALUES ('1478360753169893400');
 
 -- ----------------------------
@@ -473,3 +484,12 @@ INSERT INTO `locales_points_of_interest` VALUES ('450', null, 'Le club de la Bi
 INSERT INTO `locales_points_of_interest` VALUES ('451', null, 'Souvenirs de la fête des brasseurs Goblin', 'Goblin Braufest Souvenirs', null, null, '', '', null);
 INSERT INTO `locales_points_of_interest` VALUES ('452', null, 'Bélier de course de la fête des brasseurs Goblin', 'Bier des Monats e.V. Orgrimmar', null, null, '', '', null);
 INSERT INTO `locales_points_of_interest` VALUES ('453', null, 'Le club de la Bière du mois, Orgrimmar', null, null, null, '', '', null);
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1477427695797942400.sql b/data/sql/updates/pending_db_world/rev_1477427695797942400.sql
deleted file mode 100644
index fc4f61e0e..000000000
--- a/data/sql/updates/pending_db_world/rev_1477427695797942400.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO version_db_world(`sql_rev`) VALUES ('1477427695797942400');
-
-INSERT into `creature_queststarter` VALUES (26500, 12238 )