@@ -, +, @@ - `action` enum('delete_field','update_field','move_field','copy_field','copy_and_replace_field') COLLATE utf8_unicode_ci DEFAULT NULL, + `action` enum('delete_field','update_field','move_field','copy_field') COLLATE utf8_unicode_ci NOT NULL, > CREATE DATABASE koha_master_upgraded; $ git checkout v3.20.00 $ mysql koha_master_upgraded < installer/data/mysql/kohastructure.sql $ git checkout origin/master $ perl installer/data/mysql/updatedatabase.pl > CREATE DATABASE koha_master_fresh; $ mysql koha_master_fresh < installer/data/mysql/kohastructure.sql $ mysqldbcompare --difftype=differ --server1=root@localhost \ --skip-data-check --skip-table-options \ --run-all-tests koha_master_upgraded:koha_master_fresh - Repeat from 1), but apply this patch on 2) before the upgrade. - Sign off :-D --- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -3450,7 +3450,7 @@ CREATE TABLE IF NOT EXISTS marc_modification_template_actions ( mmta_id int(11) NOT NULL AUTO_INCREMENT, template_id int(11) NOT NULL, ordering int(3) NOT NULL, - action enum('delete_field','update_field','move_field','copy_field') NOT NULL, + action ENUM('delete_field','update_field','move_field','copy_field','copy_and_replace_field') NOT NULL, field_number smallint(6) NOT NULL DEFAULT '0', from_field varchar(3) NOT NULL, from_subfield varchar(1) DEFAULT NULL, --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -10837,6 +10837,7 @@ if ( CheckVersion($DBversion) ) { ALTER TABLE marc_modification_template_actions MODIFY COLUMN action ENUM('delete_field','update_field','move_field','copy_field','copy_and_replace_field') + NOT NULL }); print "Upgrade to $DBversion done (Bug 14098: Regression in Marc Modification Templates)\n"; SetVersion($DBversion); --