Bugzilla – Attachment 81095 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), 11.62 KB, created by
Jonathan Druart
on 2018-10-24 21:46:55 UTC
(
hide
)
Description:
Bug 18925: Update schema files
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-10-24 21:46:55 UTC
Size:
11.62 KB
patch
obsolete
>From b8f28fd5a1a43001cbe7aae4ae4d8c70f1ca816d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 24 Oct 2018 18:44:20 -0300 >Subject: [PATCH] Bug 18925: Update schema files > >--- > Koha/Schema/Result/Branch.pm | 19 +---- > Koha/Schema/Result/BranchBorrowerCircRule.pm | 115 -------------------------- > Koha/Schema/Result/Category.pm | 34 +------- > Koha/Schema/Result/DefaultBorrowerCircRule.pm | 89 -------------------- > Koha/Schema/Result/DefaultBranchCircRule.pm | 18 +--- > Koha/Schema/Result/DefaultCircRule.pm | 18 +--- > Koha/Schema/Result/Issuingrule.pm | 18 +--- > 7 files changed, 10 insertions(+), 301 deletions(-) > delete mode 100644 Koha/Schema/Result/BranchBorrowerCircRule.pm > delete mode 100644 Koha/Schema/Result/DefaultBorrowerCircRule.pm > >diff --git a/Koha/Schema/Result/Branch.pm b/Koha/Schema/Result/Branch.pm >index 13fe183742..aaa86b31d0 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<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 >@@ -662,8 +647,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-09 15:50:42 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0yMUX1UukdV7eMol06JXTQ >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-24 18:41:53 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:o0myF639+/gC6s8RJelPZA > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/BranchBorrowerCircRule.pm b/Koha/Schema/Result/BranchBorrowerCircRule.pm >deleted file mode 100644 >index 60b02f093a..0000000000 >--- a/Koha/Schema/Result/BranchBorrowerCircRule.pm >+++ /dev/null >@@ -1,115 +0,0 @@ >-use utf8; >-package Koha::Schema::Result::BranchBorrowerCircRule; >- >-# Created by DBIx::Class::Schema::Loader >-# DO NOT MODIFY THE FIRST PART OF THIS FILE >- >-=head1 NAME >- >-Koha::Schema::Result::BranchBorrowerCircRule >- >-=cut >- >-use strict; >-use warnings; >- >-use base 'DBIx::Class::Core'; >- >-=head1 TABLE: C<branch_borrower_circ_rules> >- >-=cut >- >-__PACKAGE__->table("branch_borrower_circ_rules"); >- >-=head1 ACCESSORS >- >-=head2 branchcode >- >- data_type: 'varchar' >- is_foreign_key: 1 >- is_nullable: 0 >- size: 10 >- >-=head2 categorycode >- >- data_type: 'varchar' >- is_foreign_key: 1 >- is_nullable: 0 >- size: 10 >- >-=head2 maxissueqty >- >- data_type: 'integer' >- is_nullable: 1 >- >-=head2 maxonsiteissueqty >- >- data_type: 'integer' >- is_nullable: 1 >- >-=cut >- >-__PACKAGE__->add_columns( >- "branchcode", >- { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 }, >- "categorycode", >- { 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 }, >-); >- >-=head1 PRIMARY KEY >- >-=over 4 >- >-=item * L</categorycode> >- >-=item * L</branchcode> >- >-=back >- >-=cut >- >-__PACKAGE__->set_primary_key("categorycode", "branchcode"); >- >-=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, 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, on_delete => "CASCADE", on_update => "CASCADE" }, >-); >- >- >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-05 14:29:17 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3PTe8JIjkpfp2+I/2wCVmg >- >- >-# You can replace this text with custom content, and it will be preserved on regeneration >-1; >diff --git a/Koha/Schema/Result/Category.pm b/Koha/Schema/Result/Category.pm >index 1b61c33957..79401143a0 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 >@@ -266,24 +251,9 @@ __PACKAGE__->has_many( > { 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-10-05 14:29:17 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yvHcgnSv1RXNMXJixVtt0Q >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-24 18:41:53 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kFuRydfRxeaCiOSMbDja2w > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/DefaultBorrowerCircRule.pm b/Koha/Schema/Result/DefaultBorrowerCircRule.pm >deleted file mode 100644 >index 72f36a9888..0000000000 >--- a/Koha/Schema/Result/DefaultBorrowerCircRule.pm >+++ /dev/null >@@ -1,89 +0,0 @@ >-use utf8; >-package Koha::Schema::Result::DefaultBorrowerCircRule; >- >-# Created by DBIx::Class::Schema::Loader >-# DO NOT MODIFY THE FIRST PART OF THIS FILE >- >-=head1 NAME >- >-Koha::Schema::Result::DefaultBorrowerCircRule >- >-=cut >- >-use strict; >-use warnings; >- >-use base 'DBIx::Class::Core'; >- >-=head1 TABLE: C<default_borrower_circ_rules> >- >-=cut >- >-__PACKAGE__->table("default_borrower_circ_rules"); >- >-=head1 ACCESSORS >- >-=head2 categorycode >- >- data_type: 'varchar' >- is_foreign_key: 1 >- is_nullable: 0 >- size: 10 >- >-=head2 maxissueqty >- >- data_type: 'integer' >- is_nullable: 1 >- >-=head2 maxonsiteissueqty >- >- data_type: 'integer' >- is_nullable: 1 >- >-=cut >- >-__PACKAGE__->add_columns( >- "categorycode", >- { 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 }, >-); >- >-=head1 PRIMARY KEY >- >-=over 4 >- >-=item * L</categorycode> >- >-=back >- >-=cut >- >-__PACKAGE__->set_primary_key("categorycode"); >- >-=head1 RELATIONS >- >-=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, on_delete => "CASCADE", on_update => "CASCADE" }, >-); >- >- >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-05 14:29:17 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PIjw7tbrnnAgXDlxiX9cpA >- >- >-# You can replace this text with custom content, and it will be preserved on regeneration >-1; >diff --git a/Koha/Schema/Result/DefaultBranchCircRule.pm b/Koha/Schema/Result/DefaultBranchCircRule.pm >index 776b0e4b44..b8bcafde28 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 @ 2018-10-24 18:41:53 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hJNvqkx/tnAqsHshueA0/g > > > # 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..10fdc2e34a 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 @ 2018-10-24 18:41:53 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0DTfebQpLIxs4UErF/FW1g > > > # 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 f1470b9899..e1c3403d05 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' >@@ -257,10 +247,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", >@@ -328,8 +314,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("branchcode", "categorycode", "itemtype"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-24 13:17:50 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hVIiAIZ5ui3ZhLhuVxCzZg >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-24 18:41:53 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AOBQ9pUQYn13Gva1RT8iYA > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >-- >2.11.0
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