From 51eb9d7e132aab56c6593828bf15e6f04b89fd6f Mon Sep 17 00:00:00 2001 From: Yehonal Date: Sun, 15 Oct 2017 11:58:52 +0200 Subject: [PATCH] fixed nested function in latest sql updates it's a particular case that we've to take care about next time: a function cannot be created inside a procedure so we need to move out its definition after pending import --- data/sql/updates/db_world/2017_10_15_00.sql | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/data/sql/updates/db_world/2017_10_15_00.sql b/data/sql/updates/db_world/2017_10_15_00.sql index c5dcce2e0..8c296dc73 100644 --- a/data/sql/updates/db_world/2017_10_15_00.sql +++ b/data/sql/updates/db_world/2017_10_15_00.sql @@ -1,3 +1,8 @@ +DROP FUNCTION IF EXISTS packDate; +CREATE FUNCTION packDate (yy TINYINT UNSIGNED, mm TINYINT UNSIGNED, dd TINYINT UNSIGNED) +RETURNS INT UNSIGNED DETERMINISTIC +RETURN (yy << 24) | ((mm - 1) << 20) | ((dd - 1) << 14); + -- DB update 2017_09_26_00 -> 2017_10_15_00 DROP PROCEDURE IF EXISTS `updateDb`; DELIMITER // @@ -27,10 +32,6 @@ CREATE TABLE holiday_dates ( PRIMARY KEY (id, date_id) ); -CREATE FUNCTION packDate (yy TINYINT UNSIGNED, mm TINYINT UNSIGNED, dd TINYINT UNSIGNED) -RETURNS INT UNSIGNED DETERMINISTIC -RETURN (yy << 24) | ((mm - 1) << 20) | ((dd - 1) << 14); - INSERT INTO holiday_dates VALUES (181, 6, 220692480 + (1 << 14)), -- rescheduled (181, 7, 238338048 + (1 << 14)), @@ -156,8 +157,6 @@ INSERT INTO holiday_dates VALUES UPDATE holiday_dates SET date_value = date_value & ~0x3FFF; -DROP FUNCTION packDate; - ALTER TABLE game_event ADD COLUMN holidayStage TINYINT UNSIGNED NOT NULL DEFAULT 0 AFTER holiday; UPDATE game_event SET holiday = 424 WHERE eventEntry = 64; @@ -176,3 +175,6 @@ END; DELIMITER ; CALL updateDb(); DROP PROCEDURE IF EXISTS `updateDb`; + +DROP FUNCTION packDate; +