From d0af1c812bf4ea15204cad37b39ff27ff6bae339 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Tue, 17 Oct 2017 01:37:03 +0200 Subject: [PATCH] Importing pending sql --- .../2017_10_17_00.sql} | 24 ++++++++++++++ data/sql/updates/db_world/2017_10_17_01.sql | 33 +++++++++++++++++++ data/sql/updates/db_world/2017_10_17_02.sql | 30 +++++++++++++++++ .../rev_1508171834127824700.sql | 9 ----- .../rev_1508172729879058700.sql | 6 ---- 5 files changed, 87 insertions(+), 15 deletions(-) rename data/sql/updates/{pending_db_world/rev_1508171605836767200.sql => db_world/2017_10_17_00.sql} (72%) create mode 100644 data/sql/updates/db_world/2017_10_17_01.sql create mode 100644 data/sql/updates/db_world/2017_10_17_02.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1508171834127824700.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1508172729879058700.sql diff --git a/data/sql/updates/pending_db_world/rev_1508171605836767200.sql b/data/sql/updates/db_world/2017_10_17_00.sql similarity index 72% rename from data/sql/updates/pending_db_world/rev_1508171605836767200.sql rename to data/sql/updates/db_world/2017_10_17_00.sql index 3fa7953e2..51b39ef99 100644 --- a/data/sql/updates/pending_db_world/rev_1508171605836767200.sql +++ b/data/sql/updates/db_world/2017_10_17_00.sql @@ -1,3 +1,18 @@ +-- DB update 2017_10_15_02 -> 2017_10_17_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 = '2017_10_15_02'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_10_15_02 2017_10_17_00 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1508171605836767200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1508171605836767200'); -- Lord Thorval @@ -13,3 +28,12 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr (@ENTRY, 6, 0, 'We know hunger never to be quenched...', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29873), (@ENTRY, 7, 0, 'We know power never to be overcome...', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29874), (@ENTRY, 8, 0, 'As masters of blood, we are masters of life and death itself. Agains us, even hope falls drained and lifeless.', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29875); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/db_world/2017_10_17_01.sql b/data/sql/updates/db_world/2017_10_17_01.sql new file mode 100644 index 000000000..d2ff1136a --- /dev/null +++ b/data/sql/updates/db_world/2017_10_17_01.sql @@ -0,0 +1,33 @@ +-- DB update 2017_10_17_00 -> 2017_10_17_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 = '2017_10_17_00'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_10_17_00 2017_10_17_01 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1508171834127824700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- +INSERT INTO version_db_world (`sql_rev`) VALUES ('1508171834127824700'); + +-- Warsong Recruitment Officer - Gossip (Hellscream's Vigil) +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND (`SourceEntry`=11586 OR `SourceEntry`=11585); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`Comment`) VALUES +(19, 11585, 14, 10172, "Accept quest 11585 - Quest 10172 needs to be incomplete"), +(19, 11586, 8, 10172, "Accept quest 11586 - Quest 10172 needs to be rewarded"); + +UPDATE `quest_template_addon` SET `ExclusiveGroup`=11585 WHERE `ID` IN (11585,11586); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/db_world/2017_10_17_02.sql b/data/sql/updates/db_world/2017_10_17_02.sql new file mode 100644 index 000000000..0e74d57b3 --- /dev/null +++ b/data/sql/updates/db_world/2017_10_17_02.sql @@ -0,0 +1,30 @@ +-- DB update 2017_10_17_01 -> 2017_10_17_02 +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 = '2017_10_17_01'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_10_17_01 2017_10_17_02 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1508172729879058700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- +INSERT INTO version_db_world (`sql_rev`) VALUES ('1508172729879058700'); + +-- Fix Startup Errors +UPDATE `creature_addon` SET `auras`='' WHERE `guid`=6432; +UPDATE `creature_template` SET `skinloot`=80102 WHERE `entry` IN (18343, 20268); +DELETE FROM `creature_addon` WHERE `guid`=3574; +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1508171834127824700.sql b/data/sql/updates/pending_db_world/rev_1508171834127824700.sql deleted file mode 100644 index 36f042a92..000000000 --- a/data/sql/updates/pending_db_world/rev_1508171834127824700.sql +++ /dev/null @@ -1,9 +0,0 @@ -INSERT INTO version_db_world (`sql_rev`) VALUES ('1508171834127824700'); - --- Warsong Recruitment Officer - Gossip (Hellscream's Vigil) -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND (`SourceEntry`=11586 OR `SourceEntry`=11585); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`Comment`) VALUES -(19, 11585, 14, 10172, "Accept quest 11585 - Quest 10172 needs to be incomplete"), -(19, 11586, 8, 10172, "Accept quest 11586 - Quest 10172 needs to be rewarded"); - -UPDATE `quest_template_addon` SET `ExclusiveGroup`=11585 WHERE `ID` IN (11585,11586); diff --git a/data/sql/updates/pending_db_world/rev_1508172729879058700.sql b/data/sql/updates/pending_db_world/rev_1508172729879058700.sql deleted file mode 100644 index 6f2b66e7f..000000000 --- a/data/sql/updates/pending_db_world/rev_1508172729879058700.sql +++ /dev/null @@ -1,6 +0,0 @@ -INSERT INTO version_db_world (`sql_rev`) VALUES ('1508172729879058700'); - --- Fix Startup Errors -UPDATE `creature_addon` SET `auras`='' WHERE `guid`=6432; -UPDATE `creature_template` SET `skinloot`=80102 WHERE `entry` IN (18343, 20268); -DELETE FROM `creature_addon` WHERE `guid`=3574;