From 3286bead8e60fbcf8b2a76685b03c7cf6712da5e Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 19 Jul 2018 17:19:38 +0000 Subject: [PATCH] Bug 13560: DBRev 18.06.00.008 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug13560.perl | 6 ------ installer/data/mysql/updatedatabase.pl | 7 +++++++ 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug13560.perl diff --git a/Koha.pm b/Koha.pm index 307fc20a24..25e5f9f518 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 = "18.06.00.007"; +$VERSION = "18.06.00.008"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug13560.perl b/installer/data/mysql/atomicupdate/bug13560.perl deleted file mode 100644 index 81e39bc0b5..0000000000 --- a/installer/data/mysql/atomicupdate/bug13560.perl +++ /dev/null @@ -1,6 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "ALTER TABLE marc_modification_template_actions CHANGE action action ENUM('delete_field','add_field','update_field','move_field','copy_field','copy_and_replace_field')" ); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 13560 - need an add option in marc modification templates)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 23fc71b5bf..d92191c8de 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16155,6 +16155,13 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 7651 - Add separate permission for managing currencies and exchange rates)\n"; } +$DBversion = '18.06.00.008'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do( "ALTER IGNORE TABLE marc_modification_template_actions CHANGE action action ENUM('delete_field','add_field','update_field','move_field','copy_field','copy_and_replace_field')" ); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 13560 - need an add option in marc modification templates)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1