Attachment 101721 Details for Bug 24412 – Bug 24412: Schema file DO NOT PUSH!

[patch] Bug 24412: Schema file DO NOT PUSH!

Bug-24412-Schema-file-DO-NOT-PUSH.patch (text/plain), 14.73 KB, created by Nicolas Legrand on 2020-03-25 15:21:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Legrand

Created: 2020-03-25 15:21:49 UTC

Size: 14.73 KB

patch

obsolete

>From 63239c65ef78aaaeae8412f87ff10c6ceb7a7347 Mon Sep 17 00:00:00 2001
>From: Nicolas Legrand <nicolas.legrand@bulac.fr>
>Date: Mon, 13 Jan 2020 17:51:03 +0100
>Subject: [PATCH] Bug 24412: Schema file DO NOT PUSH!
>
>---
> Koha/Schema/Result/Biblio.pm                | 19 ++-----------------
> Koha/Schema/Result/BiblioMetadata.pm        |  8 ++++----
> Koha/Schema/Result/Borrower.pm              | 15 ---------------
> Koha/Schema/Result/BorrowerModification.pm  |  8 ++++----
> Koha/Schema/Result/BorrowerRelationship.pm  | 15 +++++----------
> Koha/Schema/Result/Club.pm                  | 19 ++-----------------
> Koha/Schema/Result/DeletedbiblioMetadata.pm |  8 ++++----
> Koha/Schema/Result/Desk.pm                  | 19 +++++++++++++++++--
> Koha/Schema/Result/Item.pm                  | 15 ---------------
> Koha/Schema/Result/OldReserve.pm            |  7 +++++++
> Koha/Schema/Result/Reserve.pm               | 29 +++++++++++++++++++++--------
> Koha/Schema/Result/SearchField.pm           |  6 ++----
> Koha/Schema/Result/SearchMarcToField.pm     | 20 ++++++++++----------
> 13 files changed, 78 insertions(+), 110 deletions(-)
>
>diff --git a/Koha/Schema/Result/Biblio.pm b/Koha/Schema/Result/Biblio.pm
>index 7c66b1d..cea606f 100644
>--- a/Koha/Schema/Result/Biblio.pm
>+++ b/Koha/Schema/Result/Biblio.pm
>@@ -240,21 +240,6 @@ __PACKAGE__->has_many(
>   { cascade_copy => 0, cascade_delete => 0 },
> );
> 
>-=head2 club_holds
>-
>-Type: has_many
>-
>-Related object: L<Koha::Schema::Result::ClubHold>
>-
>-=cut
>-
>-__PACKAGE__->has_many(
>-  "club_holds",
>-  "Koha::Schema::Result::ClubHold",
>-  { "foreign.biblio_id" => "self.biblionumber" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>-);
>-
> =head2 hold_fill_targets
> 
> Type: has_many
>@@ -406,8 +391,8 @@ __PACKAGE__->has_many(
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-10-01 07:08:47
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:otCex8qzJmZyc+JXpKNdpQ
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2020-01-10 16:02:56
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0iQjTxpVZpOcW5Sg538tVg
> 
> 
> __PACKAGE__->has_one(
>diff --git a/Koha/Schema/Result/BiblioMetadata.pm b/Koha/Schema/Result/BiblioMetadata.pm
>index aa1a7b2..a2cd6c5 100644
>--- a/Koha/Schema/Result/BiblioMetadata.pm
>+++ b/Koha/Schema/Result/BiblioMetadata.pm
>@@ -44,7 +44,7 @@ __PACKAGE__->table("biblio_metadata");
> =head2 schema
> 
>   data_type: 'varchar'
>-  is_nullable: 0
>+  is_nullable: 1
>   size: 16
> 
> =head2 metadata
>@@ -69,7 +69,7 @@ __PACKAGE__->add_columns(
>   "format",
>   { data_type => "varchar", is_nullable => 0, size => 16 },
>   "schema",
>-  { data_type => "varchar", is_nullable => 0, size => 16 },
>+  { data_type => "varchar", is_nullable => 1, size => 16 },
>   "metadata",
>   { data_type => "longtext", is_nullable => 0 },
>   "timestamp",
>@@ -132,8 +132,8 @@ __PACKAGE__->belongs_to(
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-01-30 11:34:16
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FJk/YOw8Y/QRmmPPL3G5qQ
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2020-01-10 16:02:56
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kyAOIks+HHuiKQvfqxduEg
> 
> sub koha_object_class {
>     'Koha::Biblio::Metadata';
>diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm
>index 92a91b2..eee1529 100644
>--- a/Koha/Schema/Result/Borrower.pm
>+++ b/Koha/Schema/Result/Borrower.pm
>@@ -982,21 +982,6 @@ __PACKAGE__->has_many(
>   { cascade_copy => 0, cascade_delete => 0 },
> );
> 
>-=head2 club_holds_to_patron_holds
>-
>-Type: has_many
>-
>-Related object: L<Koha::Schema::Result::ClubHoldsToPatronHold>
>-
>-=cut
>-
>-__PACKAGE__->has_many(
>-  "club_holds_to_patron_holds",
>-  "Koha::Schema::Result::ClubHoldsToPatronHold",
>-  { "foreign.patron_id" => "self.borrowernumber" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>-);
>-
> =head2 course_instructors
> 
> Type: has_many
>diff --git a/Koha/Schema/Result/BorrowerModification.pm b/Koha/Schema/Result/BorrowerModification.pm
>index 3db708d..8077de2 100644
>--- a/Koha/Schema/Result/BorrowerModification.pm
>+++ b/Koha/Schema/Result/BorrowerModification.pm
>@@ -40,7 +40,7 @@ __PACKAGE__->table("borrower_modifications");
> =head2 changed_fields
> 
>   data_type: 'mediumtext'
>-  is_nullable: 0
>+  is_nullable: 1
> 
> =head2 borrowernumber
> 
>@@ -434,7 +434,7 @@ __PACKAGE__->add_columns(
>   "verification_token",
>   { data_type => "varchar", default_value => "", is_nullable => 0, size => 255 },
>   "changed_fields",
>-  { data_type => "mediumtext", is_nullable => 0 },
>+  { data_type => "mediumtext", is_nullable => 1 },
>   "borrowernumber",
>   { data_type => "integer", default_value => 0, is_nullable => 0 },
>   "cardnumber",
>@@ -610,8 +610,8 @@ __PACKAGE__->add_columns(
> __PACKAGE__->set_primary_key("verification_token", "borrowernumber");
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-07-22 16:54:42
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jkZUTN+mGIdp8ySV0BYNTw
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2020-01-10 16:02:56
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:M8mOFapLklUyhFsB5C/SGA
> 
> sub koha_object_class {
>     'Koha::Patron::Modification';
>diff --git a/Koha/Schema/Result/BorrowerRelationship.pm b/Koha/Schema/Result/BorrowerRelationship.pm
>index 04a5c10..f683cff 100644
>--- a/Koha/Schema/Result/BorrowerRelationship.pm
>+++ b/Koha/Schema/Result/BorrowerRelationship.pm
>@@ -33,7 +33,7 @@ __PACKAGE__->table("borrower_relationships");
> 
>   data_type: 'integer'
>   is_foreign_key: 1
>-  is_nullable: 1
>+  is_nullable: 0
> 
> =head2 guarantee_id
> 
>@@ -53,7 +53,7 @@ __PACKAGE__->add_columns(
>   "id",
>   { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
>   "guarantor_id",
>-  { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
>+  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
>   "guarantee_id",
>   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
>   "relationship",
>@@ -117,17 +117,12 @@ __PACKAGE__->belongs_to(
>   "guarantor",
>   "Koha::Schema::Result::Borrower",
>   { borrowernumber => "guarantor_id" },
>-  {
>-    is_deferrable => 1,
>-    join_type     => "LEFT",
>-    on_delete     => "CASCADE",
>-    on_update     => "CASCADE",
>-  },
>+  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-08-20 15:14:37
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZymvWAn9Nzfuh1lExUIhIg
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2020-01-10 16:02:56
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:icrt6W9Wnyn69FkiuHJOuw
> 
> sub koha_objects_class {
>     'Koha::Patron::Relationships';
>diff --git a/Koha/Schema/Result/Club.pm b/Koha/Schema/Result/Club.pm
>index 7710a75..98daa3f 100644
>--- a/Koha/Schema/Result/Club.pm
>+++ b/Koha/Schema/Result/Club.pm
>@@ -173,21 +173,6 @@ __PACKAGE__->has_many(
>   { cascade_copy => 0, cascade_delete => 0 },
> );
> 
>-=head2 club_holds
>-
>-Type: has_many
>-
>-Related object: L<Koha::Schema::Result::ClubHold>
>-
>-=cut
>-
>-__PACKAGE__->has_many(
>-  "club_holds",
>-  "Koha::Schema::Result::ClubHold",
>-  { "foreign.club_id" => "self.id" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>-);
>-
> =head2 club_template
> 
> Type: belongs_to
>@@ -204,8 +189,8 @@ __PACKAGE__->belongs_to(
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-10-01 07:08:47
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WbB7PSSU4xaszsKe9Eacqw
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2020-01-10 16:02:56
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WqSnfMI5Y1zPi7Z3JEuSlQ
> 
> 
> # You can replace this text with custom content, and it will be preserved on regeneration
>diff --git a/Koha/Schema/Result/DeletedbiblioMetadata.pm b/Koha/Schema/Result/DeletedbiblioMetadata.pm
>index 17406b9..e8cdfcd 100644
>--- a/Koha/Schema/Result/DeletedbiblioMetadata.pm
>+++ b/Koha/Schema/Result/DeletedbiblioMetadata.pm
>@@ -44,7 +44,7 @@ __PACKAGE__->table("deletedbiblio_metadata");
> =head2 schema
> 
>   data_type: 'varchar'
>-  is_nullable: 0
>+  is_nullable: 1
>   size: 16
> 
> =head2 metadata
>@@ -69,7 +69,7 @@ __PACKAGE__->add_columns(
>   "format",
>   { data_type => "varchar", is_nullable => 0, size => 16 },
>   "schema",
>-  { data_type => "varchar", is_nullable => 0, size => 16 },
>+  { data_type => "varchar", is_nullable => 1, size => 16 },
>   "metadata",
>   { data_type => "longtext", is_nullable => 0 },
>   "timestamp",
>@@ -132,8 +132,8 @@ __PACKAGE__->belongs_to(
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-01-30 11:34:16
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JCOh+FSSTgPlC8lMJOdOOA
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2020-01-10 16:02:56
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qP9OS+Amaz2DUzVovmFlww
> 
> 
> # You can replace this text with custom code or comments, and it will be preserved on regeneration
>diff --git a/Koha/Schema/Result/Desk.pm b/Koha/Schema/Result/Desk.pm
>index a72be1b..ee04730 100644
>--- a/Koha/Schema/Result/Desk.pm
>+++ b/Koha/Schema/Result/Desk.pm
>@@ -83,9 +83,24 @@ __PACKAGE__->belongs_to(
>   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
> );
> 
>+=head2 reserves
> 
>-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2019-10-02 13:43:57
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IklOycKlChqv9Tftm8rjqA
>+Type: has_many
>+
>+Related object: L<Koha::Schema::Result::Reserve>
>+
>+=cut
>+
>+__PACKAGE__->has_many(
>+  "reserves",
>+  "Koha::Schema::Result::Reserve",
>+  { "foreign.desk_id" => "self.desk_id" },
>+  { cascade_copy => 0, cascade_delete => 0 },
>+);
>+
>+
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2020-01-10 16:02:56
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FoGr/XGcK5TtSzNXMTeztg
> 
> 
> # You can replace this text with custom code or comments, and it will be preserved on regeneration
>diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm
>index 58cddf4..2785603 100644
>--- a/Koha/Schema/Result/Item.pm
>+++ b/Koha/Schema/Result/Item.pm
>@@ -510,21 +510,6 @@ __PACKAGE__->has_many(
>   { cascade_copy => 0, cascade_delete => 0 },
> );
> 
>-=head2 club_holds
>-
>-Type: has_many
>-
>-Related object: L<Koha::Schema::Result::ClubHold>
>-
>-=cut
>-
>-__PACKAGE__->has_many(
>-  "club_holds",
>-  "Koha::Schema::Result::ClubHold",
>-  { "foreign.item_id" => "self.itemnumber" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>-);
>-
> =head2 course_item
> 
> Type: might_have
>diff --git a/Koha/Schema/Result/OldReserve.pm b/Koha/Schema/Result/OldReserve.pm
>index 85e604d..1ba14ce 100644
>--- a/Koha/Schema/Result/OldReserve.pm
>+++ b/Koha/Schema/Result/OldReserve.pm
>@@ -52,6 +52,11 @@ __PACKAGE__->table("old_reserves");
>   is_nullable: 1
>   size: 10
> 
>+=head2 desk_id
>+
>+  data_type: 'integer'
>+  is_nullable: 1
>+
> =head2 notificationdate
> 
>   data_type: 'date'
>@@ -157,6 +162,8 @@ __PACKAGE__->add_columns(
>   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
>   "branchcode",
>   { data_type => "varchar", is_nullable => 1, size => 10 },
>+  "desk_id",
>+  { data_type => "integer", is_nullable => 1 },
>   "notificationdate",
>   { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
>   "reminderdate",
>diff --git a/Koha/Schema/Result/Reserve.pm b/Koha/Schema/Result/Reserve.pm
>index c5460e3..c77fd1e 100644
>--- a/Koha/Schema/Result/Reserve.pm
>+++ b/Koha/Schema/Result/Reserve.pm
>@@ -56,6 +56,12 @@ __PACKAGE__->table("reserves");
>   is_nullable: 1
>   size: 10
> 
>+=head2 desk_id
>+
>+  data_type: 'integer'
>+  is_foreign_key: 1
>+  is_nullable: 1
>+
> =head2 notificationdate
> 
>   data_type: 'date'
>@@ -171,6 +177,8 @@ __PACKAGE__->add_columns(
>   },
>   "branchcode",
>   { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 },
>+  "desk_id",
>+  { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
>   "notificationdate",
>   { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
>   "reminderdate",
>@@ -281,19 +289,24 @@ __PACKAGE__->belongs_to(
>   },
> );
> 
>-=head2 club_holds_to_patron_holds
>+=head2 desk
> 
>-Type: has_many
>+Type: belongs_to
> 
>-Related object: L<Koha::Schema::Result::ClubHoldsToPatronHold>
>+Related object: L<Koha::Schema::Result::Desk>
> 
> =cut
> 
>-__PACKAGE__->has_many(
>-  "club_holds_to_patron_holds",
>-  "Koha::Schema::Result::ClubHoldsToPatronHold",
>-  { "foreign.hold_id" => "self.reserve_id" },
>-  { cascade_copy => 0, cascade_delete => 0 },
>+__PACKAGE__->belongs_to(
>+  "desk",
>+  "Koha::Schema::Result::Desk",
>+  { desk_id => "desk_id" },
>+  {
>+    is_deferrable => 1,
>+    join_type     => "LEFT",
>+    on_delete     => "CASCADE",
>+    on_update     => "CASCADE",
>+  },
> );
> 
> =head2 itemnumber
>diff --git a/Koha/Schema/Result/SearchField.pm b/Koha/Schema/Result/SearchField.pm
>index 540d984..1b865fb 100644
>--- a/Koha/Schema/Result/SearchField.pm
>+++ b/Koha/Schema/Result/SearchField.pm
>@@ -64,8 +64,6 @@ what type of data this holds, relevant when storing it in the search engine
>   data_type: 'tinyint'
>   is_nullable: 1
> 
>-the order place of the field in facet list if faceted
>-
> =head2 staff_client
> 
>   data_type: 'tinyint'
>@@ -149,8 +147,8 @@ __PACKAGE__->has_many(
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-10-02 12:47:22
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EbUa4eprgxeUkoOUiXO/Cg
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2020-01-10 16:02:56
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hT3LpnNmDmKGyT9v/jpbjg
> 
> __PACKAGE__->many_to_many("search_marc_maps", "search_marc_to_fields", "search_marc_map");
> 
>diff --git a/Koha/Schema/Result/SearchMarcToField.pm b/Koha/Schema/Result/SearchMarcToField.pm
>index 0108016..cc05299 100644
>--- a/Koha/Schema/Result/SearchMarcToField.pm
>+++ b/Koha/Schema/Result/SearchMarcToField.pm
>@@ -23,12 +23,6 @@ __PACKAGE__->table("search_marc_to_field");
> 
> =head1 ACCESSORS
> 
>-=head2 search
>-
>-  data_type: 'tinyint'
>-  default_value: 1
>-  is_nullable: 0
>-
> =head2 search_marc_map_id
> 
>   data_type: 'integer'
>@@ -64,11 +58,15 @@ true if this field can be used to generate suggestions for browse
> 
> true/false creates special sort handling, null doesn't
> 
>+=head2 search
>+
>+  data_type: 'tinyint'
>+  default_value: 1
>+  is_nullable: 0
>+
> =cut
> 
> __PACKAGE__->add_columns(
>-  "search",
>-  { data_type => "tinyint", default_value => 1, is_nullable => 0 },
>   "search_marc_map_id",
>   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
>   "search_field_id",
>@@ -79,6 +77,8 @@ __PACKAGE__->add_columns(
>   { data_type => "tinyint", default_value => 0, is_nullable => 1 },
>   "sort",
>   { data_type => "tinyint", is_nullable => 1 },
>+  "search",
>+  { data_type => "tinyint", default_value => 1, is_nullable => 0 },
> );
> 
> =head1 PRIMARY KEY
>@@ -128,8 +128,8 @@ __PACKAGE__->belongs_to(
> );
> 
> 
>-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-10-02 12:47:22
>-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9mqZ/zrii+Fv+k+eQNHYUw
>+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2020-01-10 16:02:56
>+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QBWMT6sHJw3YfpT+VxIu6g
> 
> 
> # You can replace this text with custom code or comments, and it will be preserved on regeneration
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 24412: 97328 | 97329 | 97330 | 101625 | 101626 | 101627 | 101628 | 101629 | 101630 | 101721 | 101722 | 101723 | 101825 | 101884 | 101885 | 101886 | 101898 | 101899 | 101900 | 101955 | 101956 | 101957 | 106586 | 106648 | 110067 | 110068 | 110069 | 110070 | 110450 | 110451 | 110452 | 110453 | 110454 | 110455 | 110582 | 110583 | 110584 | 110585 | 110586 | 112046 | 112047 | 112048 | 112049 | 112050 | 112092 | 112099 | 112165 | 112166 | 112167 | 112168 | 112169 | 112170 | 112171 | 112172 | 112201 | 112202 | 112203 | 112204 | 112205 | 112206 | 112207 | 112208 | 112209 | 112210 | 112211 | 112212 | 112213 | 112214 | 112215 | 112216 | 112217 | 112218 | 112219 | 112264 | 112265 | 112266 | 112267 | 112268 | 112269 | 112270 | 112271 | 112272 | 112292 | 112293 | 113108 | 113109 | 113116 | 113228 | 113229 | 113230 | 113231 | 113232 | 113233 | 113234 | 113235 | 113236