From 6492c7415cf121a3f6f09408e0137a6e7ef53805 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 2 Mar 2026 07:42:13 +0000 Subject: [PATCH] Bug 4858: (QA follow-up) Fix installer issues after rebase - Fix SQL syntax error in sample_notices_message_transports.sql: the print transport row for RETURN_RECALLED_ITEM was terminated with a semicolon instead of a comma, prematurely ending the INSERT statement and leaving the three MEMBERSHIP_EXPIRY rows as invalid bare tuples. This would break fresh installations by failing to insert those rows. - Fix atomicupdate ALTER TABLE AFTER clause: the column was being added AFTER reservefee which does not exist in the categories table (it exists on items). This would cause the ALTER TABLE to fail on all upgrades. Changed to AFTER overduenoticerequired to match the column order in kohastructure.sql. Sponsored-by: OpenFifth Signed-off-by: Jackie Usher --- .../data/mysql/atomicupdate/bug_4858-print-notice-charge.pl | 2 +- .../data/mysql/mandatory/sample_notices_message_transports.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_4858-print-notice-charge.pl b/installer/data/mysql/atomicupdate/bug_4858-print-notice-charge.pl index 770bb5e5fa5..d6f25bd7653 100755 --- a/installer/data/mysql/atomicupdate/bug_4858-print-notice-charge.pl +++ b/installer/data/mysql/atomicupdate/bug_4858-print-notice-charge.pl @@ -13,7 +13,7 @@ return { q{ALTER TABLE categories ADD COLUMN print_notice_charge decimal(28,6) DEFAULT 0.00 COMMENT 'charge for print notices (0.00 = disabled)' - AFTER reservefee} + AFTER overduenoticerequired} ); # Add PRINT_NOTICE debit type diff --git a/installer/data/mysql/mandatory/sample_notices_message_transports.sql b/installer/data/mysql/mandatory/sample_notices_message_transports.sql index ff91505a4ce..d82b35083f1 100644 --- a/installer/data/mysql/mandatory/sample_notices_message_transports.sql +++ b/installer/data/mysql/mandatory/sample_notices_message_transports.sql @@ -68,7 +68,7 @@ values (13, "email", 0, "circulation", "RETURN_RECALLED_ITEM"), (13, "sms", 0, "circulation", "RETURN_RECALLED_ITEM"), (13, "phone", 0, "circulation", "RETURN_RECALLED_ITEM"), -(13, 'print', 0, 'circulation', 'RETURN_RECALLED_ITEM'); +(13, 'print', 0, 'circulation', 'RETURN_RECALLED_ITEM'), (14, "email", 0, "members", "MEMBERSHIP_EXPIRY"), (14, "sms", 0, "members", "MEMBERSHIP_EXPIRY"), (14, "phone", 0, "members", "MEMBERSHIP_EXPIRY"); -- 2.53.0