From d3bdb77d9a3be685fea2164da808d5ef963c114a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 10 Jan 2020 08:43:30 +0000 Subject: [PATCH] Bug 23442: DBRev 19.12.00.007 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_23442.perl | 26 ------------------ installer/data/mysql/updatedatabase.pl | 27 +++++++++++++++++++ 3 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_23442.perl diff --git a/Koha.pm b/Koha.pm index 3ddffbc130..38d7406d11 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 = "19.12.00.006"; +$VERSION = "19.12.00.007"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_23442.perl b/installer/data/mysql/atomicupdate/bug_23442.perl deleted file mode 100644 index bcd98fe8b4..0000000000 --- a/installer/data/mysql/atomicupdate/bug_23442.perl +++ /dev/null @@ -1,26 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if ( CheckVersion($DBversion) ) { - - $dbh->do( - qq{ - INSERT IGNORE INTO account_credit_types (code, description, can_be_added_manually, is_system) - VALUES - ('REFUND', 'A refund applied to a patrons fine', 0, 1) - } - ); - - $dbh->do(qq{ - INSERT IGNORE INTO account_offset_types ( type ) VALUES ('REFUND'); - }); - - $dbh->do(qq{ - INSERT IGNORE permissions (module_bit, code, description) - VALUES - (10, 'refund', 'Perform account refund action') - }); - - SetVersion($DBversion); - print "Upgrade to $DBversion done (Bug 23442 - Add REFUND to account_credit_types)\n"; - print "Upgrade to $DBversion done (Bug 23442 - Add REFUND to account_offset_types)\n"; - print "Upgrade to $DBversion done (Bug 23442 - Add accounts refund permission)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 370281210f..8abec16a2b 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20323,6 +20323,33 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 24263 - Replace relationship with NULL when empty string)\n"; } +$DBversion = '19.12.00.007'; +if ( CheckVersion($DBversion) ) { + + $dbh->do( + qq{ + INSERT IGNORE INTO account_credit_types (code, description, can_be_added_manually, is_system) + VALUES + ('REFUND', 'A refund applied to a patrons fine', 0, 1) + } + ); + + $dbh->do(qq{ + INSERT IGNORE INTO account_offset_types ( type ) VALUES ('REFUND'); + }); + + $dbh->do(qq{ + INSERT IGNORE permissions (module_bit, code, description) + VALUES + (10, 'refund', 'Perform account refund action') + }); + + SetVersion($DBversion); + print "Upgrade to $DBversion done (Bug 23442 - Add REFUND to account_credit_types)\n"; + print "Upgrade to $DBversion done (Bug 23442 - Add REFUND to account_offset_types)\n"; + print "Upgrade to $DBversion done (Bug 23442 - Add accounts refund permission)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -- 2.20.1