From 9659b2f447ef21a71b3d3698fba126be526a8849 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Sat, 15 Sep 2018 21:52:47 +0000 Subject: [PATCH] Bug 20777: DBRev 18.05.03.003 Signed-off-by: Nick Clemens (cherry picked from commit 2847ac4b4de239a430e6e9d20f6e895435c56d7b) Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../bug_20777_accountlines_dispute.perl | 13 ------------- installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ 3 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_20777_accountlines_dispute.perl diff --git a/Koha.pm b/Koha.pm index e4d20b4e69..37accf8247 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 = "18.05.03.002"; +$VERSION = "18.05.03.003"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_20777_accountlines_dispute.perl b/installer/data/mysql/atomicupdate/bug_20777_accountlines_dispute.perl deleted file mode 100644 index 4317603ea3..0000000000 --- a/installer/data/mysql/atomicupdate/bug_20777_accountlines_dispute.perl +++ /dev/null @@ -1,13 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - - if ( column_exists( 'accountlines', 'dispute' ) ) { - $dbh->do(q{ - ALTER TABLE `accountlines` - DROP COLUMN `dispute` - }); - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 20777 - Remove unused field accountlines.dispute)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 38992715b3..e5a27a6152 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16166,6 +16166,18 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 21288: Slowness in acquisition caused by GetInvoices\n"; } +$DBversion = '18.05.03.003'; +if( CheckVersion( $DBversion ) ) { + if ( column_exists( 'accountlines', 'dispute' ) ) { + $dbh->do(q{ + ALTER TABLE `accountlines` + DROP COLUMN `dispute` + }); + } + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 20777 - Remove unused field accountlines.dispute)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5