From 297479cc9adb74e050fb630c342413f67ca7c5a8 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 7 Sep 2015 11:22:30 -0300 Subject: [PATCH] Bug 14098: DBRev 3.21.00.024 Signed-off-by: Tomas Cohen Arazi --- Koha.pm | 2 +- .../Bug-14098-Add_copy_and_replace_action.sql | 1 - installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/Bug-14098-Add_copy_and_replace_action.sql diff --git a/Koha.pm b/Koha.pm index 60991e5789..336c1b36c5 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "3.21.00.023"; +$VERSION = "3.21.00.024"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/Bug-14098-Add_copy_and_replace_action.sql b/installer/data/mysql/atomicupdate/Bug-14098-Add_copy_and_replace_action.sql deleted file mode 100644 index bfee4e118c..0000000000 --- a/installer/data/mysql/atomicupdate/Bug-14098-Add_copy_and_replace_action.sql +++ /dev/null @@ -1 +0,0 @@ -alter table marc_modification_template_actions modify column action enum('delete_field','update_field','move_field','copy_field','copy_and_replace_field'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9729e33e0c..fcbd665a24 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10832,6 +10832,17 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.21.00.024"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + ALTER TABLE marc_modification_template_actions + MODIFY COLUMN action + ENUM('delete_field','update_field','move_field','copy_field','copy_and_replace_field') + }); + print "Upgrade to $DBversion done (Bug 14098: Regression in Marc Modification Templates)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1