Attachment 60626 Details for Bug 16034 – Bug 16034 follow-up: generated Borrower resultset

[patch] Bug 16034 follow-up: generated Borrower resultset

Bug-16034-follow-up-generated-Borrower-resultset.patch (text/plain), 4.20 KB, created by Srdjan Jankovic on 2017-02-23 23:37:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Srdjan Jankovic

Created: 2017-02-23 23:37:13 UTC

Size: 4.20 KB

patch

obsolete

>From fde67fbc3d92391fd6d567e12cb47d6cd7e75cce Mon Sep 17 00:00:00 2001
>From: Srdjan <srdjan@catalyst.net.nz>
>Date: Fri, 24 Feb 2017 12:32:43 +1300
>Subject: [PATCH] Bug 16034 follow-up: generated Borrower resultset
>
>---
> Koha/Schema/Result/Borrower.pm | 56 +++++++++++++++++++++++-------------------
> 1 file changed, 31 insertions(+), 25 deletions(-)
>
>diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm
>index 4241dd0..5a0a55c 100644
>--- a/Koha/Schema/Result/Borrower.pm
>+++ b/Koha/Schema/Result/Borrower.pm
>@@ -89,7 +89,7 @@ __PACKAGE__->table("borrowers");
> 
> =head2 state
> 
>-  data_type: 'text'
>+  data_type: 'mediumtext'
>   is_nullable: 1
> 
> =head2 zipcode
>@@ -170,7 +170,7 @@ __PACKAGE__->table("borrowers");
> =head2 B_state
> 
>   accessor: 'b_state'
>-  data_type: 'text'
>+  data_type: 'mediumtext'
>   is_nullable: 1
> 
> =head2 B_zipcode
>@@ -285,6 +285,18 @@ __PACKAGE__->table("borrowers");
>   is_nullable: 1
>   size: 100
> 
>+=head2 ethnicity
>+
>+  data_type: 'varchar'
>+  is_nullable: 1
>+  size: 50
>+
>+=head2 ethnotes
>+
>+  data_type: 'varchar'
>+  is_nullable: 1
>+  size: 255
>+
> =head2 sex
> 
>   data_type: 'varchar'
>@@ -363,7 +375,7 @@ __PACKAGE__->table("borrowers");
> 
> =head2 altcontactstate
> 
>-  data_type: 'text'
>+  data_type: 'mediumtext'
>   is_nullable: 1
> 
> =head2 altcontactzipcode
>@@ -419,7 +431,7 @@ __PACKAGE__->table("borrowers");
>   data_type: 'timestamp'
>   datetime_undef_if_invalid: 1
>   default_value: current_timestamp
>-  is_nullable: 0
>+  is_nullable: 1
> 
> =head2 lastseen
> 
>@@ -427,6 +439,11 @@ __PACKAGE__->table("borrowers");
>   datetime_undef_if_invalid: 1
>   is_nullable: 1
> 
>+=head2 overdrive_auth_token
>+
>+  data_type: 'text'
>+  is_nullable: 1
>+
> =cut
> 
> __PACKAGE__->add_columns(
>@@ -455,7 +472,7 @@ __PACKAGE__->add_columns(
>   "city",
>   { data_type => "mediumtext", is_nullable => 0 },
>   "state",
>-  { data_type => "text", is_nullable => 1 },
>+  { data_type => "mediumtext", is_nullable => 1 },
>   "zipcode",
>   { data_type => "varchar", is_nullable => 1, size => 25 },
>   "country",
>@@ -498,7 +515,7 @@ __PACKAGE__->add_columns(
>   "B_city",
>   { accessor => "b_city", data_type => "mediumtext", is_nullable => 1 },
>   "B_state",
>-  { accessor => "b_state", data_type => "text", is_nullable => 1 },
>+  { accessor => "b_state", data_type => "mediumtext", is_nullable => 1 },
>   "B_zipcode",
>   {
>     accessor => "b_zipcode",
>@@ -554,6 +571,10 @@ __PACKAGE__->add_columns(
>   { data_type => "mediumtext", is_nullable => 1 },
>   "relationship",
>   { data_type => "varchar", is_nullable => 1, size => 100 },
>+  "ethnicity",
>+  { data_type => "varchar", is_nullable => 1, size => 50 },
>+  "ethnotes",
>+  { data_type => "varchar", is_nullable => 1, size => 255 },
>   "sex",
>   { data_type => "varchar", is_nullable => 1, size => 1 },
>   "password",
>@@ -581,7 +602,7 @@ __PACKAGE__->add_columns(
>   "altcontactaddress3",
>   { data_type => "varchar", is_nullable => 1, size => 255 },
>   "altcontactstate",
>-  { data_type => "text", is_nullable => 1 },
>+  { data_type => "mediumtext", is_nullable => 1 },
>   "altcontactzipcode",
>   { data_type => "varchar", is_nullable => 1, size => 50 },
>   "altcontactcountry",
>@@ -608,7 +629,7 @@ __PACKAGE__->add_columns(
>     data_type => "timestamp",
>     datetime_undef_if_invalid => 1,
>     default_value => \"current_timestamp",
>-    is_nullable => 0,
>+    is_nullable => 1,
>   },
>   "lastseen",
>   {
>@@ -1125,21 +1146,6 @@ __PACKAGE__->might_have(
>   { cascade_copy => 0, cascade_delete => 0 },
> );
> 
>-=head2 ratings
>-
>-Type: has_many
>-
>-Related object: L<Koha::Schema::Result::Rating>
>-
>-=cut
>-
>-__PACKAGE__->has_many(
>-  "ratings",
>-  "Koha::Schema::Result::Rating",
>-  { "foreign.borrowernumber" => "self.borrowernumber" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>-);
>-
> =head2 reserves
> 
> Type: has_many
>@@ -1336,8 +1342,8 @@ Composing rels: L</aqorder_users> -> ordernumber
> __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber");
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-10-31 10:39:35
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Lc6GQ2E7d+tyzTk3v2sWjQ
>+# Created by DBIx::Class::Schema::Loader v0.07045 @ 2017-02-24 12:22:35
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jNH2nYxGMamXKH5lwnJmTA
> 
> __PACKAGE__->belongs_to(
>     "guarantor",
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 16034: 48919 | 48920 | 48921 | 49929 | 49930 | 49931 | 53793 | 55594 | 55675 | 55676 | 55677 | 55678 | 55763 | 55764 | 55765 | 55766 | 55815 | 55816 | 57398 | 57399 | 57400 | 57401 | 58518 | 58519 | 58520 | 58521 | 58522 | 58790 | 58791 | 59055 | 59056 | 59057 | 59058 | 59392 | 59393 | 59394 | 59395 | 59713 | 59714 | 59743 | 59744 | 59745 | 59746 | 60626 | 60654 | 60789