Bugzilla – Attachment 79773 Details for
Bug 18887
Introduce new table 'circulation_rules', use for 'max_holds' rules
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18887: Update existing schema files
Bug-18887-Update-existing-schema-files.patch (text/plain), 6.05 KB, created by
Josef Moravec
on 2018-10-01 19:35:59 UTC
(
hide
)
Description:
Bug 18887: Update existing schema files
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2018-10-01 19:35:59 UTC
Size:
6.05 KB
patch
obsolete
>From b47f2db4080c8a7f43baad3cc3050bde89cd27ad Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Sat, 29 Sep 2018 17:32:57 -0300 >Subject: [PATCH] Bug 18887: Update existing schema files > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > Koha/Schema/Result/Branch.pm | 19 +++++++++++++++++-- > Koha/Schema/Result/BranchBorrowerCircRule.pm | 11 ++--------- > Koha/Schema/Result/Category.pm | 19 +++++++++++++++++-- > Koha/Schema/Result/DefaultBorrowerCircRule.pm | 11 ++--------- > Koha/Schema/Result/Itemtype.pm | 19 +++++++++++++++++-- > 5 files changed, 55 insertions(+), 24 deletions(-) > >diff --git a/Koha/Schema/Result/Branch.pm b/Koha/Schema/Result/Branch.pm >index b85094b..c3e471b 100644 >--- a/Koha/Schema/Result/Branch.pm >+++ b/Koha/Schema/Result/Branch.pm >@@ -361,6 +361,21 @@ __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 >@@ -617,8 +632,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-06 16:28:49 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:N0tdcSAb4bMht/i0chipYQ >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-29 17:29:04 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TdCV8mkKeahtG+DifEIH5A > > > # 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 >index be6cd45..c56cfe7 100644 >--- a/Koha/Schema/Result/BranchBorrowerCircRule.pm >+++ b/Koha/Schema/Result/BranchBorrowerCircRule.pm >@@ -47,11 +47,6 @@ __PACKAGE__->table("branch_borrower_circ_rules"); > data_type: 'integer' > is_nullable: 1 > >-=head2 max_holds >- >- data_type: 'integer' >- is_nullable: 1 >- > =cut > > __PACKAGE__->add_columns( >@@ -63,8 +58,6 @@ __PACKAGE__->add_columns( > { data_type => "integer", is_nullable => 1 }, > "maxonsiteissueqty", > { data_type => "integer", is_nullable => 1 }, >- "max_holds", >- { data_type => "integer", is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -114,8 +107,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-08-25 15:10:08 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lgs8B3omV3Au570af/VF2g >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-29 17:29:04 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+MNZAKqU6GDK/Bslt9cR4g > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Category.pm b/Koha/Schema/Result/Category.pm >index 42865a8..9cd2caa 100644 >--- a/Koha/Schema/Result/Category.pm >+++ b/Koha/Schema/Result/Category.pm >@@ -251,6 +251,21 @@ __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 >@@ -267,8 +282,8 @@ __PACKAGE__->might_have( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TGAiiFICSjlKNvnfa87kFQ >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-29 17:29:04 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:I3VQpfQsul8S/g9DZJrCLA > > > # 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 >index 407b911..2672647 100644 >--- a/Koha/Schema/Result/DefaultBorrowerCircRule.pm >+++ b/Koha/Schema/Result/DefaultBorrowerCircRule.pm >@@ -40,11 +40,6 @@ __PACKAGE__->table("default_borrower_circ_rules"); > data_type: 'integer' > is_nullable: 1 > >-=head2 max_holds >- >- data_type: 'integer' >- is_nullable: 1 >- > =cut > > __PACKAGE__->add_columns( >@@ -54,8 +49,6 @@ __PACKAGE__->add_columns( > { data_type => "integer", is_nullable => 1 }, > "maxonsiteissueqty", > { data_type => "integer", is_nullable => 1 }, >- "max_holds", >- { data_type => "integer", is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -88,8 +81,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-08-25 15:10:09 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hv9wFvd5mb8Ch7RPCZynoA >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-29 17:29:04 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:R0Yg31SdKMhs7wUyetMtTA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Itemtype.pm b/Koha/Schema/Result/Itemtype.pm >index 0e36247..2a30614 100644 >--- a/Koha/Schema/Result/Itemtype.pm >+++ b/Koha/Schema/Result/Itemtype.pm >@@ -165,6 +165,21 @@ __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 >@@ -211,8 +226,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:54 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cNP7/nYGdVeKZ8L7sp1+FQ >+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-29 17:29:04 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OpZLneGL0vjLu3LRPJPCWw > > # Use the ItemtypeLocalization view to create the join on localization > our $LANGUAGE; >-- >2.1.4
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 18887
:
65233
|
65234
|
65235
|
65236
|
65237
|
67620
|
70986
|
70987
|
70988
|
70989
|
70990
|
70991
|
71031
|
71042
|
72218
|
72219
|
72220
|
72221
|
72222
|
72223
|
72224
|
77080
|
77081
|
77082
|
77083
|
77084
|
77085
|
77086
|
77087
|
77207
|
77208
|
77209
|
77210
|
77211
|
77212
|
77213
|
77214
|
77215
|
77218
|
77238
|
77649
|
77650
|
77651
|
77652
|
77653
|
77654
|
77655
|
77656
|
77657
|
77658
|
77659
|
78346
|
78347
|
78348
|
78349
|
78350
|
78351
|
78352
|
78353
|
78354
|
78355
|
78356
|
78674
|
78675
|
78676
|
78677
|
78678
|
78679
|
78680
|
78681
|
78682
|
78683
|
78684
|
78743
|
78744
|
78745
|
78746
|
78747
|
78748
|
78749
|
78750
|
78751
|
78752
|
78753
|
78879
|
79119
|
79626
|
79627
|
79628
|
79629
|
79630
|
79631
|
79632
|
79633
|
79634
|
79635
|
79636
|
79637
|
79638
|
79639
|
79640
|
79641
|
79761
|
79762
|
79763
|
79764
|
79765
|
79766
|
79767
|
79768
|
79769
|
79770
|
79771
|
79772
| 79773 |
79774
|
79775
|
79776
|
79778
|
79891