From cf1d8738bad041600f39d0660c4b71309f87936d Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 7 Apr 2022 13:02:19 +0000 Subject: [PATCH] Bug 30483: DBIx changes for issues table Content-Type: text/plain; charset=utf-8 Note: You may observe that DBIx drops the LEFT join_type here. There is no reason to be worried about that. If a FK column allows NULL values, DBIx sets it to LEFT. We remove the NULL here and DBIx now defaults to INNER again. No test plan. Signed-off-by: Marcel de Rooy --- Koha/Schema/Result/Issue.pm | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/Koha/Schema/Result/Issue.pm b/Koha/Schema/Result/Issue.pm index 5d26b5b563..f59b5b0366 100644 --- a/Koha/Schema/Result/Issue.pm +++ b/Koha/Schema/Result/Issue.pm @@ -35,7 +35,7 @@ primary key for issues table data_type: 'integer' is_foreign_key: 1 - is_nullable: 1 + is_nullable: 0 foreign key, linking this to the borrowers table for the patron this item was checked out to @@ -51,7 +51,7 @@ foreign key, linking this to the borrowers table for the user who checked out th data_type: 'integer' is_foreign_key: 1 - is_nullable: 1 + is_nullable: 0 foreign key, linking this to the items table for the item that was checked out @@ -172,11 +172,11 @@ __PACKAGE__->add_columns( "issue_id", { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, "borrowernumber", - { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, + { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, "issuer_id", { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, "itemnumber", - { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, + { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, "date_due", { data_type => "datetime", @@ -272,12 +272,7 @@ __PACKAGE__->belongs_to( "borrowernumber", "Koha::Schema::Result::Borrower", { borrowernumber => "borrowernumber" }, - { - is_deferrable => 1, - join_type => "LEFT", - on_delete => "RESTRICT", - on_update => "CASCADE", - }, + { is_deferrable => 1, on_delete => "RESTRICT", on_update => "CASCADE" }, ); =head2 issuer @@ -312,17 +307,12 @@ __PACKAGE__->belongs_to( "itemnumber", "Koha::Schema::Result::Item", { itemnumber => "itemnumber" }, - { - is_deferrable => 1, - join_type => "LEFT", - on_delete => "RESTRICT", - on_update => "CASCADE", - }, + { is_deferrable => 1, on_delete => "RESTRICT", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-11-17 10:01:24 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kDcP8DNMT8sLUmzBFfz3fg +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-04-07 13:01:57 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cWl4KIpiUfl+uNMXqTTJ8w __PACKAGE__->add_columns( '+auto_renew' => { is_boolean => 1 }, -- 2.20.1