From a639299c9834ad80d763143910dd460193820acb Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 4 Mar 2019 19:10:56 +0000 Subject: [PATCH] Bug 21728: DBRev 18.12.00.019 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- .../bug_21728_add_accountoffset_reserve.perl | 9 --------- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_21728_add_accountoffset_reserve.perl diff --git a/Koha.pm b/Koha.pm index 10814b33d6..a5a778c910 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.12.00.018"; +$VERSION = "18.12.00.019"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_21728_add_accountoffset_reserve.perl b/installer/data/mysql/atomicupdate/bug_21728_add_accountoffset_reserve.perl deleted file mode 100644 index c8014dc9c9..0000000000 --- a/installer/data/mysql/atomicupdate/bug_21728_add_accountoffset_reserve.perl +++ /dev/null @@ -1,9 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO account_offset_types ( type ) VALUES ( 'Reserve Fee' ); - }); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 21728 - Add 'Reserve Fee' to the account_offset_types table if missing)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index befa878b60..64c3f8922f 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -17452,6 +17452,17 @@ if( CheckVersion( $DBversion ) ) { SetVersion( $DBversion ); print "Upgrade to $DBversion done (Bug 19575 - Use canonical field names and resolve aliased fields)\n"; } + +$DBversion = '18.12.00.019'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO account_offset_types ( type ) VALUES ( 'Reserve Fee' ); + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 21728 - Add 'Reserve Fee' to the account_offset_types table if missing)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5