From d1646aeb0f9e8922725e7391e6bbaaa120d7b0df Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Sat, 17 Mar 2018 16:19:33 +0200 Subject: [PATCH] Fix DB type to match core (#809) * Fix DB type to match core Reverts https://github.com/azerothcore/azerothcore-wotlk/pull/733 * Importing pending sql --- data/sql/updates/db_world/2018_03_11_00.sql | 28 +++++++++++++++++++++ src/server/game/Maps/TransportMgr.cpp | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 data/sql/updates/db_world/2018_03_11_00.sql diff --git a/data/sql/updates/db_world/2018_03_11_00.sql b/data/sql/updates/db_world/2018_03_11_00.sql new file mode 100644 index 000000000..1b492ac96 --- /dev/null +++ b/data/sql/updates/db_world/2018_03_11_00.sql @@ -0,0 +1,28 @@ +-- DB update 2018_02_23_00 -> 2018_03_11_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_02_23_00'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2018_02_23_00 2018_03_11_00 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1520798198281695500'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- + +INSERT INTO version_db_world (`sql_rev`) VALUES ('1520798198281695500'); + +ALTER TABLE `gameobject` CHANGE COLUMN `map` `map` SMALLINT UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Map Identifier' AFTER `id`; + +-- +-- END UPDATING QUERIES +-- +COMMIT; +END // +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp index 03bd4caf7..4bfae7434 100644 --- a/src/server/game/Maps/TransportMgr.cpp +++ b/src/server/game/Maps/TransportMgr.cpp @@ -433,7 +433,7 @@ void TransportMgr::SpawnContinentTransports() do { Field* fields = result->Fetch(); - uint32 mapId = fields[0].GetUInt32(); + uint16 mapId = fields[0].GetUInt16(); float x = fields[1].GetFloat(); float y = fields[2].GetFloat();