Bug 18928: (QA follow-up) Remove DBIC files and reference to DefaultCircRule

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/Koha/Schema/Result/BranchItemRule.pm b/Koha/Schema/Result/BranchItemRule.pm
deleted file mode 100644 (file)
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 (file)
index e3bb128..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.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 (file)
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 (file)
index 4d34b1c..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.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 3fb431d..30ce677 100644 (file)
--- 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;