Attachment 58646 Details for Bug 14187 – [SIGNED-OFF] Bug 14187 - branchtransfer needs a primary key (id) for DBIx and common sense.

[patch] [SIGNED-OFF] Bug 14187 - branchtransfer needs a primary key (id) for DBIx and common sense.

SIGNED-OFF-Bug-14187---branchtransfer-needs-a-prim.patch (text/plain), 7.78 KB, created by Owen Leonard on 2017-01-06 14:03:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2017-01-06 14:03:34 UTC

Size: 7.78 KB

patch

obsolete

>From 02d555c4cf5ff8bf2dc32f10406fdf5c67757267 Mon Sep 17 00:00:00 2001
>From: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>
>Date: Tue, 12 May 2015 10:19:05 +0300
>Subject: [PATCH] [SIGNED-OFF] Bug 14187 - branchtransfer needs a primary key
> (id) for DBIx and common sense.
>
>* C4/Circulation.pm (GetTransfers, GetTransfersFromTo): Also return
>  branchtransfer_id in return columns.
>* installer/data/mysql/atomicupdate/14187.perl: New file.
>* installer/data/mysql/kohastructure.sql: Modify branchtransfers structure.
>* t/db_dependent/Circulation/transfers.t: Update tests to expect
>  branchtransfer_id.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Test plan successful on all steps.
>---
> C4/Circulation.pm                            |  5 ++--
> Koha/Schema/Result/Branchtransfer.pm         | 45 +++++++++++++++-------------
> installer/data/mysql/atomicupdate/14187.perl |  8 +++++
> installer/data/mysql/kohastructure.sql       |  2 ++
> t/db_dependent/Circulation/transfers.t       | 16 +++++-----
> 5 files changed, 47 insertions(+), 29 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/14187.perl
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 80ae062..cfccbfc 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -3205,7 +3205,8 @@ sub GetTransfers {
>     my $query = '
>         SELECT datesent,
>                frombranch,
>-               tobranch
>+               tobranch,
>+               branchtransfer_id
>         FROM branchtransfers
>         WHERE itemnumber = ?
>           AND datearrived IS NULL
>@@ -3229,7 +3230,7 @@ sub GetTransfersFromTo {
>     return unless ( $frombranch && $tobranch );
>     my $dbh   = C4::Context->dbh;
>     my $query = "
>-        SELECT itemnumber,datesent,frombranch
>+        SELECT branchtransfer_id,itemnumber,datesent,frombranch
>         FROM   branchtransfers
>         WHERE  frombranch=?
>           AND  tobranch=?
>diff --git a/Koha/Schema/Result/Branchtransfer.pm b/Koha/Schema/Result/Branchtransfer.pm
>index 1976ffd..958c506 100644
>--- a/Koha/Schema/Result/Branchtransfer.pm
>+++ b/Koha/Schema/Result/Branchtransfer.pm
>@@ -1,21 +1,17 @@
>-use utf8;
> package Koha::Schema::Result::Branchtransfer;
> 
> # Created by DBIx::Class::Schema::Loader
> # DO NOT MODIFY THE FIRST PART OF THIS FILE
> 
>-=head1 NAME
>-
>-Koha::Schema::Result::Branchtransfer
>-
>-=cut
>-
> use strict;
> use warnings;
> 
> use base 'DBIx::Class::Core';
> 
>-=head1 TABLE: C<branchtransfers>
>+
>+=head1 NAME
>+
>+Koha::Schema::Result::Branchtransfer
> 
> =cut
> 
>@@ -23,6 +19,12 @@ __PACKAGE__->table("branchtransfers");
> 
> =head1 ACCESSORS
> 
>+=head2 branchtransfer_id
>+
>+  data_type: 'integer'
>+  is_auto_increment: 1
>+  is_nullable: 0
>+
> =head2 itemnumber
> 
>   data_type: 'integer'
>@@ -66,6 +68,8 @@ __PACKAGE__->table("branchtransfers");
> =cut
> 
> __PACKAGE__->add_columns(
>+  "branchtransfer_id",
>+  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
>   "itemnumber",
>   {
>     data_type      => "integer",
>@@ -104,6 +108,7 @@ __PACKAGE__->add_columns(
>   "comments",
>   { data_type => "mediumtext", is_nullable => 1 },
> );
>+__PACKAGE__->set_primary_key("branchtransfer_id");
> 
> =head1 RELATIONS
> 
>@@ -122,39 +127,39 @@ __PACKAGE__->belongs_to(
>   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
> );
> 
>-=head2 itemnumber
>+=head2 tobranch
> 
> Type: belongs_to
> 
>-Related object: L<Koha::Schema::Result::Item>
>+Related object: L<Koha::Schema::Result::Branch>
> 
> =cut
> 
> __PACKAGE__->belongs_to(
>-  "itemnumber",
>-  "Koha::Schema::Result::Item",
>-  { itemnumber => "itemnumber" },
>+  "tobranch",
>+  "Koha::Schema::Result::Branch",
>+  { branchcode => "tobranch" },
>   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
> );
> 
>-=head2 tobranch
>+=head2 itemnumber
> 
> Type: belongs_to
> 
>-Related object: L<Koha::Schema::Result::Branch>
>+Related object: L<Koha::Schema::Result::Item>
> 
> =cut
> 
> __PACKAGE__->belongs_to(
>-  "tobranch",
>-  "Koha::Schema::Result::Branch",
>-  { branchcode => "tobranch" },
>+  "itemnumber",
>+  "Koha::Schema::Result::Item",
>+  { itemnumber => "itemnumber" },
>   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NPbH+5o2BVPj8yeoUqEavw
>+# Created by DBIx::Class::Schema::Loader v0.07010 @ 2015-05-27 18:14:12
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IKdPAJHJdYM3MHxnj6Mxzg
> 
> 
> # You can replace this text with custom content, and it will be preserved on regeneration
>diff --git a/installer/data/mysql/atomicupdate/14187.perl b/installer/data/mysql/atomicupdate/14187.perl
>new file mode 100644
>index 0000000..02022b4
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/14187.perl
>@@ -0,0 +1,8 @@
>+$DBversion = 'XXX';  # will be replaced by the RM
>+if( CheckVersion( $DBversion )  ) {
>+    $dbh->do("ALTER TABLE branchtransfers ADD COLUMN branchtransfer_id int(12) NOT NULL auto_increment FIRST, ADD CONSTRAINT PRIMARY KEY (branchtransfer_id);");
>+
>+    # Always end with this (adjust the bug info)
>+    SetVersion( $DBversion );
>+    print "Upgrade to $DBversion done (Bug 14187 - branchtransfer needs a primary key (id) for DBIx and common sense.)\n";
>+}
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index f40692e..499968d 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -1003,12 +1003,14 @@ CREATE TABLE `default_branch_item_rules` (
> 
> DROP TABLE IF EXISTS `branchtransfers`;
> CREATE TABLE `branchtransfers` ( -- information for items that are in transit between branches
>+  `branchtransfer_id` int(12) NOT NULL auto_increment, -- primary key
>   `itemnumber` int(11) NOT NULL default 0, -- the itemnumber that it is in transit (items.itemnumber)
>   `datesent` datetime default NULL, -- the date the transfer was initialized
>   `frombranch` varchar(10) NOT NULL default '', -- the branch the transfer is coming from
>   `datearrived` datetime default NULL, -- the date the transfer arrived at its destination
>   `tobranch` varchar(10) NOT NULL default '', -- the branch the transfer was going to
>   `comments` mediumtext, -- any comments related to the transfer
>+  PRIMARY KEY (`branchtransfer_id`),
>   KEY `frombranch` (`frombranch`),
>   KEY `tobranch` (`tobranch`),
>   KEY `itemnumber` (`itemnumber`),
>diff --git a/t/db_dependent/Circulation/transfers.t b/t/db_dependent/Circulation/transfers.t
>index 1e83f33..5abe5e5 100644
>--- a/t/db_dependent/Circulation/transfers.t
>+++ b/t/db_dependent/Circulation/transfers.t
>@@ -125,7 +125,7 @@ is(CreateBranchTransferLimit(undef,$branchcode_2),undef,
> my @transfers = GetTransfers($item_id1);
> cmp_deeply(
>     \@transfers,
>-    [ re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'), $branchcode_1, $branchcode_2 ],
>+    [ re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'), $branchcode_1, $branchcode_2, re('[0-9]*') ],
>     "Transfers of the item1"
> );    #NOTE: Only the first transfer is returned
> @transfers = GetTransfers;
>@@ -142,14 +142,16 @@ cmp_deeply(
>     \@transferfrom1to2,
>     [
>         {
>-            itemnumber => $item_id1,
>-            datesent   => re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'),
>-            frombranch => $branchcode_1
>+            branchtransfer_id => re('[0-9]*'),
>+            itemnumber        => $item_id1,
>+            datesent          => re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'),
>+            frombranch        => $branchcode_1
>         },
>         {
>-            itemnumber => $item_id2,
>-            datesent   => re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'),
>-            frombranch => $branchcode_1
>+            branchtransfer_id => re('[0-9]*'),
>+            itemnumber        => $item_id2,
>+            datesent          => re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'),
>+            frombranch        => $branchcode_1
>         }
>     ],
>     "Item1 and Item2 has been transferred from branch1 to branch2"
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 14187: 39058 | 39059 | 39060 | 40075 | 58121 | 58123 | 58124 | 58646 | 58730 | 58880 | 58881 | 58882