From d0a8df6214e68d9fbdbac43e5b73e6c5bb155cb3 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 19 Feb 2020 11:09:41 +0000 Subject: [PATCH] Bug 24640: DBRev 19.12.00.023 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- Koha/Schema/Result/Quote.pm | 8 ++++---- installer/data/mysql/atomicupdate/bug_24640.perl | 7 ------- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 4 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24640.perl diff --git a/Koha.pm b/Koha.pm index 198019c56f..00871c0ceb 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 = "19.12.00.022"; +$VERSION = "19.12.00.023"; sub version { return $VERSION; diff --git a/Koha/Schema/Result/Quote.pm b/Koha/Schema/Result/Quote.pm index 94b06eeb2f..99bcb14f7c 100644 --- a/Koha/Schema/Result/Quote.pm +++ b/Koha/Schema/Result/Quote.pm @@ -43,7 +43,7 @@ __PACKAGE__->table("quotes"); data_type: 'datetime' datetime_undef_if_invalid: 1 - is_nullable: 0 + is_nullable: 1 =cut @@ -58,7 +58,7 @@ __PACKAGE__->add_columns( { data_type => "datetime", datetime_undef_if_invalid => 1, - is_nullable => 0, + is_nullable => 1, }, ); @@ -75,8 +75,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("id"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:54 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8xSMrGuJH9rbm73qOvU8Xg +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2020-02-19 11:09:24 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CdcbCjhjmsLLDQ1AAOja7Q # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/installer/data/mysql/atomicupdate/bug_24640.perl b/installer/data/mysql/atomicupdate/bug_24640.perl deleted file mode 100644 index 393c049343..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24640.perl +++ /dev/null @@ -1,7 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "ALTER TABLE quotes MODIFY timestamp datetime NULL" ); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 24640 - Allow quotes.timestamp to be NULL)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index c6b33806cf..1b94f2b0a1 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20817,6 +20817,14 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 20882 - items.uri to MEDIUMTEXT)\n"; } +$DBversion = '19.12.00.023'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "ALTER TABLE quotes MODIFY timestamp datetime NULL" ); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 24640 - Allow quotes.timestamp to be NULL)\n"; +} + # 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