https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29134
--- Comment #21 from Victor Grousset/tuxayo <[email protected]> --- I can't backport to 20.05.x , help needed if someone needs this patch in 20.05.x and 19.11.x The conflict is on a few lines but they changes a lot between 20.05 and 20.11. Clarification of the conflict format display <<<<<<< HEAD # code from current 20.05.x ======= # code from upstream 20.11.x before the patch ||||||| parent of 123abc123abc # code from upstream 20.11.x after the patch >>>>>>> 123abc123abc Actuall conflict: <<<<<<< HEAD push @where_strs_or, " borrowers.borrowernumber IN ( SELECT DISTINCT borrowernumber FROM borrower_attributes JOIN borrower_attribute_types USING (code) WHERE staff_searchable = 1 AND attribute LIKE ? ) "; push @where_args, $term; ||||||| parent of 3c4c2ebe9d (Bug 29134: Use a subquery to increase performance of patron attributes search) my @matching_borrowernumbers = Koha::Patrons->filter_by_attribute_value($searchmember)->get_column('borrowernumber'); for my $borrowernumber ( @matching_borrowernumbers ) { push @where_strs_or, "borrowers.borrowernumber = ?"; push @where_args, $borrowernumber; } ======= push @where_strs_or, " borrowernumber IN ( SELECT DISTINCT borrowernumber FROM borrower_attributes JOIN borrower_attribute_types USING (code) WHERE staff_searchable = 1 AND attribute LIKE ? ) "; push @where_args, $term; >>>>>>> 3c4c2ebe9d (Bug 29134: Use a subquery to increase performance of patron >>>>>>> attributes search) -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
