From 746dbc5bdd9f98559c5c55a692df8b5073186fb2 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 20 Feb 2019 15:02:02 -0500 Subject: [PATCH] Bug 14570: Update schema files [Do Not Push] --- Koha/Schema/Result/Borrower.pm | 41 +++++++++++++++++----- Koha/Schema/Result/BorrowerModification.pm | 11 ++---- Koha/Schema/Result/Deletedborrower.pm | 11 ++---- Koha/Schema/Result/SocialData.pm | 7 ++-- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm index 40723b4d85..bb0a5a225d 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 @@ -1446,8 +1469,8 @@ Composing rels: L -> ordernumber __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); -# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-02-15 13:15:09 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NhuG8jv9ut+qIIm3vGHsrQ +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-02-20 19:44:34 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ML9SBaNZMZjw7lodiAIQ+w __PACKAGE__->add_columns( '+lost' => { is_boolean => 1 }, diff --git a/Koha/Schema/Result/BorrowerModification.pm b/Koha/Schema/Result/BorrowerModification.pm index c91c58e712..4fb8a26b6b 100644 --- a/Koha/Schema/Result/BorrowerModification.pm +++ b/Koha/Schema/Result/BorrowerModification.pm @@ -285,11 +285,6 @@ __PACKAGE__->table("borrower_modifications"); data_type: 'mediumtext' is_nullable: 1 -=head2 guarantorid - - data_type: 'integer' - is_nullable: 1 - =head2 borrowernotes data_type: 'longtext' @@ -541,8 +536,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", @@ -610,8 +603,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 @ 2019-02-20 19:44:34 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yw4nYeRtaRmTacYGvUifBQ # 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..409372f300 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 @ 2019-02-20 19:44:35 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mxE0c6aYVhMNCSD6+4NsEQ # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/SocialData.pm b/Koha/Schema/Result/SocialData.pm index b2d835b0b0..4a2441e9e3 100644 --- a/Koha/Schema/Result/SocialData.pm +++ b/Koha/Schema/Result/SocialData.pm @@ -26,6 +26,7 @@ __PACKAGE__->table("social_data"); =head2 isbn data_type: 'varchar' + default_value: (empty string) is_nullable: 0 size: 30 @@ -64,7 +65,7 @@ __PACKAGE__->table("social_data"); __PACKAGE__->add_columns( "isbn", - { data_type => "varchar", is_nullable => 0, size => 30 }, + { data_type => "varchar", default_value => "", is_nullable => 0, size => 30 }, "num_critics", { data_type => "integer", is_nullable => 1 }, "num_critics_pro", @@ -92,8 +93,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("isbn"); -# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-13 15:24:28 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:l44tYFEfIKX0xXzj6AHInQ +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-02-20 19:44:36 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:m8Ll5M7IDQpAB2kZnRh10w # You can replace this text with custom content, and it will be preserved on regeneration -- 2.17.2 (Apple Git-113)