From 3c7e89cfbd70adf0be87c2e2d713399da0b397e1 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 | 34 +------------ Koha/Schema/Result/Category.pm | 49 +------------------ 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 | 19 +------- 7 files changed, 17 insertions(+), 214 deletions(-) diff --git a/Koha/Schema/Result/Branch.pm b/Koha/Schema/Result/Branch.pm index 7bd8ee6..d21bd79 100644 --- a/Koha/Schema/Result/Branch.pm +++ b/Koha/Schema/Result/Branch.pm @@ -270,21 +270,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 @@ -360,21 +345,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 @@ -611,8 +581,8 @@ Composing rels: L -> categorycode __PACKAGE__->many_to_many("categorycodes", "branchrelations", "categorycode"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-06-28 04:08:15 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gRtifDOxndV9CLNpFr0XpQ +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-07-03 15:35:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9z/UhS1n8kZ2OEvevR8KZg # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/Category.pm b/Koha/Schema/Result/Category.pm index 6a973df..7bae955 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,39 +236,9 @@ __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 @ 2017-06-28 04:08:15 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Bb9BvkU4r6/J8rD9z2sDrA +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-07-03 15:35:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Nyb7RzCc6y0W0izWTjksoA # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/CirculationRule.pm b/Koha/Schema/Result/CirculationRule.pm index 6e7141f..360854c 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 776b0e4..4517b62 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 355f4ea..a358402 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 0ea74ca..b1abf36 100644 --- a/Koha/Schema/Result/Issuingrule.pm +++ b/Koha/Schema/Result/Issuingrule.pm @@ -97,16 +97,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' @@ -244,10 +234,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", @@ -313,8 +299,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("branchcode", "categorycode", "itemtype"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-04-27 19:15:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:D1443VWPcoIXN3+lIkckIQ +# 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 df616e4..1c2f379 100644 --- a/Koha/Schema/Result/Itemtype.pm +++ b/Koha/Schema/Result/Itemtype.pm @@ -149,21 +149,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 @@ -210,8 +195,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-06-28 04:08:15 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7o86hHDFdmHShwhJ/iIzew +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-07-03 15:35:15 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tXTiZk4HKLEBWm/tBXJ9Dw # Use the ItemtypeLocalization view to create the join on localization our $LANGUAGE; -- 2.10.2