From 50c5708fe8ed74e22d78d9acb81080c7840954dc Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 3 Mar 2017 16:45:22 +0000 Subject: [PATCH] Bug 17260 - DBRev 16.12.00.011 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_17260.sql | 1 - installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_17260.sql diff --git a/Koha.pm b/Koha.pm index fb3229ca3d..5c41ce98b2 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 = "16.12.00.010"; +$VERSION = "16.12.00.011"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_17260.sql b/installer/data/mysql/atomicupdate/bug_17260.sql deleted file mode 100644 index f5885e2d9c..0000000000 --- a/installer/data/mysql/atomicupdate/bug_17260.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE search_field CHANGE COLUMN type type ENUM('', 'string', 'date', 'number', 'boolean', 'sum') NOT NULL COMMENT 'what type of data this holds, relevant when storing it in the search engine'; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 820c1a309f..92c75029f1 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -13926,6 +13926,17 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 16034 - Integration with OverDrive Patron API)\n"; } +$DBversion = "16.12.00.011"; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + ALTER TABLE search_field CHANGE COLUMN type type ENUM('', 'string', 'date', 'number', 'boolean', 'sum') 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 17260 - updatedatabase.pl fails on invalid entries in ENUM and BOOLEAN columns)\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.39.5