From 014b54cca0db10d09ed1bd5c3e876563d0793220 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 11 Jul 2017 09:08:13 -0400 Subject: [PATCH] Bug 18925: Update schema files --- Koha/Schema/Result/Branch.pm | 30 ------------ Koha/Schema/Result/Category.pm | 45 ----------------- Koha/Schema/Result/CirculationRule.pm | 75 ++--------------------------- Koha/Schema/Result/DefaultBranchCircRule.pm | 18 +------ Koha/Schema/Result/DefaultCircRule.pm | 18 +------ Koha/Schema/Result/Issuingrule.pm | 18 +------ Koha/Schema/Result/Itemtype.pm | 15 ------ 7 files changed, 11 insertions(+), 208 deletions(-) diff --git a/Koha/Schema/Result/Branch.pm b/Koha/Schema/Result/Branch.pm index 1295c2dbab..3fa1ec25c5 100644 --- a/Koha/Schema/Result/Branch.pm +++ b/Koha/Schema/Result/Branch.pm @@ -286,21 +286,6 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); -=head2 branch_borrower_circ_rules - -Type: has_many - -Related object: L - -=cut - -__PACKAGE__->has_many( - "branch_borrower_circ_rules", - "Koha::Schema::Result::BranchBorrowerCircRule", - { "foreign.branchcode" => "self.branchcode" }, - { cascade_copy => 0, cascade_delete => 0 }, -); - =head2 branch_item_rules Type: has_many @@ -361,21 +346,6 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); -=head2 circulation_rules - -Type: has_many - -Related object: L - -=cut - -__PACKAGE__->has_many( - "circulation_rules", - "Koha::Schema::Result::CirculationRule", - { "foreign.branchcode" => "self.branchcode" }, - { cascade_copy => 0, cascade_delete => 0 }, -); - =head2 club_enrollments Type: has_many diff --git a/Koha/Schema/Result/Category.pm b/Koha/Schema/Result/Category.pm index 48e8359a1a..e34b2cc4cf 100644 --- a/Koha/Schema/Result/Category.pm +++ b/Koha/Schema/Result/Category.pm @@ -221,21 +221,6 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); -=head2 branch_borrower_circ_rules - -Type: has_many - -Related object: L - -=cut - -__PACKAGE__->has_many( - "branch_borrower_circ_rules", - "Koha::Schema::Result::BranchBorrowerCircRule", - { "foreign.categorycode" => "self.categorycode" }, - { cascade_copy => 0, cascade_delete => 0 }, -); - =head2 categories_branches Type: has_many @@ -251,36 +236,6 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); -=head2 circulation_rules - -Type: has_many - -Related object: L - -=cut - -__PACKAGE__->has_many( - "circulation_rules", - "Koha::Schema::Result::CirculationRule", - { "foreign.categorycode" => "self.categorycode" }, - { cascade_copy => 0, cascade_delete => 0 }, -); - -=head2 default_borrower_circ_rule - -Type: might_have - -Related object: L - -=cut - -__PACKAGE__->might_have( - "default_borrower_circ_rule", - "Koha::Schema::Result::DefaultBorrowerCircRule", - { "foreign.categorycode" => "self.categorycode" }, - { cascade_copy => 0, cascade_delete => 0 }, -); - # Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TGAiiFICSjlKNvnfa87kFQ diff --git a/Koha/Schema/Result/CirculationRule.pm b/Koha/Schema/Result/CirculationRule.pm index 6e7141f740..360854cd5c 100644 --- a/Koha/Schema/Result/CirculationRule.pm +++ b/Koha/Schema/Result/CirculationRule.pm @@ -32,21 +32,18 @@ __PACKAGE__->table("circulation_rules"); =head2 branchcode data_type: 'varchar' - is_foreign_key: 1 is_nullable: 1 size: 10 =head2 categorycode data_type: 'varchar' - is_foreign_key: 1 is_nullable: 1 size: 10 =head2 itemtype data_type: 'varchar' - is_foreign_key: 1 is_nullable: 1 size: 10 @@ -68,11 +65,11 @@ __PACKAGE__->add_columns( "id", { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, "branchcode", - { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 }, + { data_type => "varchar", is_nullable => 1, size => 10 }, "categorycode", - { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 }, + { data_type => "varchar", is_nullable => 1, size => 10 }, "itemtype", - { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 }, + { data_type => "varchar", is_nullable => 1, size => 10 }, "rule_name", { data_type => "varchar", is_nullable => 0, size => 32 }, "rule_value", @@ -109,71 +106,9 @@ __PACKAGE__->set_primary_key("id"); __PACKAGE__->add_unique_constraint("branchcode_2", ["branchcode", "categorycode", "itemtype"]); -=head1 RELATIONS -=head2 branchcode - -Type: belongs_to - -Related object: L - -=cut - -__PACKAGE__->belongs_to( - "branchcode", - "Koha::Schema::Result::Branch", - { branchcode => "branchcode" }, - { - is_deferrable => 1, - join_type => "LEFT", - on_delete => "CASCADE", - on_update => "CASCADE", - }, -); - -=head2 categorycode - -Type: belongs_to - -Related object: L - -=cut - -__PACKAGE__->belongs_to( - "categorycode", - "Koha::Schema::Result::Category", - { categorycode => "categorycode" }, - { - is_deferrable => 1, - join_type => "LEFT", - on_delete => "CASCADE", - on_update => "CASCADE", - }, -); - -=head2 itemtype - -Type: belongs_to - -Related object: L - -=cut - -__PACKAGE__->belongs_to( - "itemtype", - "Koha::Schema::Result::Itemtype", - { itemtype => "itemtype" }, - { - is_deferrable => 1, - join_type => "LEFT", - on_delete => "CASCADE", - on_update => "CASCADE", - }, -); - - -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-06-28 04:08:15 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cp5jbv46L3LtPVxSla8dpA +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-07-03 15:35:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ok1AzADM8/wcfU9xS7LgNQ # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/DefaultBranchCircRule.pm b/Koha/Schema/Result/DefaultBranchCircRule.pm index 776b0e4b44..4517b629f0 100644 --- a/Koha/Schema/Result/DefaultBranchCircRule.pm +++ b/Koha/Schema/Result/DefaultBranchCircRule.pm @@ -30,16 +30,6 @@ __PACKAGE__->table("default_branch_circ_rules"); is_nullable: 0 size: 10 -=head2 maxissueqty - - data_type: 'integer' - is_nullable: 1 - -=head2 maxonsiteissueqty - - data_type: 'integer' - is_nullable: 1 - =head2 holdallowed data_type: 'tinyint' @@ -63,10 +53,6 @@ __PACKAGE__->table("default_branch_circ_rules"); __PACKAGE__->add_columns( "branchcode", { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 }, - "maxissueqty", - { data_type => "integer", is_nullable => 1 }, - "maxonsiteissueqty", - { data_type => "integer", is_nullable => 1 }, "holdallowed", { data_type => "tinyint", is_nullable => 1 }, "hold_fulfillment_policy", @@ -110,8 +96,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-04-29 10:32:00 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wnrxD1/tp8X01YHmys02lg +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-07-03 15:35:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wRSLGcTo92mEydJ3iBm1uA # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/DefaultCircRule.pm b/Koha/Schema/Result/DefaultCircRule.pm index 355f4ea385..a35840260f 100644 --- a/Koha/Schema/Result/DefaultCircRule.pm +++ b/Koha/Schema/Result/DefaultCircRule.pm @@ -30,16 +30,6 @@ __PACKAGE__->table("default_circ_rules"); extra: {list => ["singleton"]} is_nullable: 0 -=head2 maxissueqty - - data_type: 'integer' - is_nullable: 1 - -=head2 maxonsiteissueqty - - data_type: 'integer' - is_nullable: 1 - =head2 holdallowed data_type: 'integer' @@ -68,10 +58,6 @@ __PACKAGE__->add_columns( extra => { list => ["singleton"] }, is_nullable => 0, }, - "maxissueqty", - { data_type => "integer", is_nullable => 1 }, - "maxonsiteissueqty", - { data_type => "integer", is_nullable => 1 }, "holdallowed", { data_type => "integer", is_nullable => 1 }, "hold_fulfillment_policy", @@ -98,8 +84,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("singleton"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-04-29 10:32:00 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fqBrj0c9h9c0eBlC0kG51w +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-07-03 15:35:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mpcQmnxL15ai/pDKxxYmPw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm index 5958055104..3b862a0c17 100644 --- a/Koha/Schema/Result/Issuingrule.pm +++ b/Koha/Schema/Result/Issuingrule.pm @@ -103,16 +103,6 @@ __PACKAGE__->table("issuingrules"); is_nullable: 1 size: 100 -=head2 maxissueqty - - data_type: 'integer' - is_nullable: 1 - -=head2 maxonsiteissueqty - - data_type: 'integer' - is_nullable: 1 - =head2 issuelength data_type: 'integer' @@ -252,10 +242,6 @@ __PACKAGE__->add_columns( { data_type => "integer", is_nullable => 1 }, "chargename", { data_type => "varchar", is_nullable => 1, size => 100 }, - "maxissueqty", - { data_type => "integer", is_nullable => 1 }, - "maxonsiteissueqty", - { data_type => "integer", is_nullable => 1 }, "issuelength", { data_type => "integer", is_nullable => 1 }, "lengthunit", @@ -321,8 +307,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("branchcode", "categorycode", "itemtype"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-12-13 12:44:30 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VBD8atc/D/6rN0D+aTaSOQ +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-07-03 15:35:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dxv4gdxTEP+dd6MY0Y/lcw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/Itemtype.pm b/Koha/Schema/Result/Itemtype.pm index 95ff7af580..0e36247b50 100644 --- a/Koha/Schema/Result/Itemtype.pm +++ b/Koha/Schema/Result/Itemtype.pm @@ -165,21 +165,6 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); -=head2 circulation_rules - -Type: has_many - -Related object: L - -=cut - -__PACKAGE__->has_many( - "circulation_rules", - "Koha::Schema::Result::CirculationRule", - { "foreign.itemtype" => "self.itemtype" }, - { cascade_copy => 0, cascade_delete => 0 }, -); - =head2 default_branch_item_rule Type: might_have -- 2.11.0