gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 21281: Correct t/db_dependent/Creators/Lib.t failures 

TEST PLAN
---------
1) apply first patch
2) kshell kohadev
3) prove -r -v t/db_dependent/Creators/
   -- failures
4) apply this patch
5) repeat 2,3
   -- no failures
6) run koha qa test tools

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Mark Tompsett 2018-09-05 18:41:32 +00:00 committed by Nick Clemens
parent 7de47202f2
commit 78124100ec
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
C4/Creators/Lib.pm
View File

@ -67,7 +67,11 @@ C4::Creators::Lib
sub _SELECT {
my @params = @_;
my $query = "SELECT `$params[0]` FROM $params[1]";
my $fields_list = $params[0];
if (index($fields_list, ' ')==-1 && index($fields_list,',')==-1 && $fields_list ne '*') {
$fields_list = "`$fields_list`";
}
my $query = "SELECT $fields_list FROM $params[1]";
$params[2] ? $query .= " WHERE $params[2];" : $query .= ';';
my $sth = C4::Context->dbh->prepare($query);
# $sth->{'TraceLevel'} = 3;
@ -145,16 +149,25 @@ my $output_formats = [
sub _build_query {
my ( $params, $table ) = @_;
my @fields = exists $params->{fields} ? @{ $params->{fields} } : ();
my $query = "SELECT " . ( @fields ? join(', ', map {"`$_`"} @fields ) : '*' ) . " FROM $table";
my @fields2 = ();
foreach my $field_name (@fields) {
if (index($field_name,' ')==-1 && $field_name ne '*') {
push @fields2, "`$field_name`";
} else {
push @fields2, $field_name;
}
}
@fields = @fields2;
my $query = "SELECT " . ( @fields ? join(', ', @fields ) : '*' ) . " FROM $table";
my @where_args;
if ( exists $params->{filters} ) {
$query .= ' WHERE 1 ';
while ( my ( $field, $values ) = each %{ $params->{filters} } ) {
if ( ref( $values ) ) {
$query .= " AND $field IN ( " . ( ('?,') x (@$values-1) ) . "? ) "; # a comma separates elements in a list...
$query .= " AND `$field` IN ( " . ( ('?,') x (@$values-1) ) . "? ) "; # a comma separates elements in a list...
push @where_args, @$values;
} else {
$query .= " AND $field = ? ";
$query .= " AND `$field` = ? ";
push @where_args, $values;
}
}

2
t/db_dependent/Creators/Lib.t
View File

@ -398,7 +398,7 @@ is( $templates->[0]->{creator}, 'Labels', 'creator is good
$templates = get_all_templates( { filters => { rows => [-42, 7]} } );
is( @$templates, $count, 'There is 1 template matching' );
# With orderby param ------------------
$templates = get_all_templates( { orderby => 'rows DESC' } );
$templates = get_all_templates( { orderby => '`rows` DESC' } );
$query = '
SELECT count(*)