[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. 4ecfa5931e5391b09b996790b746794625e2b250
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 15 23:13:53 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_3 has been updated
via 4ecfa5931e5391b09b996790b746794625e2b250 (commit)
from 483e19a42750ca5e9db224d6ccf62e58e33a92b3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4ecfa5931e5391b09b996790b746794625e2b250
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Tue Aug 14 13:31:27 2012 -0400
Join subqueries as OR'd groups in QueryParser
This makes filter_group_entry(1,2,3) build an OR'd set of the resulting
queries instead of just tacking them onto each other as ANDs.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
index 669bf20..cbfd99c 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
@@ -13,15 +13,17 @@ my ${spc} = ' ' x 2;
sub subquery_callback {
my ($invocant, $self, $struct, $filter, $params, $negate) = @_;
- return join(
- ' ',
- map {
- $_->query_text
- } @{
- OpenILS::Utils::CStoreEditor
- ->new
- ->search_actor_search_query({ id => $params })
- }
+ return sprintf(' ((%s)) ',
+ join(
+ ') || (',
+ map {
+ $_->query_text
+ } @{
+ OpenILS::Utils::CStoreEditor
+ ->new
+ ->search_actor_search_query({ id => $params })
+ }
+ )
);
}
-----------------------------------------------------------------------
Summary of changes:
.../Application/Storage/Driver/Pg/QueryParser.pm | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list