From 8547b2520735cc4be7ad2b4bc8c407e83ae60c08 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 16 Jul 2018 14:20:21 -0400 Subject: [PATCH] Bug 14570 - Update schema files [Do Not Push] --- Koha/Schema/Result/Borrower.pm | 70 ++++++++++++++---------------- Koha/Schema/Result/BorrowerModification.pm | 40 +---------------- Koha/Schema/Result/Deletedborrower.pm | 40 +---------------- 3 files changed, 36 insertions(+), 114 deletions(-) diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm index e88fdd2b18..256d71022a 100644 --- a/Koha/Schema/Result/Borrower.pm +++ b/Koha/Schema/Result/Borrower.pm @@ -260,37 +260,11 @@ __PACKAGE__->table("borrowers"); 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' @@ -568,18 +542,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", @@ -1220,6 +1184,36 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); +=head2 relationships_guarantees + +Type: has_many + +Related object: L + +=cut + +__PACKAGE__->has_many( + "relationships_guarantees", + "Koha::Schema::Result::Relationship", + { "foreign.guarantee_id" => "self.borrowernumber" }, + { cascade_copy => 0, cascade_delete => 0 }, +); + +=head2 relationships_guarantors + +Type: has_many + +Related object: L + +=cut + +__PACKAGE__->has_many( + "relationships_guarantors", + "Koha::Schema::Result::Relationship", + { "foreign.guarantor_id" => "self.borrowernumber" }, + { cascade_copy => 0, cascade_delete => 0 }, +); + =head2 reserves Type: has_many @@ -1416,8 +1410,8 @@ Composing rels: L -> ordernumber __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-07-06 14:12:40 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LaQWPXzF1Amzt8fgEEyHdg +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-07-16 18:16:27 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uvGkpPEjWOkujn+/YlRqSQ __PACKAGE__->add_columns( '+lost' => { is_boolean => 1 }, diff --git a/Koha/Schema/Result/BorrowerModification.pm b/Koha/Schema/Result/BorrowerModification.pm index 013da7753a..40103662a2 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' @@ -529,18 +503,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", @@ -598,8 +562,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("verification_token", "borrowernumber"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Vv0bJqR71Ust1MZAkYqTig +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-07-16 18:16:27 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZCECOuaaj/hc2A9gZtGC/w # 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..30498b2051 100644 --- a/Koha/Schema/Result/Deletedborrower.pm +++ b/Koha/Schema/Result/Deletedborrower.pm @@ -258,37 +258,11 @@ __PACKAGE__->table("deletedborrowers"); 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' @@ -553,18 +527,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", @@ -641,8 +605,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-07-16 18:16:28 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Xt/lmtOOCP+X3L2IMtcXlw # You can replace this text with custom code or comments, and it will be preserved on regeneration -- 2.11.0