From a1ae514e4329a4fb8373d32b0b41ac619ae1ea92 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 25 Sep 2015 16:06:07 +0100 Subject: [PATCH] Bug 14899: DB changes This patch applies several changes to the DB structure introduced by the previous ES patch set: 1/ Add a search_field.label column => It will be easier to understand what the search_field does. Indeed, some are not user friendly: acqdate, an, pl, ff8-23, ln, etc. TODO later: Update the labels with correct values (at the moment label=name) 2/ Update the foreign key search_marc_to_field.search_marc_map_id with on delete cascase. This will permit to automatically remove the entries in search_marc_to_field when they are deleted in search_marc_map. 3/ Remove the index_name_2 unique constraint on the search_marc_map table. I don't understand how this could be useful, it was defined like (index_name, marc_type, marc_field), so it means a mapping cannot be defined twice with different values for facet, suggestible and sort. This limitation does not seem to make sense. Robin, please correct me if I am wrong :) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall --- Koha/Schema/Result/SearchField.pm | 12 ++++++++++-- Koha/Schema/Result/SearchMarcMap.pm | 22 ++-------------------- Koha/Schema/Result/SearchMarcToField.pm | 6 +++--- installer/data/mysql/updatedatabase.pl | 23 +++++++++++++++++++++++ 4 files changed, 38 insertions(+), 25 deletions(-) diff --git a/Koha/Schema/Result/SearchField.pm b/Koha/Schema/Result/SearchField.pm index 38d299c913..ce76534cb5 100644 --- a/Koha/Schema/Result/SearchField.pm +++ b/Koha/Schema/Result/SearchField.pm @@ -37,6 +37,12 @@ __PACKAGE__->table("search_field"); the name of the field as it will be stored in the search engine +=head2 label + + data_type: 'varchar' + is_nullable: 1 + size: 255 + =head2 type data_type: 'enum' @@ -52,6 +58,8 @@ __PACKAGE__->add_columns( { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, "name", { data_type => "varchar", is_nullable => 0, size => 255 }, + "label", + { data_type => "varchar", is_nullable => 1, size => 255 }, "type", { data_type => "enum", @@ -114,8 +122,8 @@ Composing rels: L -> search_marc_map __PACKAGE__->many_to_many("search_marc_maps", "search_marc_to_fields", "search_marc_map"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-09-01 16:56:47 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VN1BPJJTnr7p+I2bRZoBEA +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-09-25 15:21:43 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HD0m5hWYi/GXgz1rvk+Ipw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/SearchMarcMap.pm b/Koha/Schema/Result/SearchMarcMap.pm index cb5cd55d61..304c4f0255 100644 --- a/Koha/Schema/Result/SearchMarcMap.pm +++ b/Koha/Schema/Result/SearchMarcMap.pm @@ -115,24 +115,6 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("id"); -=head1 UNIQUE CONSTRAINTS - -=head2 C - -=over 4 - -=item * L - -=item * L - -=item * L - -=back - -=cut - -__PACKAGE__->add_unique_constraint("index_name_2", ["index_name", "marc_type", "marc_field"]); - =head1 RELATIONS =head2 search_marc_to_fields @@ -161,8 +143,8 @@ Composing rels: L -> search_field __PACKAGE__->many_to_many("search_fields", "search_marc_to_fields", "search_field"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-09-01 16:56:47 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Vo1uboO+iKCunqfpetswDg +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-09-25 15:20:52 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:o579otqUGA8XhO+NYv99dw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/Koha/Schema/Result/SearchMarcToField.pm b/Koha/Schema/Result/SearchMarcToField.pm index c000c4122a..8daccab507 100644 --- a/Koha/Schema/Result/SearchMarcToField.pm +++ b/Koha/Schema/Result/SearchMarcToField.pm @@ -87,12 +87,12 @@ __PACKAGE__->belongs_to( "search_marc_map", "Koha::Schema::Result::SearchMarcMap", { id => "search_marc_map_id" }, - { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" }, + { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, ); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-06-10 14:32:07 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZNdjnjdGpK+5P478RkCWnA +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-09-25 15:19:43 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:h9oY2xOGibcnsriEfcFe8A # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f7ca13d4bb..e61de78418 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12266,6 +12266,29 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { SetVersion($DBversion); } +$DBversion = "XXX"; +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do(q| + ALTER TABLE search_marc_to_field DROP FOREIGN KEY search_marc_to_field_ibfk_1 + |); + $dbh->do(q| + ALTER TABLE search_marc_to_field + ADD CONSTRAINT search_marc_to_field_ibfk_1 FOREIGN KEY (`search_marc_map_id`) REFERENCES `search_marc_map` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + |); + $dbh->do(q| + ALTER TABLE search_marc_map DROP KEY index_name_2 + |); + $dbh->do(q| + ALTER TABLE search_field ADD COLUMN label VARCHAR(255) AFTER name + |); + $dbh->do(q| + UPDATE search_field SET label=name + |); + + print "Upgrade to $DBversion done (Bug 12478/14899 - DB Changes to the elasticsearch tables)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5