From 5133af7b87cb751f117c4f8454b37d3245d3a7db Mon Sep 17 00:00:00 2001 From: Barbz Date: Thu, 29 Mar 2018 18:33:55 +0200 Subject: [PATCH 1/2] DB - Areatrigger - Removes warnings when booting the server (#819) * DB - Areatrigger - Removes warnings when booting the server There are 3 triggers that are from the areatrigger.dbc which are useless since the linked maps don't exist. It's probably a mistake from blizz. * Wrong database chosen... --- data/sql/updates/pending_db_world/rev_1522263653566045620.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1522263653566045620.sql diff --git a/data/sql/updates/pending_db_world/rev_1522263653566045620.sql b/data/sql/updates/pending_db_world/rev_1522263653566045620.sql new file mode 100644 index 000000000..59ea42e97 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1522263653566045620.sql @@ -0,0 +1,3 @@ +INSERT INTO version_db_world(sql_rev) VALUES ('1522263653566045620'); + +DELETE FROM `areatrigger` WHERE map IN (24,28); From 00cde32cd4142b96abb9b816bb9326125b5e084f Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 29 Mar 2018 16:35:34 +0000 Subject: [PATCH 2/2] Importing pending sql --- data/sql/updates/db_world/2018_03_29_00.sql | 28 +++++++++++++++++++ .../rev_1522263653566045620.sql | 3 -- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 data/sql/updates/db_world/2018_03_29_00.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1522263653566045620.sql diff --git a/data/sql/updates/db_world/2018_03_29_00.sql b/data/sql/updates/db_world/2018_03_29_00.sql new file mode 100644 index 000000000..3556285b1 --- /dev/null +++ b/data/sql/updates/db_world/2018_03_29_00.sql @@ -0,0 +1,28 @@ +-- DB update 2018_03_11_00 -> 2018_03_29_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_03_11_00'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2018_03_11_00 2018_03_29_00 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1522263653566045620'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- + +INSERT INTO version_db_world(sql_rev) VALUES ('1522263653566045620'); + +DELETE FROM `areatrigger` WHERE map IN (24,28); + +-- +-- END UPDATING QUERIES +-- +COMMIT; +END // +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1522263653566045620.sql b/data/sql/updates/pending_db_world/rev_1522263653566045620.sql deleted file mode 100644 index 59ea42e97..000000000 --- a/data/sql/updates/pending_db_world/rev_1522263653566045620.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT INTO version_db_world(sql_rev) VALUES ('1522263653566045620'); - -DELETE FROM `areatrigger` WHERE map IN (24,28);