From a444f643ad10a1e77edbe65543429059fdcd6539 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 27 Mar 2020 12:19:26 +0000 Subject: [PATCH] Bug 18177: DBRev 19.12.00.059 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_18177.perl | 24 ------------------- installer/data/mysql/updatedatabase.pl | 24 +++++++++++++++++++ 3 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_18177.perl diff --git a/Koha.pm b/Koha.pm index 60ff63709c..82c8c9fc43 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.058"; +$VERSION = "19.12.00.059"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_18177.perl b/installer/data/mysql/atomicupdate/bug_18177.perl deleted file mode 100644 index 61b0e5e543..0000000000 --- a/installer/data/mysql/atomicupdate/bug_18177.perl +++ /dev/null @@ -1,24 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - for my $column ( qw(othersupplier booksellerfax booksellerurl bookselleremail currency) ) { - if( column_exists( 'aqbooksellers', $column ) ) { - my ($count) = $dbh->selectrow_array(qq| - SELECT COUNT(*) - FROM aqbooksellers - WHERE $column IS NOT NULL AND $column <> "" - |); - if ( $count ) { - warn "Warning - Cannot remove column aqbooksellers.$column. At least one value exists"; - } else { - $dbh->do(qq| - ALTER TABLE aqbooksellers - DROP COLUMN $column - |); - } - } - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 18177 - Remove some unused columns from aqbooksellers)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5bfea82ad3..3230918899 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -21365,6 +21365,30 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 14715, "Add sysprefs numSearchResultsDropdown and OPACnumSearchResultsDropdown"); } +$DBversion = '19.12.00.059'; +if( CheckVersion( $DBversion ) ) { + + for my $column ( qw(othersupplier booksellerfax booksellerurl bookselleremail currency) ) { + if( column_exists( 'aqbooksellers', $column ) ) { + my ($count) = $dbh->selectrow_array(qq| + SELECT COUNT(*) + FROM aqbooksellers + WHERE $column IS NOT NULL AND $column <> "" + |); + if ( $count ) { + warn "Warning - Cannot remove column aqbooksellers.$column. At least one value exists"; + } else { + $dbh->do(qq| + ALTER TABLE aqbooksellers + DROP COLUMN $column + |); + } + } + } + + NewVersion( $DBversion, 18177, "Remove some unused columns from aqbooksellers"); +} + # 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