From 5d220e52c38ed48732ab8a355d2ba939a01759ea Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Tue, 13 Aug 2024 01:08:44 -0300
Subject: [PATCH] Bug 37508: (QA follow-up) Move sth error check up

This patch moves the error check right before the ->check_columns call.
This is how main and 24.05 behave. 23.11 doesn't have bug 35907
backported so things are not exactly the same. With this patch tests
pass and the only difference in behavior is logging.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 C4/Reports/Guided.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
index f52c6babe4..3004b63bc6 100644
--- a/C4/Reports/Guided.pm
+++ b/C4/Reports/Guided.pm
@@ -615,11 +615,12 @@ sub execute_query {
     };
     warn $@ if $@;
 
+    return ( $sth, { queryerr => $sth->errstr } ) if ($sth->err);
+
     # Check if table.* contained forbidden column names
     return ( $sth, { passworderr => "Illegal column in results" } )
         if Koha::Report->new->check_columns( undef, $sth->{NAME_lc} );
 
-    return ( $sth, { queryerr => $sth->errstr } ) if ($sth->err);
     return ( $sth );
 }
 
-- 
2.39.5