Bugzilla – Attachment 65242 Details for
Bug 18928
Move `holdallowed`, `hold_fulfillment_policy` and `returnbranch` into the `circulation_rules` table.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18928 - Remove schema files for deleted tables
Bug-18928---Remove-schema-files-for-deleted-tables.patch (text/plain), 9.57 KB, created by
Kyle M Hall (khall)
on 2017-07-25 15:28:35 UTC
(
hide
)
Description:
Bug 18928 - Remove schema files for deleted tables
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2017-07-25 15:28:35 UTC
Size:
9.57 KB
patch
obsolete
>From c57b960d9e61db72121ea88f0d14a811b74fbb49 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 11 Jul 2017 14:30:00 -0400 >Subject: [PATCH] Bug 18928 - Remove schema files for deleted tables > >--- > Koha/Schema/Result/BranchItemRule.pm | 130 ---------------------------- > Koha/Schema/Result/DefaultBranchCircRule.pm | 104 ---------------------- > Koha/Schema/Result/DefaultBranchItemRule.pm | 104 ---------------------- > Koha/Schema/Result/DefaultCircRule.pm | 92 -------------------- > 4 files changed, 430 deletions(-) > delete mode 100644 Koha/Schema/Result/BranchItemRule.pm > delete mode 100644 Koha/Schema/Result/DefaultBranchCircRule.pm > delete mode 100644 Koha/Schema/Result/DefaultBranchItemRule.pm > delete mode 100644 Koha/Schema/Result/DefaultCircRule.pm > >diff --git a/Koha/Schema/Result/BranchItemRule.pm b/Koha/Schema/Result/BranchItemRule.pm >deleted file mode 100644 >index dafd57a..0000000 >--- a/Koha/Schema/Result/BranchItemRule.pm >+++ /dev/null >@@ -1,130 +0,0 @@ >-use utf8; >-package Koha::Schema::Result::BranchItemRule; >- >-# Created by DBIx::Class::Schema::Loader >-# DO NOT MODIFY THE FIRST PART OF THIS FILE >- >-=head1 NAME >- >-Koha::Schema::Result::BranchItemRule >- >-=cut >- >-use strict; >-use warnings; >- >-use base 'DBIx::Class::Core'; >- >-=head1 TABLE: C<branch_item_rules> >- >-=cut >- >-__PACKAGE__->table("branch_item_rules"); >- >-=head1 ACCESSORS >- >-=head2 branchcode >- >- data_type: 'varchar' >- is_foreign_key: 1 >- is_nullable: 0 >- size: 10 >- >-=head2 itemtype >- >- data_type: 'varchar' >- is_foreign_key: 1 >- is_nullable: 0 >- size: 10 >- >-=head2 holdallowed >- >- data_type: 'tinyint' >- is_nullable: 1 >- >-=head2 hold_fulfillment_policy >- >- data_type: 'enum' >- default_value: 'any' >- extra: {list => ["any","homebranch","holdingbranch"]} >- is_nullable: 0 >- >-=head2 returnbranch >- >- data_type: 'varchar' >- is_nullable: 1 >- size: 15 >- >-=cut >- >-__PACKAGE__->add_columns( >- "branchcode", >- { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 }, >- "itemtype", >- { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 }, >- "holdallowed", >- { data_type => "tinyint", is_nullable => 1 }, >- "hold_fulfillment_policy", >- { >- data_type => "enum", >- default_value => "any", >- extra => { list => ["any", "homebranch", "holdingbranch"] }, >- is_nullable => 0, >- }, >- "returnbranch", >- { data_type => "varchar", is_nullable => 1, size => 15 }, >-); >- >-=head1 PRIMARY KEY >- >-=over 4 >- >-=item * L</itemtype> >- >-=item * L</branchcode> >- >-=back >- >-=cut >- >-__PACKAGE__->set_primary_key("itemtype", "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 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, on_delete => "CASCADE", on_update => "CASCADE" }, >-); >- >- >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-04-29 10:32:00 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yMmvhDqtrKcNeDU9ZJCQZw >- >- >-# 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 >deleted file mode 100644 >index 4517b62..0000000 >--- a/Koha/Schema/Result/DefaultBranchCircRule.pm >+++ /dev/null >@@ -1,104 +0,0 @@ >-use utf8; >-package Koha::Schema::Result::DefaultBranchCircRule; >- >-# Created by DBIx::Class::Schema::Loader >-# DO NOT MODIFY THE FIRST PART OF THIS FILE >- >-=head1 NAME >- >-Koha::Schema::Result::DefaultBranchCircRule >- >-=cut >- >-use strict; >-use warnings; >- >-use base 'DBIx::Class::Core'; >- >-=head1 TABLE: C<default_branch_circ_rules> >- >-=cut >- >-__PACKAGE__->table("default_branch_circ_rules"); >- >-=head1 ACCESSORS >- >-=head2 branchcode >- >- data_type: 'varchar' >- is_foreign_key: 1 >- is_nullable: 0 >- size: 10 >- >-=head2 holdallowed >- >- data_type: 'tinyint' >- is_nullable: 1 >- >-=head2 hold_fulfillment_policy >- >- data_type: 'enum' >- default_value: 'any' >- extra: {list => ["any","homebranch","holdingbranch"]} >- is_nullable: 0 >- >-=head2 returnbranch >- >- data_type: 'varchar' >- is_nullable: 1 >- size: 15 >- >-=cut >- >-__PACKAGE__->add_columns( >- "branchcode", >- { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 }, >- "holdallowed", >- { data_type => "tinyint", is_nullable => 1 }, >- "hold_fulfillment_policy", >- { >- data_type => "enum", >- default_value => "any", >- extra => { list => ["any", "homebranch", "holdingbranch"] }, >- is_nullable => 0, >- }, >- "returnbranch", >- { data_type => "varchar", is_nullable => 1, size => 15 }, >-); >- >-=head1 PRIMARY KEY >- >-=over 4 >- >-=item * L</branchcode> >- >-=back >- >-=cut >- >-__PACKAGE__->set_primary_key("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" }, >-); >- >- >-# 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 >-1; >diff --git a/Koha/Schema/Result/DefaultBranchItemRule.pm b/Koha/Schema/Result/DefaultBranchItemRule.pm >deleted file mode 100644 >index 613df29..0000000 >--- a/Koha/Schema/Result/DefaultBranchItemRule.pm >+++ /dev/null >@@ -1,104 +0,0 @@ >-use utf8; >-package Koha::Schema::Result::DefaultBranchItemRule; >- >-# Created by DBIx::Class::Schema::Loader >-# DO NOT MODIFY THE FIRST PART OF THIS FILE >- >-=head1 NAME >- >-Koha::Schema::Result::DefaultBranchItemRule >- >-=cut >- >-use strict; >-use warnings; >- >-use base 'DBIx::Class::Core'; >- >-=head1 TABLE: C<default_branch_item_rules> >- >-=cut >- >-__PACKAGE__->table("default_branch_item_rules"); >- >-=head1 ACCESSORS >- >-=head2 itemtype >- >- data_type: 'varchar' >- is_foreign_key: 1 >- is_nullable: 0 >- size: 10 >- >-=head2 holdallowed >- >- data_type: 'tinyint' >- is_nullable: 1 >- >-=head2 hold_fulfillment_policy >- >- data_type: 'enum' >- default_value: 'any' >- extra: {list => ["any","homebranch","holdingbranch"]} >- is_nullable: 0 >- >-=head2 returnbranch >- >- data_type: 'varchar' >- is_nullable: 1 >- size: 15 >- >-=cut >- >-__PACKAGE__->add_columns( >- "itemtype", >- { data_type => "varchar", is_foreign_key => 1, is_nullable => 0, size => 10 }, >- "holdallowed", >- { data_type => "tinyint", is_nullable => 1 }, >- "hold_fulfillment_policy", >- { >- data_type => "enum", >- default_value => "any", >- extra => { list => ["any", "homebranch", "holdingbranch"] }, >- is_nullable => 0, >- }, >- "returnbranch", >- { data_type => "varchar", is_nullable => 1, size => 15 }, >-); >- >-=head1 PRIMARY KEY >- >-=over 4 >- >-=item * L</itemtype> >- >-=back >- >-=cut >- >-__PACKAGE__->set_primary_key("itemtype"); >- >-=head1 RELATIONS >- >-=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, on_delete => "CASCADE", on_update => "CASCADE" }, >-); >- >- >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-04-29 10:32:00 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+dEOJjQezQNGILloXC2HfQ >- >- >-# You can replace this text with custom content, and it will be preserved on regeneration >-1; >diff --git a/Koha/Schema/Result/DefaultCircRule.pm b/Koha/Schema/Result/DefaultCircRule.pm >deleted file mode 100644 >index a358402..0000000 >--- a/Koha/Schema/Result/DefaultCircRule.pm >+++ /dev/null >@@ -1,92 +0,0 @@ >-use utf8; >-package Koha::Schema::Result::DefaultCircRule; >- >-# Created by DBIx::Class::Schema::Loader >-# DO NOT MODIFY THE FIRST PART OF THIS FILE >- >-=head1 NAME >- >-Koha::Schema::Result::DefaultCircRule >- >-=cut >- >-use strict; >-use warnings; >- >-use base 'DBIx::Class::Core'; >- >-=head1 TABLE: C<default_circ_rules> >- >-=cut >- >-__PACKAGE__->table("default_circ_rules"); >- >-=head1 ACCESSORS >- >-=head2 singleton >- >- data_type: 'enum' >- default_value: 'singleton' >- extra: {list => ["singleton"]} >- is_nullable: 0 >- >-=head2 holdallowed >- >- data_type: 'integer' >- is_nullable: 1 >- >-=head2 hold_fulfillment_policy >- >- data_type: 'enum' >- default_value: 'any' >- extra: {list => ["any","homebranch","holdingbranch"]} >- is_nullable: 0 >- >-=head2 returnbranch >- >- data_type: 'varchar' >- is_nullable: 1 >- size: 15 >- >-=cut >- >-__PACKAGE__->add_columns( >- "singleton", >- { >- data_type => "enum", >- default_value => "singleton", >- extra => { list => ["singleton"] }, >- is_nullable => 0, >- }, >- "holdallowed", >- { data_type => "integer", is_nullable => 1 }, >- "hold_fulfillment_policy", >- { >- data_type => "enum", >- default_value => "any", >- extra => { list => ["any", "homebranch", "holdingbranch"] }, >- is_nullable => 0, >- }, >- "returnbranch", >- { data_type => "varchar", is_nullable => 1, size => 15 }, >-); >- >-=head1 PRIMARY KEY >- >-=over 4 >- >-=item * L</singleton> >- >-=back >- >-=cut >- >-__PACKAGE__->set_primary_key("singleton"); >- >- >-# 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 >-1; >-- >2.10.2
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 18928
:
65241
|
65242
|
71005
|
71006
|
81096
|
81097
|
81098
|
81099
|
82933
|
82934
|
82935
|
82936
|
85487
|
85488
|
85489
|
85490
|
85491
|
86134
|
86135
|
86136
|
86137
|
86138
|
86139
|
88659
|
89017
|
89018
|
89019
|
89020
|
89021
|
89022
|
89023
|
89024
|
89333
|
89334
|
89336
|
89338
|
89339
|
89340
|
89341
|
89342
|
89343
|
89344
|
89345
|
89346
|
89347
|
89348
|
89349
|
89377
|
89402
|
89427
|
89428
|
89429
|
89430
|
89431
|
89432
|
89433
|
89434
|
89435
|
89436
|
89437
|
89438
|
89440
|
89441
|
89442
|
89443
|
89444
|
89445
|
89446
|
89447
|
89448
|
89449
|
89450
|
89451
|
89628
|
89629
|
89630
|
89631
|
89632
|
89633
|
89634
|
89635
|
89636
|
89637
|
89638
|
90501
|
91082
|
91083
|
91084
|
91085
|
91086
|
91087
|
91088
|
91089
|
91090
|
91091
|
91092
|
91093
|
91094