From 20fbad9d9feaf234d51a9a250864b756c04d723d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 11 Oct 2017 13:10:32 -0300 Subject: [PATCH] Bug 15685: DBRev 17.06.00.014 Signed-off-by: Jonathan Druart Signed-off-by: Jon Knight https://bugs.koha-community.org/show_bug.cgi?id=19113 --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug15685.perl | 13 ------------- installer/data/mysql/updatedatabase.pl | 13 +++++++++++++ 3 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug15685.perl diff --git a/Koha.pm b/Koha.pm index c6dd33b..7389ae7 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.06.00.013"; +$VERSION = "17.06.00.014"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug15685.perl b/installer/data/mysql/atomicupdate/bug15685.perl deleted file mode 100644 index 620696b..0000000 --- a/installer/data/mysql/atomicupdate/bug15685.perl +++ /dev/null @@ -1,13 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - unless( column_exists('aqbasket','create_items') ){ - $dbh->do(q{ - ALTER TABLE aqbasket - ADD COLUMN create_items ENUM('ordering', 'receiving', 'cataloguing') default NULL AFTER is_standing - }); - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 15685: Allow creation of items (AcqCreateItem) to be customizable per-basket)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9a9cc6f..e452c13 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -14737,6 +14737,19 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 16401 - fix potentialy bad set staffClientBaseURL preference)\n"; } +$DBversion = '17.06.00.014'; +if( CheckVersion( $DBversion ) ) { + unless( column_exists('aqbasket','create_items') ){ + $dbh->do(q{ + ALTER TABLE aqbasket + ADD COLUMN create_items ENUM('ordering', 'receiving', 'cataloguing') default NULL AFTER is_standing + }); + } + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 15685 - Allow creation of items (AcqCreateItem) to be customizable per-basket)\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.1.4