Attachment 147609 Details for Bug 30069 – Bug 30069: (QA follow-up) Use pure DBIC for select and delete with single query

[patch] Bug 30069: (QA follow-up) Use pure DBIC for select and delete with single query

Bug-30069-QA-follow-up-Use-pure-DBIC-for-select-an.patch (text/plain), 3.54 KB, created by Kyle M Hall (khall) on 2023-03-02 13:00:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2023-03-02 13:00:18 UTC

Size: 3.54 KB

patch

obsolete

>From 29d128eaf6ef0f31357b6eee57a6f05b149c03fe Mon Sep 17 00:00:00 2001
>From: Kyle Hall <kyle@bywatersolutions.com>
>Date: Thu, 2 Mar 2023 07:58:13 -0500
>Subject: [PATCH] Bug 30069: (QA follow-up) Use pure DBIC for select and delete
> with single query
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> misc/cronjobs/cleanup_database.pl | 51 +++++++++++++++----------------
> 1 file changed, 25 insertions(+), 26 deletions(-)
>
>diff --git a/misc/cronjobs/cleanup_database.pl b/misc/cronjobs/cleanup_database.pl
>index b1a4e53539..c33dede4e5 100755
>--- a/misc/cronjobs/cleanup_database.pl
>+++ b/misc/cronjobs/cleanup_database.pl
>@@ -31,26 +31,29 @@ use constant DEFAULT_JOBS_PURGEDAYS               => 1;
> use constant DEFAULT_JOBS_PURGETYPES              => qw{ update_elastic_index };
> use constant DEFAULT_EDIFACT_MSG_PURGEDAYS        => 365;
> 
>+use Getopt::Long qw( GetOptions );
>+
> use Koha::Script -cron;
>+
>+use C4::Accounts qw( purge_zero_balance_fees );
> use C4::Context;
>-use C4::Search;
>-use C4::Search::History;
>-use Getopt::Long qw( GetOptions );
> use C4::Log qw( cronlogaction );
>-use C4::Accounts qw( purge_zero_balance_fees );
>-use Koha::UploadedFiles;
>+use C4::Search::History;
>+use C4::Search;
> use Koha::BackgroundJobs;
>-use Koha::Old::Biblios;
>-use Koha::Old::Items;
>+use Koha::Database;
>+use Koha::DateUtils qw( dt_from_string );
>+use Koha::Item::Transfers;
> use Koha::Old::Biblioitems;
>+use Koha::Old::Biblios;
> use Koha::Old::Checkouts;
> use Koha::Old::Holds;
>+use Koha::Old::Items;
> use Koha::Old::Patrons;
>-use Koha::Item::Transfers;
>-use Koha::PseudonymizedTransactions;
>-use Koha::Patron::Messages;
> use Koha::Patron::Debarments qw( DelDebarment );
>-use Koha::Database;
>+use Koha::Patron::Messages;
>+use Koha::PseudonymizedTransactions;
>+use Koha::UploadedFiles;
> 
> sub usage {
>     print STDERR <<USAGE;
>@@ -116,7 +119,7 @@ Usage: $0 [-h|--help] [--confirm] [--sessions] [--sessdays DAYS] [-v|--verbose]
>    --jobs-type TYPES       What type of background job to purge. Defaults to "update_elastic_index" if omitted
>                            Specifying "all" will purge all types. Repeatable.
>    --reports DAYS          Purge reports data saved more than DAYS days ago. The data is created by running runreport.pl with the --store-results option.
>-   --edifact-messages DAYS   Purge entries from the edifact_messages table older than DAYS days.
>+   --edifact-messages DAYS   Purge process and failed EDIFACT messages handled more than DAYS days.
>                              Defaults to 365 days if no days specified.
> USAGE
>     exit $_[0];
>@@ -894,23 +897,19 @@ sub PurgeSavedReports {
> sub PurgeEdifactMessages {
>     my ( $days, $doit ) = @_;
> 
>-    my $count = 0;
>     my $schema = Koha::Database->new()->schema();
>-
>-    $sth = $dbh->prepare(
>-        q{
>-            SELECT id
>-            FROM edifact_messages
>-            WHERE transfer_date < date_sub(curdate(), INTERVAL ? DAY)
>-            AND status != 'new';
>+    my $dtf = $schema->storage->datetime_parser;
>+    my $resultset = $schema->resultset('EdifactMessage')->search(
>+        {
>+            transfer_date => {
>+                '<' => $dtf->format_datetime(dt_from_string->subtract( days => $days ))
>+            },
>+            status => { '!=' => 'new' },
>         }
>     );
>-    $sth->execute($days) or die $dbh->errstr;
>+    my $count = $resultset->count;
>+
>+    $resultset->delete if $doit;
> 
>-    while ( my ($msg_id) = $sth->fetchrow_array) {
>-        my $msg = $schema->resultset('EdifactMessage')->find($msg_id);
>-        $msg->delete if $doit;
>-        $count++;
>-    }
>     return $count;
> }
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 30069: 146690 | 146694 | 146976 | 146977 | 147564 | 147606 | 147607 | 147608 | 147609