From 6abb06a30b24989681ebdad9e2fdbb941131207a Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 13 Jul 2020 15:21:55 +0000 Subject: [PATCH] Bug 24986: DBRev 20.05.01.001 Signed-off-by: Lucas Gass --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_24986.perl | 22 ------------------ installer/data/mysql/updatedatabase.pl | 23 +++++++++++++++++++ 3 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24986.perl diff --git a/Koha.pm b/Koha.pm index 6719407375..1209bc49c2 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.01.000"; +$VERSION = "20.05.01.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24986.perl b/installer/data/mysql/atomicupdate/bug_24986.perl deleted file mode 100644 index c2a0433aae..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24986.perl +++ /dev/null @@ -1,22 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - for my $f (qw( streetnumber streettype zipcode mobile B_streetnumber B_streettype B_zipcode ) ) { - $dbh->do(qq| - ALTER TABLE borrowers MODIFY $f TINYTEXT DEFAULT NULL - |); - $dbh->do(qq| - ALTER TABLE deletedborrowers MODIFY $f TINYTEXT DEFAULT NULL - |); - } - for my $f ( qw( B_address altcontactfirstname altcontactsurname altcontactaddress1 altcontactaddress2 altcontactaddress3 altcontactzipcode altcontactphone ) ) { - $dbh->do(qq| - ALTER TABLE borrowers MODIFY $f MEDIUMTEXT DEFAULT NULL - |); - $dbh->do(qq| - ALTER TABLE deletedborrowers MODIFY $f MEDIUMTEXT DEFAULT NULL - |); - } - - NewVersion( $DBversion, 24986, "Switch borrowers address related fields to TINYTEXT or MEDIUMTEXT"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 477458af8f..c78481f355 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22178,6 +22178,29 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, undef, '20.05.01 release' ); } +$DBversion = '20.05.01.001'; +if( CheckVersion( $DBversion ) ) { + + for my $f (qw( streetnumber streettype zipcode mobile B_streetnumber B_streettype B_zipcode ) ) { + $dbh->do(qq| + ALTER TABLE borrowers MODIFY $f TINYTEXT DEFAULT NULL + |); + $dbh->do(qq| + ALTER TABLE deletedborrowers MODIFY $f TINYTEXT DEFAULT NULL + |); + } + for my $f ( qw( B_address altcontactfirstname altcontactsurname altcontactaddress1 altcontactaddress2 altcontactaddress3 altcontactzipcode altcontactphone ) ) { + $dbh->do(qq| + ALTER TABLE borrowers MODIFY $f MEDIUMTEXT DEFAULT NULL + |); + $dbh->do(qq| + ALTER TABLE deletedborrowers MODIFY $f MEDIUMTEXT DEFAULT NULL + |); + } + + NewVersion( $DBversion, 24986, "Switch borrowers address related fields to TINYTEXT or MEDIUMTEXT"); +} + # 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