Attachment 82935 Details for Bug 18928 – Bug 18928: Update schema files

[patch] Bug 18928: Update schema files

Bug-18928-Update-schema-files.patch (text/plain), 12.72 KB, created by Jonathan Druart on 2018-12-06 18:51:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-12-06 18:51:24 UTC

Size: 12.72 KB

patch

obsolete

>From 0248645305fdc2c21ade2c5732344e311e7395cc Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 6 Dec 2018 15:31:35 -0300
>Subject: [PATCH] Bug 18928: Update schema files
>
>---
> Koha/Schema/Result/Branch.pm                |  34 +-------
> Koha/Schema/Result/BranchItemRule.pm        | 130 ----------------------------
> Koha/Schema/Result/DefaultBranchCircRule.pm | 104 ----------------------
> Koha/Schema/Result/DefaultBranchItemRule.pm | 104 ----------------------
> Koha/Schema/Result/DefaultCircRule.pm       |  92 --------------------
> Koha/Schema/Result/Itemtype.pm              |  34 +-------
> 6 files changed, 4 insertions(+), 494 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/Branch.pm b/Koha/Schema/Result/Branch.pm
>index 903e682cf1..84cc755d2d 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_item_rules
>-
>-Type: has_many
>-
>-Related object: L<Koha::Schema::Result::BranchItemRule>
>-
>-=cut
>-
>-__PACKAGE__->has_many(
>-  "branch_item_rules",
>-  "Koha::Schema::Result::BranchItemRule",
>-  { "foreign.branchcode" => "self.branchcode" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>-);
>-
> =head2 branches_overdrive
> 
> Type: might_have
>@@ -466,21 +451,6 @@ __PACKAGE__->has_many(
>   { cascade_copy => 0, cascade_delete => 0 },
> );
> 
>-=head2 default_branch_circ_rule
>-
>-Type: might_have
>-
>-Related object: L<Koha::Schema::Result::DefaultBranchCircRule>
>-
>-=cut
>-
>-__PACKAGE__->might_have(
>-  "default_branch_circ_rule",
>-  "Koha::Schema::Result::DefaultBranchCircRule",
>-  { "foreign.branchcode" => "self.branchcode" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>-);
>-
> =head2 edifact_eans
> 
> Type: has_many
>@@ -647,8 +617,8 @@ __PACKAGE__->has_many(
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-12-06 15:22:30
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:y6GFWRKodrYvhKbHKt1W4w
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-12-06 15:28:54
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bnqgMA3GZz2n/mrpLyQFVg
> 
> 
> # You can replace this text with custom code or comments, and it will be preserved on regeneration
>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<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 a5aac44443..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<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 @ 2018-12-06 15:22:30
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:c82nLHhC2nHg71Ko09+8Ig
>-
>-
>-# 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<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 56d3d52a0a..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<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 @ 2018-12-06 15:22:30
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Evgaod0Xff86V1frQ3y6kw
>-
>-
>-# You can replace this text with custom content, and it will be preserved on regeneration
>-1;
>diff --git a/Koha/Schema/Result/Itemtype.pm b/Koha/Schema/Result/Itemtype.pm
>index fdd507da6c..79f4c93aec 100644
>--- a/Koha/Schema/Result/Itemtype.pm
>+++ b/Koha/Schema/Result/Itemtype.pm
>@@ -150,21 +150,6 @@ __PACKAGE__->set_primary_key("itemtype");
> 
> =head1 RELATIONS
> 
>-=head2 branch_item_rules
>-
>-Type: has_many
>-
>-Related object: L<Koha::Schema::Result::BranchItemRule>
>-
>-=cut
>-
>-__PACKAGE__->has_many(
>-  "branch_item_rules",
>-  "Koha::Schema::Result::BranchItemRule",
>-  { "foreign.itemtype" => "self.itemtype" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>-);
>-
> =head2 circulation_rules
> 
> Type: has_many
>@@ -180,21 +165,6 @@ __PACKAGE__->has_many(
>   { cascade_copy => 0, cascade_delete => 0 },
> );
> 
>-=head2 default_branch_item_rule
>-
>-Type: might_have
>-
>-Related object: L<Koha::Schema::Result::DefaultBranchItemRule>
>-
>-=cut
>-
>-__PACKAGE__->might_have(
>-  "default_branch_item_rule",
>-  "Koha::Schema::Result::DefaultBranchItemRule",
>-  { "foreign.itemtype" => "self.itemtype" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>-);
>-
> =head2 old_reserves
> 
> Type: has_many
>@@ -226,8 +196,8 @@ __PACKAGE__->has_many(
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-10-05 14:29:17
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GthTVMBLO5Zi6NU3up3m+A
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-12-06 15:28:54
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/cDUDt1Gi6qs9LNWFj4WYQ
> 
> # Use the ItemtypeLocalization view to create the join on localization
> our $LANGUAGE;
>-- 
>2.11.0

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