From e6867a9e26e5927e7e1731b16f9d09e6e34e43ac Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Fri, 16 Oct 2020 14:45:45 +0000 Subject: [PATCH] Bug 24807: DBRev 20.05.04.001 Signed-off-by: Lucas Gass --- Koha.pm | 2 +- .../bug_24807-add-year-search-field-type.perl | 7 ------- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24807-add-year-search-field-type.perl diff --git a/Koha.pm b/Koha.pm index 4b2789e62e..2954a1d07a 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 = "20.05.04.000"; +$VERSION = "20.05.04.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24807-add-year-search-field-type.perl b/installer/data/mysql/atomicupdate/bug_24807-add-year-search-field-type.perl deleted file mode 100644 index 480072c880..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24807-add-year-search-field-type.perl +++ /dev/null @@ -1,7 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "ALTER TABLE `search_field` MODIFY COLUMN `type` enum('','string','date','number','boolean','sum','isbn','stdno','year') NOT NULL" ); - $dbh->do( "UPDATE `search_field` SET type = 'year' WHERE name = 'date-of-publication'" ); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 14957 - Add 'year' type to improve sorting behaviour)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f35ba70960..7a75277f32 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22398,6 +22398,14 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, undef, '20.05.04 release' ); } +$DBversion = '20.05.04.001'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "ALTER TABLE `search_field` MODIFY COLUMN `type` enum('','string','date','number','boolean','sum','isbn','stdno','year') NOT NULL" ); + $dbh->do( "UPDATE `search_field` SET type = 'year' WHERE name = 'date-of-publication'" ); + + NewVersion( $DBversion, 24807, "Add 'year' type to improve sorting behaviour" ); +} + # 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