From 7870b4cc564e970483d83aed746e3fcc7e529964 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 6 Jan 2016 12:04:56 +0000 Subject: [PATCH] Bug 15478 - Checksum mismatch when regenerating schema When regenerating the db schema on master, the script will error out with a checksum mismatch on Borrower.pm, and also DeletedBorrower.pm Test Plan: 1) Check out master 2) Run ./misc/devel/update_dbix_class_files.pl 3) Note the error 4) Apply this patch 5) Re-reun ./misc/devel/update_dbix_class_files.pl 6) Note there is no error Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher --- Koha/Schema/Result/Borrower.pm | 19 +++++++++++++++++-- Koha/Schema/Result/Deletedborrower.pm | 6 +++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm index a381c0c27a..97f65d0fc7 100644 --- a/Koha/Schema/Result/Borrower.pm +++ b/Koha/Schema/Result/Borrower.pm @@ -865,6 +865,21 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); +=head2 items_last_borrowers + +Type: has_many + +Related object: L + +=cut + +__PACKAGE__->has_many( + "items_last_borrowers", + "Koha::Schema::Result::ItemsLastBorrower", + { "foreign.borrowernumber" => "self.borrowernumber" }, + { cascade_copy => 0, cascade_delete => 0 }, +); + =head2 message_queues Type: has_many @@ -1161,8 +1176,8 @@ Composing rels: L -> ordernumber __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-10-21 19:50:05 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QafovaRBnm36nyoyQTGIgQ +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-01-06 11:59:52 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0nIBbkzhb+Yfp6qpSLo51A __PACKAGE__->belongs_to( "guarantor", diff --git a/Koha/Schema/Result/Deletedborrower.pm b/Koha/Schema/Result/Deletedborrower.pm index d69fcdc537..315903500e 100644 --- a/Koha/Schema/Result/Deletedborrower.pm +++ b/Koha/Schema/Result/Deletedborrower.pm @@ -557,9 +557,9 @@ __PACKAGE__->add_columns( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-10-06 10:38:42 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NofxbMGIuZqlGCqvjPEI1Q +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-01-06 12:00:28 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:aNmdXpOz+XN5abM67sl8uA -# You can replace this text with custom content, and it will be preserved on regeneration +# You can replace this text with custom code or comments, and it will be preserved on regeneration 1; -- 2.39.5