From d1ae967102aa60a6ed190411f171e740b9c04e72 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 6 Jan 2016 12:06:34 +0000 Subject: [PATCH] Bug 15478 - Update the remaining schema files that do not match the db schema Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher --- Koha/Schema/Result/Item.pm | 19 ++++++- Koha/Schema/Result/Overduerule.pm | 33 +++++++++--- .../Result/OverduerulesTransportType.pm | 50 ++++--------------- Koha/Schema/Result/Serial.pm | 4 +- 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm index cd74bfb8e7..c370d868ce 100644 --- a/Koha/Schema/Result/Item.pm +++ b/Koha/Schema/Result/Item.pm @@ -555,6 +555,21 @@ __PACKAGE__->might_have( { cascade_copy => 0, cascade_delete => 0 }, ); +=head2 items_last_borrower + +Type: might_have + +Related object: L + +=cut + +__PACKAGE__->might_have( + "items_last_borrower", + "Koha::Schema::Result::ItemsLastBorrower", + { "foreign.itemnumber" => "self.itemnumber" }, + { cascade_copy => 0, cascade_delete => 0 }, +); + =head2 old_issues Type: has_many @@ -616,8 +631,8 @@ __PACKAGE__->might_have( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-11-04 12:00:58 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jkgJfulDrGaUpQ6jC40vpQ +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-01-06 12:00:28 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3M6BvB4ATsBXgQCkFKuI3A __PACKAGE__->belongs_to( biblioitem => "Koha::Schema::Result::Biblioitem", "biblioitemnumber" ); diff --git a/Koha/Schema/Result/Overduerule.pm b/Koha/Schema/Result/Overduerule.pm index 8392d1a9e0..1d248ed394 100644 --- a/Koha/Schema/Result/Overduerule.pm +++ b/Koha/Schema/Result/Overduerule.pm @@ -23,6 +23,12 @@ __PACKAGE__->table("overduerules"); =head1 ACCESSORS +=head2 overduerules_id + + data_type: 'integer' + is_auto_increment: 1 + is_nullable: 0 + =head2 branchcode data_type: 'varchar' @@ -93,6 +99,8 @@ __PACKAGE__->table("overduerules"); =cut __PACKAGE__->add_columns( + "overduerules_id", + { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, "branchcode", { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 }, "categorycode", @@ -121,6 +129,20 @@ __PACKAGE__->add_columns( =over 4 +=item * L + +=back + +=cut + +__PACKAGE__->set_primary_key("overduerules_id"); + +=head1 UNIQUE CONSTRAINTS + +=head2 C + +=over 4 + =item * L =item * L @@ -129,7 +151,7 @@ __PACKAGE__->add_columns( =cut -__PACKAGE__->set_primary_key("branchcode", "categorycode"); +__PACKAGE__->add_unique_constraint("overduerules_branch_cat", ["branchcode", "categorycode"]); =head1 RELATIONS @@ -144,16 +166,13 @@ Related object: L __PACKAGE__->has_many( "overduerules_transport_types", "Koha::Schema::Result::OverduerulesTransportType", - { - "foreign.branchcode" => "self.branchcode", - "foreign.categorycode" => "self.categorycode", - }, + { "foreign.overduerules_id" => "self.overduerules_id" }, { cascade_copy => 0, cascade_delete => 0 }, ); -# Created by DBIx::Class::Schema::Loader v0.07025 @ 2014-05-02 18:04:32 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zQK4gTxkrPPwJzujbZxxdg +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-01-06 12:00:28 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Opfa1YZ3IeQRRbyrbKAkNQ # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/OverduerulesTransportType.pm b/Koha/Schema/Result/OverduerulesTransportType.pm index d93f32c7ba..b412df8935 100644 --- a/Koha/Schema/Result/OverduerulesTransportType.pm +++ b/Koha/Schema/Result/OverduerulesTransportType.pm @@ -29,59 +29,25 @@ __PACKAGE__->table("overduerules_transport_types"); is_auto_increment: 1 is_nullable: 0 -=head2 branchcode - - data_type: 'varchar' - default_value: (empty string) - is_foreign_key: 1 - is_nullable: 0 - size: 10 - -=head2 categorycode +=head2 message_transport_type data_type: 'varchar' - default_value: (empty string) + default_value: 'email' is_foreign_key: 1 is_nullable: 0 - size: 10 + size: 20 -=head2 letternumber +=head2 overduerules_id data_type: 'integer' - default_value: 1 - is_nullable: 0 - -=head2 message_transport_type - - data_type: 'varchar' - default_value: 'email' is_foreign_key: 1 is_nullable: 0 - size: 20 =cut __PACKAGE__->add_columns( "id", { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, - "branchcode", - { - data_type => "varchar", - default_value => "", - is_foreign_key => 1, - is_nullable => 0, - size => 10, - }, - "categorycode", - { - data_type => "varchar", - default_value => "", - is_foreign_key => 1, - is_nullable => 0, - size => 10, - }, - "letternumber", - { data_type => "integer", default_value => 1, is_nullable => 0 }, "message_transport_type", { data_type => "varchar", @@ -90,6 +56,8 @@ __PACKAGE__->add_columns( is_nullable => 0, size => 20, }, + "overduerules_id", + { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, ); =head1 PRIMARY KEY @@ -132,13 +100,13 @@ Related object: L __PACKAGE__->belongs_to( "overduerule", "Koha::Schema::Result::Overduerule", - { branchcode => "branchcode", categorycode => "categorycode" }, + { overduerules_id => "overduerules_id" }, { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07025 @ 2014-05-02 18:04:32 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mNvLssJ8h9WFNQaB+YCGYg +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-01-06 12:00:28 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KYpSfCfzkLxRYI2pQY5Htg # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/Serial.pm b/Koha/Schema/Result/Serial.pm index 059270c787..892ab21c92 100644 --- a/Koha/Schema/Result/Serial.pm +++ b/Koha/Schema/Result/Serial.pm @@ -179,8 +179,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-12-31 11:56:58 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nJ8tcbP/wWWbIic0hSUmBA +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-01-06 12:19:30 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZwOGHLaGRVFow9J/DeKSGg # You can replace this text with custom code or comments, and it will be preserved on regeneration -- 2.39.5