From 8aefe1bb721122d3db1bd2512b048cc84a46cd0d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 12 Jul 2021 13:45:17 +0000 Subject: [PATCH] Bug 20472: DBRev 21.06.00.009 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_20472a.perl | 16 ---------------- installer/data/mysql/updatedatabase.pl | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_20472a.perl diff --git a/Koha.pm b/Koha.pm index bc0687950c..ca7b67c95f 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 = "21.06.00.008"; +$VERSION = "21.06.00.009"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_20472a.perl b/installer/data/mysql/atomicupdate/bug_20472a.perl deleted file mode 100644 index 66f7590d24..0000000000 --- a/installer/data/mysql/atomicupdate/bug_20472a.perl +++ /dev/null @@ -1,16 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - unless ( column_exists('article_requests', 'format') ) { - $dbh->do(q| - ALTER TABLE article_requests - ADD COLUMN `format` enum('PHOTOCOPY', 'SCAN') NOT NULL DEFAULT 'PHOTOCOPY' AFTER notes - |); - } - unless ( column_exists('article_requests', 'urls') ) { - $dbh->do(q| - ALTER TABLE article_requests - ADD COLUMN `urls` MEDIUMTEXT AFTER format - |); - } - NewVersion( $DBversion, 20472, "Add columns format and urls in article_requests table"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d03c021799..8c95d919f0 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -24420,6 +24420,23 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 20310, "Add pref ArticleRequestsOpacHostRedirection"); } +$DBversion = '21.06.00.009'; +if( CheckVersion( $DBversion ) ) { + unless ( column_exists('article_requests', 'format') ) { + $dbh->do(q| + ALTER TABLE article_requests + ADD COLUMN `format` enum('PHOTOCOPY', 'SCAN') NOT NULL DEFAULT 'PHOTOCOPY' AFTER notes + |); + } + unless ( column_exists('article_requests', 'urls') ) { + $dbh->do(q| + ALTER TABLE article_requests + ADD COLUMN `urls` MEDIUMTEXT AFTER format + |); + } + NewVersion( $DBversion, 20472, "Add columns format and urls in article_requests table"); +} + # 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