From 60f768c14471e2150ad3d525a9d189ccd85c6598 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 12 Sep 2022 17:09:24 +0100 Subject: [PATCH] Bug 26247: (QA follow-up) Merge DB Updates --- ...26247-add_RetainCatalogSearchTerms_syspref.pl | 12 ------------ ...26247-add_RetainPatronsSearchTerms_syspref.pl | 12 ------------ installer/data/mysql/atomicupdate/bug_26247.pl | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 24 deletions(-) delete mode 100755 installer/data/mysql/atomicupdate/bug_26247-add_RetainCatalogSearchTerms_syspref.pl delete mode 100755 installer/data/mysql/atomicupdate/bug_26247-add_RetainPatronsSearchTerms_syspref.pl create mode 100644 installer/data/mysql/atomicupdate/bug_26247.pl diff --git a/installer/data/mysql/atomicupdate/bug_26247-add_RetainCatalogSearchTerms_syspref.pl b/installer/data/mysql/atomicupdate/bug_26247-add_RetainCatalogSearchTerms_syspref.pl deleted file mode 100755 index 44637ca774..0000000000 --- a/installer/data/mysql/atomicupdate/bug_26247-add_RetainCatalogSearchTerms_syspref.pl +++ /dev/null @@ -1,12 +0,0 @@ -use Modern::Perl; - -return { - bug_number => "26247", - description => "Add new system preference RetainCatalogSearchTerms", - up => sub { - my ($args) = @_; - my ($dbh, $out) = @$args{qw(dbh out)}; - - $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('RetainCatalogSearchTerms', '1', NULL, 'If enabled, searches entered into the catalog search bar will be retained', 'YesNo') }); - }, -}; diff --git a/installer/data/mysql/atomicupdate/bug_26247-add_RetainPatronsSearchTerms_syspref.pl b/installer/data/mysql/atomicupdate/bug_26247-add_RetainPatronsSearchTerms_syspref.pl deleted file mode 100755 index dd6d842fa6..0000000000 --- a/installer/data/mysql/atomicupdate/bug_26247-add_RetainPatronsSearchTerms_syspref.pl +++ /dev/null @@ -1,12 +0,0 @@ -use Modern::Perl; - -return { - bug_number => "26247", - description => "Add new system preference RetainPatronsSearchTerms", - up => sub { - my ($args) = @_; - my ($dbh, $out) = @$args{qw(dbh out)}; - - $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('RetainPatronSearchTerms', '1', NULL, 'If enabled, searches entered into the checkout and patrons search bars will be retained', 'YesNo') }); - }, -}; diff --git a/installer/data/mysql/atomicupdate/bug_26247.pl b/installer/data/mysql/atomicupdate/bug_26247.pl new file mode 100644 index 0000000000..439f136c75 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_26247.pl @@ -0,0 +1,16 @@ +use Modern::Perl; + +return { + bug_number => "26247", + description => "Add new retain search terms preferences", + up => sub { + my ($args) = @_; + my ($dbh, $out) = @$args{qw(dbh out)}; + + $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('RetainCatalogSearchTerms', '1', NULL, 'If enabled, searches entered into the catalog search bar will be retained', 'YesNo') }); + say $out "Added `RetainCatalogSearchTerms` preference"; + + $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('RetainPatronSearchTerms', '1', NULL, 'If enabled, searches entered into the checkout and patrons search bars will be retained', 'YesNo') }); + say $out "Added `RetainPatronsSearchTerms` preference"; + }, +}; -- 2.20.1