Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 37508: (QA follow-up) Move sth error check up

Browse source 
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>
This commit is contained in:
Tomás Cohen Arazi 2024-08-13 01:08:44 -03:00
parent e3d2c38a1f
commit 19d8d67cb4
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
C4/Reports/Guided.pm
View file

@ -615,11 +615,12 @@ sub execute_query {
}; };
warn $@ if $@; warn $@ if $@;
return ( $sth, { queryerr => $sth->errstr } ) if ($sth->err);
# Check if table.* contained forbidden column names # Check if table.* contained forbidden column names
return ( $sth, { passworderr => "Illegal column in results" } ) return ( $sth, { passworderr => "Illegal column in results" } )
if Koha::Report->new->check_columns( undef, $sth->{NAME_lc} ); if Koha::Report->new->check_columns( undef, $sth->{NAME_lc} );
return ( $sth, { queryerr => $sth->errstr } ) if ($sth->err);
return ( $sth ); return ( $sth );
} }