From 5d8a401c85171ea3c4213c76ea97224367c13795 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 23 Apr 2018 14:21:43 -0300 Subject: [PATCH] Bug 20073: DBRev 17.12.00.037 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_20073.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_20073.perl diff --git a/Koha.pm b/Koha.pm index ece4c65975..5dd6ff9187 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.12.00.036"; +$VERSION = "17.12.00.037"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_20073.perl b/installer/data/mysql/atomicupdate/bug_20073.perl deleted file mode 100644 index 0fd4b453ee..0000000000 --- a/installer/data/mysql/atomicupdate/bug_20073.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "ALTER TABLE search_field CHANGE COLUMN type type ENUM('', 'string', 'date', 'number', 'boolean', 'sum', 'isbn', 'stdno') NOT NULL COMMENT 'what type of data this holds, relevant when storing it in the search engine'" ); - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 20073 - Add new types for Elasticsearch fields)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 0090ad08c7..9e466f79f8 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -15930,6 +15930,17 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 19287 - Add ability to mark an item 'Lost' from 'Holds to pull' list (CanMarkHoldsToPullAsLost, UpdateItemWhenLostFromHoldList and CANCEL_HOLD_ON_LOST))\n"; } +$DBversion = '17.12.00.037'; +if( CheckVersion( $DBversion ) ) { + + $dbh->do( q{ + ALTER TABLE search_field CHANGE COLUMN type type ENUM('', 'string', 'date', 'number', 'boolean', 'sum', 'isbn', 'stdno') NOT NULL COMMENT 'what type of data this holds, relevant when storing it in the search engine' + } ); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 20073 - Add new types for Elasticsearch fields)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.2