From d0c2138c8c71309cdeb5011f0a5e1263ff202cef Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 28 Jun 2019 14:50:26 +0000 Subject: [PATCH] Bug 18928: (QA follow-up) Remove DBIC files and reference to DefaultCircRule Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize --- Koha/Schema/Result/BranchItemRule.pm | 130 -------------------- Koha/Schema/Result/DefaultBranchCircRule.pm | 104 ---------------- Koha/Schema/Result/DefaultBranchItemRule.pm | 104 ---------------- Koha/Schema/Result/DefaultCircRule.pm | 92 -------------- t/db_dependent/TestBuilder.t | 2 - 5 files changed, 432 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 dafd57a45d..0000000000 --- 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 - -=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 - -=item * L - -=back - -=cut - -__PACKAGE__->set_primary_key("itemtype", "branchcode"); - -=head1 RELATIONS - -=head2 branchcode - -Type: belongs_to - -Related object: L - -=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 - -=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 e3bb1288a6..0000000000 --- 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 - -=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 - -=back - -=cut - -__PACKAGE__->set_primary_key("branchcode"); - -=head1 RELATIONS - -=head2 branchcode - -Type: belongs_to - -Related object: L - -=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.07046 @ 2019-03-05 20:42:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SYfKl5LgCoDZVhPooF55SA - - -# 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 613df29f1e..0000000000 --- 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 - -=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 - -=back - -=cut - -__PACKAGE__->set_primary_key("itemtype"); - -=head1 RELATIONS - -=head2 itemtype - -Type: belongs_to - -Related object: L - -=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 4d34b1ced1..0000000000 --- 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 - -=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 - -=back - -=cut - -__PACKAGE__->set_primary_key("singleton"); - - -# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-03-05 20:42:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mrebGRlc4MORi6OtUk8NyA - - -# You can replace this text with custom content, and it will be preserved on regeneration -1; diff --git a/t/db_dependent/TestBuilder.t b/t/db_dependent/TestBuilder.t index 3fb431da9f..30ce677077 100644 --- a/t/db_dependent/TestBuilder.t +++ b/t/db_dependent/TestBuilder.t @@ -34,8 +34,6 @@ our $schema = Koha::Database->new->schema; $schema->storage->txn_begin; our $builder; -$schema->resultset('DefaultCircRule')->delete; # Is a singleton table - subtest 'Start with some trivial tests' => sub { plan tests => 7; -- 2.39.5