From f2f9f27b3c89d545f877fd1e141559b16d781558 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 17 Oct 2018 15:11:07 -0400 Subject: [PATCH] Bug 14570: Update schema files [Do Not Push] --- Koha/Schema/Result/Borrower.pm | 41 +++++++++++++++++----- Koha/Schema/Result/BorrowerModification.pm | 40 ++------------------- Koha/Schema/Result/Deletedborrower.pm | 11 ++---- 3 files changed, 36 insertions(+), 56 deletions(-) diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm index 4c7ef35df2..fe0866ace3 100644 --- a/Koha/Schema/Result/Borrower.pm +++ b/Koha/Schema/Result/Borrower.pm @@ -275,11 +275,6 @@ __PACKAGE__->table("borrowers"); data_type: 'mediumtext' is_nullable: 1 -=head2 guarantorid - - data_type: 'integer' - is_nullable: 1 - =head2 borrowernotes data_type: 'longtext' @@ -574,8 +569,6 @@ __PACKAGE__->add_columns( { data_type => "mediumtext", is_nullable => 1 }, "contacttitle", { data_type => "mediumtext", is_nullable => 1 }, - "guarantorid", - { data_type => "integer", is_nullable => 1 }, "borrowernotes", { data_type => "longtext", is_nullable => 1 }, "relationship", @@ -860,6 +853,36 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); +=head2 borrower_relationships_guarantees + +Type: has_many + +Related object: L + +=cut + +__PACKAGE__->has_many( + "borrower_relationships_guarantees", + "Koha::Schema::Result::BorrowerRelationship", + { "foreign.guarantee_id" => "self.borrowernumber" }, + { cascade_copy => 0, cascade_delete => 0 }, +); + +=head2 borrower_relationships_guarantors + +Type: has_many + +Related object: L + +=cut + +__PACKAGE__->has_many( + "borrower_relationships_guarantors", + "Koha::Schema::Result::BorrowerRelationship", + { "foreign.guarantor_id" => "self.borrowernumber" }, + { cascade_copy => 0, cascade_delete => 0 }, +); + =head2 branchcode Type: belongs_to @@ -1416,8 +1439,8 @@ Composing rels: L -> ordernumber __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-20 13:00:20 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QT6EPIG26F/kNK6prauRgw +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-10-17 19:00:05 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7tupSyGTfkBlvucK3b+e7A __PACKAGE__->add_columns( '+lost' => { is_boolean => 1 }, diff --git a/Koha/Schema/Result/BorrowerModification.pm b/Koha/Schema/Result/BorrowerModification.pm index c91c58e712..4ffb19082f 100644 --- a/Koha/Schema/Result/BorrowerModification.pm +++ b/Koha/Schema/Result/BorrowerModification.pm @@ -270,37 +270,11 @@ __PACKAGE__->table("borrower_modifications"); is_nullable: 1 size: 255 -=head2 contactname - - data_type: 'longtext' - is_nullable: 1 - -=head2 contactfirstname - - data_type: 'mediumtext' - is_nullable: 1 - -=head2 contacttitle - - data_type: 'mediumtext' - is_nullable: 1 - -=head2 guarantorid - - data_type: 'integer' - is_nullable: 1 - =head2 borrowernotes data_type: 'longtext' is_nullable: 1 -=head2 relationship - - data_type: 'varchar' - is_nullable: 1 - size: 100 - =head2 sex data_type: 'varchar' @@ -535,18 +509,8 @@ __PACKAGE__->add_columns( { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, "debarredcomment", { data_type => "varchar", is_nullable => 1, size => 255 }, - "contactname", - { data_type => "longtext", is_nullable => 1 }, - "contactfirstname", - { data_type => "mediumtext", is_nullable => 1 }, - "contacttitle", - { data_type => "mediumtext", is_nullable => 1 }, - "guarantorid", - { data_type => "integer", is_nullable => 1 }, "borrowernotes", { data_type => "longtext", is_nullable => 1 }, - "relationship", - { data_type => "varchar", is_nullable => 1, size => 100 }, "sex", { data_type => "varchar", is_nullable => 1, size => 1 }, "password", @@ -610,8 +574,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("verification_token", "borrowernumber"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-20 13:00:20 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qQ0BWngri+79YvK9S8zZPg +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-10-17 19:00:05 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:i4vwnuatrQPW3X/T/rtReg # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/Deletedborrower.pm b/Koha/Schema/Result/Deletedborrower.pm index 4d15e35c1f..21fa923d0c 100644 --- a/Koha/Schema/Result/Deletedborrower.pm +++ b/Koha/Schema/Result/Deletedborrower.pm @@ -273,11 +273,6 @@ __PACKAGE__->table("deletedborrowers"); data_type: 'mediumtext' is_nullable: 1 -=head2 guarantorid - - data_type: 'integer' - is_nullable: 1 - =head2 borrowernotes data_type: 'longtext' @@ -559,8 +554,6 @@ __PACKAGE__->add_columns( { data_type => "mediumtext", is_nullable => 1 }, "contacttitle", { data_type => "mediumtext", is_nullable => 1 }, - "guarantorid", - { data_type => "integer", is_nullable => 1 }, "borrowernotes", { data_type => "longtext", is_nullable => 1 }, "relationship", @@ -641,8 +634,8 @@ __PACKAGE__->add_columns( ); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DNkNHNcv0lkMH6/seu89hg +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-10-17 19:00:06 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nLdE751wCr/CSDydnzmGJw # You can replace this text with custom code or comments, and it will be preserved on regeneration -- 2.17.1 (Apple Git-112)