From c8ff1254c92374b888aca8b96121ce6294ae7d3d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 29 Nov 2017 15:18:31 -0300 Subject: [PATCH] Bug 10021: DBRev 17.12.00.003 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_10021.perl | 14 -------------- installer/data/mysql/updatedatabase.pl | 13 +++++++++++++ 3 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_10021.perl diff --git a/Koha.pm b/Koha.pm index 2cd477f1a2..088580be23 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 = "17.12.00.002"; +$VERSION = "17.12.00.003"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_10021.perl b/installer/data/mysql/atomicupdate/bug_10021.perl deleted file mode 100644 index 74b1c43b1d..0000000000 --- a/installer/data/mysql/atomicupdate/bug_10021.perl +++ /dev/null @@ -1,14 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - $dbh->do(q|DROP TABLE IF EXISTS notifys|); - - if( column_exists( 'accountlines', 'notify_id' ) ) { - $dbh->do(q|ALTER TABLE accountlines DROP COLUMN notify_id|); - $dbh->do(q|ALTER TABLE accountlines DROP COLUMN notify_level|); - } - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 10021 - Drop notifys-related table and columns)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d7fffc4f2a..0b95ba5fcc 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -15164,6 +15164,19 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 19096 - Make Default authoritative for Koha to MARC mappings)\n"; } +$DBversion = '17.12.00.003'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q|DROP TABLE IF EXISTS notifys|); + + if( column_exists( 'accountlines', 'notify_id' ) ) { + $dbh->do(q|ALTER TABLE accountlines DROP COLUMN notify_id|); + $dbh->do(q|ALTER TABLE accountlines DROP COLUMN notify_level|); + } + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 10021 - Drop notifys-related table and columns)\n"; +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1