Bug 12478: update the schema

These files have been generated with the
misc/devel/update_dbix_class_files.pl script.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/Koha/Schema/Result/SearchField.pm b/Koha/Schema/Result/SearchField.pm
index ce76534..b3ec809 100644 (file)
--- a/Koha/Schema/Result/SearchField.pm
+++ b/Koha/Schema/Result/SearchField.pm
@@ -40,9 +40,11 @@ the name of the field as it will be stored in the search engine
 =head2 label
 
   data_type: 'varchar'
-  is_nullable: 1
+  is_nullable: 0
   size: 255
 
+the human readable name of the field, for display
+
 =head2 type
 
   data_type: 'enum'
@@ -59,7 +61,7 @@ __PACKAGE__->add_columns(
   "name",
   { data_type => "varchar", is_nullable => 0, size => 255 },
   "label",
-  { data_type => "varchar", is_nullable => 1, size => 255 },
+  { data_type => "varchar", is_nullable => 0, size => 255 },
   "type",
   {
     data_type => "enum",
@@ -111,19 +113,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 search_marc_maps
-
-Type: many_to_many
-
-Composing rels: L</search_marc_to_fields> -> search_marc_map
-
-=cut
-
-__PACKAGE__->many_to_many("search_marc_maps", "search_marc_to_fields", "search_marc_map");
-
 
-# 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
+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-10-12 16:41:47
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4MJO9216VF37w7PlWCcBKg
 
 
 # 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 304c4f0..2b00f84 100644 (file)
--- a/Koha/Schema/Result/SearchMarcMap.pm
+++ b/Koha/Schema/Result/SearchMarcMap.pm
@@ -53,29 +53,6 @@ what MARC type this map is for
 
 the MARC specifier for this field
 
-=head2 facet
-
-  data_type: 'tinyint'
-  default_value: 0
-  is_nullable: 1
-
-true if a facet field should be generated for this
-
-=head2 suggestible
-
-  data_type: 'tinyint'
-  default_value: 0
-  is_nullable: 1
-
-true if this field can be used to generate suggestions for browse
-
-=head2 sort
-
-  data_type: 'tinyint'
-  is_nullable: 1
-
-true/false creates special sort handling, null doesn't
-
 =cut
 
 __PACKAGE__->add_columns(
@@ -95,12 +72,6 @@ __PACKAGE__->add_columns(
   },
   "marc_field",
   { data_type => "varchar", is_nullable => 0, size => 255 },
-  "facet",
-  { data_type => "tinyint", default_value => 0, is_nullable => 1 },
-  "suggestible",
-  { data_type => "tinyint", default_value => 0, is_nullable => 1 },
-  "sort",
-  { data_type => "tinyint", is_nullable => 1 },
 );
 
 =head1 PRIMARY KEY
@@ -115,6 +86,24 @@ __PACKAGE__->add_columns(
 
 __PACKAGE__->set_primary_key("id");
 
+=head1 UNIQUE CONSTRAINTS
+
+=head2 C<index_name>
+
+=over 4
+
+=item * L</index_name>
+
+=item * L</marc_field>
+
+=item * L</marc_type>
+
+=back
+
+=cut
+
+__PACKAGE__->add_unique_constraint("index_name", ["index_name", "marc_field", "marc_type"]);
+
 =head1 RELATIONS
 
 =head2 search_marc_to_fields
@@ -132,19 +121,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 search_fields
-
-Type: many_to_many
-
-Composing rels: L</search_marc_to_fields> -> search_field
-
-=cut
-
-__PACKAGE__->many_to_many("search_fields", "search_marc_to_fields", "search_field");
-
 
-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-09-25 15:20:52
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:o579otqUGA8XhO+NYv99dw
+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-10-12 16:41:47
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nKMOxnAJST3zNN6Kxj2ynA
 
 
 # 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 8daccab..bfd27ea 100644 (file)
--- a/Koha/Schema/Result/SearchMarcToField.pm
+++ b/Koha/Schema/Result/SearchMarcToField.pm
@@ -35,6 +35,29 @@ __PACKAGE__->table("search_marc_to_field");
   is_foreign_key: 1
   is_nullable: 0
 
+=head2 facet
+
+  data_type: 'tinyint'
+  default_value: 0
+  is_nullable: 1
+
+true if a facet field should be generated for this
+
+=head2 suggestible
+
+  data_type: 'tinyint'
+  default_value: 0
+  is_nullable: 1
+
+true if this field can be used to generate suggestions for browse
+
+=head2 sort
+
+  data_type: 'tinyint'
+  is_nullable: 1
+
+true/false creates special sort handling, null doesn't
+
 =cut
 
 __PACKAGE__->add_columns(
@@ -42,6 +65,12 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
   "search_field_id",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
+  "facet",
+  { data_type => "tinyint", default_value => 0, is_nullable => 1 },
+  "suggestible",
+  { data_type => "tinyint", default_value => 0, is_nullable => 1 },
+  "sort",
+  { data_type => "tinyint", is_nullable => 1 },
 );
 
 =head1 PRIMARY KEY
@@ -72,7 +101,7 @@ __PACKAGE__->belongs_to(
   "search_field",
   "Koha::Schema::Result::SearchField",
   { id => "search_field_id" },
-  { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },
+  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 search_marc_map
@@ -91,8 +120,8 @@ __PACKAGE__->belongs_to(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-09-25 15:19:43
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:h9oY2xOGibcnsriEfcFe8A
+# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-10-12 16:41:47
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ccnCYwDdtPGZ/VArAe1kPA
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration