From 6831dd5977086ea869516bfdce995a7cd2b921ef Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 31 Mar 2017 11:23:43 +0000 Subject: [PATCH] Bug 18173 - DBRev 16.12.00.019 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_18173.perl | 13 ------------- installer/data/mysql/updatedatabase.pl | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_18173.perl diff --git a/Koha.pm b/Koha.pm index 361d1f001d..06500c2244 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 = "16.12.00.018"; +$VERSION = "16.12.00.019"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_18173.perl b/installer/data/mysql/atomicupdate/bug_18173.perl deleted file mode 100644 index ea42d685ca..0000000000 --- a/installer/data/mysql/atomicupdate/bug_18173.perl +++ /dev/null @@ -1,13 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - if ( column_exists( 'issues', 'return' ) ) { - $dbh->do(q|ALTER TABLE issues DROP column `return`|); - } - - if ( column_exists( 'old_issues', 'return' ) ) { - $dbh->do(q|ALTER TABLE old_issues DROP column `return`|); - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 18173 - Remove issues.return DB field)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9f283a1016..d24dbd771e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -14034,6 +14034,20 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "16.12.00.019"; +if( CheckVersion( $DBversion ) ) { + if ( column_exists( 'issues', 'return' ) ) { + $dbh->do(q|ALTER TABLE issues DROP column `return`|); + } + + if ( column_exists( 'old_issues', 'return' ) ) { + $dbh->do(q|ALTER TABLE old_issues DROP column `return`|); + } + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 18173 - Remove issues.return DB field)\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.39.5