From 87260369909a227c5c7a08db57ec1e747267ef56 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 6 Oct 2022 10:44:21 -0300 Subject: [PATCH] Bug 17170: (QA follow-up) DB changes Signed-off-by: Tomas Cohen Arazi --- Koha/Schema/Result/SearchFilter.pm | 18 ++++++++++++------ installer/data/mysql/atomicupdate/bug_17170.pl | 16 ++++++++-------- installer/data/mysql/kohastructure.sql | 10 +++++----- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Koha/Schema/Result/SearchFilter.pm b/Koha/Schema/Result/SearchFilter.pm index 0939412b65..96a78c85af 100644 --- a/Koha/Schema/Result/SearchFilter.pm +++ b/Koha/Schema/Result/SearchFilter.pm @@ -23,7 +23,7 @@ __PACKAGE__->table("search_filters"); =head1 ACCESSORS -=head2 id +=head2 search_filter_id data_type: 'integer' is_auto_increment: 1 @@ -35,16 +35,22 @@ __PACKAGE__->table("search_filters"); is_nullable: 0 size: 255 +filter name + =head2 query data_type: 'mediumtext' is_nullable: 1 +filter query part + =head2 limits data_type: 'mediumtext' is_nullable: 1 +filter limits part + =head2 opac data_type: 'tinyint' @@ -64,7 +70,7 @@ whether this filter is shown in staff client =cut __PACKAGE__->add_columns( - "id", + "search_filter_id", { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, "name", { data_type => "varchar", is_nullable => 0, size => 255 }, @@ -82,17 +88,17 @@ __PACKAGE__->add_columns( =over 4 -=item * L +=item * L =back =cut -__PACKAGE__->set_primary_key("id"); +__PACKAGE__->set_primary_key("search_filter_id"); -# Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-10-06 12:05:17 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8QjxOudinfXOrLj/KkZc5Q +# Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-10-06 12:25:18 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:De9VF9DBMhzsbPIbyFGXlQ __PACKAGE__->add_columns( '+opac' => { is_boolean => 1 }, diff --git a/installer/data/mysql/atomicupdate/bug_17170.pl b/installer/data/mysql/atomicupdate/bug_17170.pl index 650e7831c3..70b9d1f827 100755 --- a/installer/data/mysql/atomicupdate/bug_17170.pl +++ b/installer/data/mysql/atomicupdate/bug_17170.pl @@ -14,14 +14,14 @@ return { unless( TableExists( 'search_filters' ) ){ $dbh->do(q{ CREATE TABLE `search_filters` ( - id int(11) NOT NULL auto_increment, -- unique identifier for each search filter - name varchar(255) NOT NULL, -- display name for this filter - query mediumtext DEFAULT NULL, -- query part of the filter, can be blank - limits mediumtext DEFAULT NULL, -- limits part of the filter, can be blank - opac tinyint(1) NOT NULL DEFAULT 0, -- whether this filter is shown on OPAC - staff_client tinyint(1) NOT NULL DEFAULT 0, -- whether this filter is shown in staff client - PRIMARY KEY (id) - ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci; + `search_filter_id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL COMMENT 'filter name', + `query` mediumtext NULL DEFAULT NULL COMMENT 'filter query part', + `limits` mediumtext NULL DEFAULT NULL COMMENT 'filter limits part', + `opac` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'whether this filter is shown on OPAC', + `staff_client` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'whether this filter is shown in staff client', + PRIMARY KEY (`search_filter_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; }); say $out "Added search_filters table"; } else { diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 8ec0fad779..58f8102461 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -4731,13 +4731,13 @@ DROP TABLE IF EXISTS `search_filters`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `search_filters` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `query` mediumtext COLLATE utf8mb4_unicode_ci, - `limits` mediumtext COLLATE utf8mb4_unicode_ci, + `search_filter_id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL COMMENT 'filter name', + `query` mediumtext NULL DEFAULT NULL COMMENT 'filter query part', + `limits` mediumtext NULL DEFAULT NULL COMMENT 'filter limits part', `opac` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'whether this filter is shown on OPAC', `staff_client` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'whether this filter is shown in staff client', - PRIMARY KEY (`id`) + PRIMARY KEY (`search_filter_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- 2.39.5