Attachment 93138 Details for Bug 23655 – Bug 23655: Replace selectall_array with selectall_arrayref

[patch] Bug 23655: Replace selectall_array with selectall_arrayref

Bug-23655-Replace-selectallarray-with-selectallarr.patch (text/plain), 1.66 KB, created by Martin Renvoize (ashimema) on 2019-09-24 12:42:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-09-24 12:42:03 UTC

Size: 1.66 KB

patch

obsolete

>From 23f9778c95d07ac0634cae401c711e3bc1ba0a97 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 24 Sep 2019 13:39:36 +0100
>Subject: [PATCH] Bug 23655: Replace selectall_array with selectall_arrayref
>
>The selectall_array method is introduced in DBI version 1.635 which is
>not available in Debian Jessie at time of writing.
>
>This patch replaces it with selectall_arrayref which was introduced in
>1.631 and is available by default.
>---
> about.pl | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/about.pl b/about.pl
>index 31b30db170..5cdcb614e0 100755
>--- a/about.pl
>+++ b/about.pl
>@@ -474,18 +474,18 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs;
> 
>     $bad_relationships_count = $bad_relationships_count->[0]->[0];
> 
>-    my @existing_relationships = $dbh->selectall_array(q{
>+    my $existing_relationships = $dbh->selectall_arrayref(q{
>         SELECT DISTINCT(relationship)
>         FROM (
>             SELECT relationship FROM borrower_relationships WHERE relationship IS NOT NULL
>             UNION ALL
>             SELECT relationship FROM borrowers WHERE relationship IS NOT NULL) a
>-    });
>+    }, { Slice => {} });
> 
>     my %valid_relationships = map { $_ => 1 } split( /,|\|/, C4::Context->preference('borrowerRelationship') );
>     $valid_relationships{ _bad_data } = 1; # we handle this case in another way
> 
>-    my @wrong_relationships = grep { !$valid_relationships{ $_->[0] } } @existing_relationships;
>+    my @wrong_relationships = grep { !$valid_relationships{ $_->[0] } } @{$existing_relationships};
> 
>     if ( @wrong_relationships or $bad_relationships_count ) {
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23655: 93138 | 94802