From c1fe033a116c23192a8ed5ba31924f1f4e032812 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 26 Jul 2019 16:13:20 +0100 Subject: [PATCH] Bug 11573: DBRev 19.06.00.014 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_11573.perl | 49 ------------------ installer/data/mysql/updatedatabase.pl | 50 +++++++++++++++++++ 3 files changed, 51 insertions(+), 50 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_11573.perl diff --git a/Koha.pm b/Koha.pm index 33e41fbd77..91c1d5f8c8 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.06.00.013"; +$VERSION = "19.06.00.014"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_11573.perl b/installer/data/mysql/atomicupdate/bug_11573.perl deleted file mode 100644 index a09d1c4922..0000000000 --- a/installer/data/mysql/atomicupdate/bug_11573.perl +++ /dev/null @@ -1,49 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if ( CheckVersion($DBversion) ) { - - $dbh->do(qq{ - UPDATE - accountlines - SET - accounttype = 'RENT_DAILY_RENEW' - WHERE - accounttype = 'Rent' - AND - description LIKE 'Renewal of Daily Rental Item%'; - }); - - $dbh->do(qq{ - UPDATE - accountlines - SET - accounttype = 'RENT_DAILY' - WHERE - accounttype = 'Rent' - AND - description LIKE 'Daily rental'; - }); - - - $dbh->do(qq{ - UPDATE - accountlines - SET - accounttype = 'RENT_RENEW' - WHERE - accounttype = 'Rent' - AND - description LIKE 'Renewal of Rental Item%'; - }); - - $dbh->do(qq{ - UPDATE - accountlines - SET - accounttype = 'RENT' - WHERE - accounttype = 'Rent'; - }); - - SetVersion($DBversion); - print "Upgrade to $DBversion done (Bug 11573 - Fix accounttypes for 'Rent')\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index bc16a91b76..fcee059713 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -18988,6 +18988,56 @@ if ( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 23151 - Add borrower_modifications.changed_fields column)\n"; } +$DBversion = '19.06.00.014'; +if ( CheckVersion($DBversion) ) { + + $dbh->do(qq{ + UPDATE + accountlines + SET + accounttype = 'RENT_DAILY_RENEW' + WHERE + accounttype = 'Rent' + AND + description LIKE 'Renewal of Daily Rental Item%'; + }); + + $dbh->do(qq{ + UPDATE + accountlines + SET + accounttype = 'RENT_DAILY' + WHERE + accounttype = 'Rent' + AND + description LIKE 'Daily rental'; + }); + + + $dbh->do(qq{ + UPDATE + accountlines + SET + accounttype = 'RENT_RENEW' + WHERE + accounttype = 'Rent' + AND + description LIKE 'Renewal of Rental Item%'; + }); + + $dbh->do(qq{ + UPDATE + accountlines + SET + accounttype = 'RENT' + WHERE + accounttype = 'Rent'; + }); + + SetVersion($DBversion); + print "Upgrade to $DBversion done (Bug 11573 - Fix accounttypes for 'Rent')\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.39.5