Bugzilla – Attachment 72226 Details for
Bug 18925
Move maxissueqty and maxonsiteissueqty to circulation_rules
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18925: Update schema files
Bug-18925-Update-schema-files.patch (text/plain), 10.81 KB, created by
Jesse Weaver
on 2018-02-26 18:29:49 UTC
(
hide
)
Description:
Bug 18925: Update schema files
Filename:
MIME Type:
Creator:
Jesse Weaver
Created:
2018-02-26 18:29:49 UTC
Size:
10.81 KB
patch
obsolete
>From c80521d86fec0651cb6bbe740b66d18e7504bc9e Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >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 649ac9c43a..91ec691c92 100644 >--- a/Koha/Schema/Result/Branch.pm >+++ b/Koha/Schema/Result/Branch.pm >@@ -278,21 +278,6 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >-=head2 branch_borrower_circ_rules >- >-Type: has_many >- >-Related object: L<Koha::Schema::Result::BranchBorrowerCircRule> >- >-=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 >@@ -353,21 +338,6 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >-=head2 circulation_rules >- >-Type: has_many >- >-Related object: L<Koha::Schema::Result::CirculationRule> >- >-=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<Koha::Schema::Result::BranchBorrowerCircRule> >- >-=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<Koha::Schema::Result::CirculationRule> >- >-=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<Koha::Schema::Result::DefaultBorrowerCircRule> >- >-=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<Koha::Schema::Result::Branch> >- >-=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<Koha::Schema::Result::Category> >- >-=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<Koha::Schema::Result::Itemtype> >- >-=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 0ea74ca2ac..b1abf36646 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 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<Koha::Schema::Result::CirculationRule> >- >-=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.15.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18925
:
65238
|
65239
|
65240
|
67024
|
67025
|
67026
|
67621
|
70992
|
70993
|
70994
|
70995
|
70996
|
71032
|
71033
|
71043
|
71044
|
71045
|
71046
|
71047
|
72225
|
72226
|
72227
|
72228
|
72229
|
77225
|
77226
|
77227
|
77228
|
77229
|
78881
|
78882
|
78883
|
78884
|
78885
|
78886
|
79642
|
79643
|
79644
|
79645
|
79646
|
81091
|
81092
|
81093
|
81094
|
81095
|
82927
|
82928
|
82929
|
82930
|
82931
|
85480
|
85481
|
85482
|
85483
|
85484
|
85485
|
85486
|
85939
|
85940
|
85941
|
85942
|
85943
|
85944
|
85945
|
85946
|
85947
|
85948
|
85949
|
85950
|
85951
|
85953
|
85954
|
85955
|
85956
|
85957
|
85958
|
85959
|
85960
|
85961
|
85962
|
85963
|
85964
|
85965
|
86068
|
86069
|
86070
|
86071
|
86072
|
86073
|
86074
|
86075
|
86076
|
86077
|
86078
|
86079
|
86080
|
86081
|
86121
|
86165
|
86206
|
86207