From 5c8975a2d670a1b22ee04288784b575131fe4ca5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 14 Jun 2021 14:34:48 +0000 Subject: [PATCH] Bug 28489: DBRev 21.05.01.000 Signed-off-by: Kyle M Hall --- Koha.pm | 4 ++++ .../atomicupdate/sessions-from-longtext-to-longblob.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 3 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/sessions-from-longtext-to-longblob.perl diff --git a/Koha.pm b/Koha.pm index 80fe4d76cc..079bb023be 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,11 @@ 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. +<<<<<<< HEAD $VERSION = "21.05.00.000"; +======= +$VERSION = "21.06.00.001"; +>>>>>>> 0e8a2d58af (Bug 28489: DBRev 21.06.00.001) sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/sessions-from-longtext-to-longblob.perl b/installer/data/mysql/atomicupdate/sessions-from-longtext-to-longblob.perl deleted file mode 100644 index 0ddca85b5a..0000000000 --- a/installer/data/mysql/atomicupdate/sessions-from-longtext-to-longblob.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; -if ( CheckVersion($DBversion) ) { - $dbh->do('DELETE FROM sessions'); - $dbh->do('ALTER TABLE sessions MODIFY a_session LONGBLOB NOT NULL'); - - NewVersion( $DBversion, '28489', - 'Modify sessions.a_session from longtext to longblob' ); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index aadeefd9ed..50c5df0fee 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -24279,6 +24279,14 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, "", "Koha 21.05.00 release" ); } +$DBversion = '21.05.01.000'; +if ( CheckVersion($DBversion) ) { + $dbh->do('DELETE FROM sessions'); + $dbh->do('ALTER TABLE sessions MODIFY a_session LONGBLOB NOT NULL'); + + NewVersion( $DBversion, '28489', 'Modify sessions.a_session from longtext to longblob' ); +} + # 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