Attachment 85412 Details for Bug 14570 – Bug 14570: Update schema files [Do Not Push]

[patch] Bug 14570: Update schema files [Do Not Push]

Bug-14570-Update-schema-files-Do-Not-Push.patch (text/plain), 6.12 KB, created by Kyle M Hall (khall) on 2019-02-20 20:03:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2019-02-20 20:03:51 UTC

Size: 6.12 KB

patch

obsolete

>From 746dbc5bdd9f98559c5c55a692df8b5073186fb2 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>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<Koha::Schema::Result::BorrowerRelationship>
>+
>+=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<Koha::Schema::Result::BorrowerRelationship>
>+
>+=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</aqorder_users> -> 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)

Actions: View | Diff | Splinter Review

Attachments on bug 14570: 52400 | 52401 | 52402 | 52403 | 52406 | 52407 | 58146 | 58147 | 58159 | 58202 | 58391 | 58399 | 58412 | 58688 | 58689 | 58739 | 58762 | 58763 | 58764 | 58834 | 58835 | 58836 | 58837 | 58838 | 58839 | 58949 | 58950 | 58951 | 58952 | 58953 | 58954 | 58972 | 58973 | 58974 | 58975 | 58976 | 58977 | 58978 | 58979 | 58980 | 62450 | 62451 | 62452 | 64124 | 64125 | 64126 | 71160 | 71161 | 71162 | 71163 | 73283 | 73284 | 73583 | 73584 | 74950 | 74951 | 74952 | 74953 | 74954 | 74976 | 74977 | 74978 | 74979 | 77029 | 77030 | 77031 | 77032 | 77033 | 77034 | 77040 | 77041 | 77042 | 77043 | 77044 | 77045 | 77046 | 77047 | 77048 | 77049 | 77067 | 77068 | 77069 | 77070 | 77071 | 77072 | 77073 | 77074 | 77075 | 77076 | 77077 | 77078 | 77290 | 77291 | 77346 | 77347 | 77348 | 80842 | 80849 | 81932 | 81933 | 85411 | 85412 | 85431 | 89889 | 89890 | 89891 | 89892 | 89909 | 89910 | 89911 | 89912 | 89921 | 89922 | 89929 | 90048 | 91231 | 91439 | 91440 | 91441 | 91442 | 91443 | 91444 | 91445 | 91694 | 91695 | 91696 | 91697 | 91698 | 91699 | 91700 | 92157 | 92158 | 92161 | 92162 | 92163 | 92180 | 92181 | 92182 | 92183 | 92232 | 92233 | 92234 | 92235 | 92277 | 92278 | 92279 | 92280 | 92281 | 92282 | 92283 | 92284 | 92285 | 92286 | 92287 | 92288 | 92289 | 92290 | 92291 | 92292 | 92298 | 92299 | 92300 | 92301 | 92302 | 92303 | 92304 | 92305 | 92306 | 92307 | 92308 | 92309 | 92310 | 92311 | 92312 | 92313 | 92314 | 92315 | 92316 | 92317 | 92318 | 92319 | 92320 | 92321 | 92322 | 92323 | 92324 | 92325 | 92346 | 92347 | 92348 | 92349 | 92350