[open-ils-commits] [GIT] Evergreen ILS branch master updated. 7abdb32ecbfecc3f01016c64b8f3f8faff45a93e

[Evergreen Git]

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, master has been updated
       via  7abdb32ecbfecc3f01016c64b8f3f8faff45a93e (commit)
      from  65a75840f824e104792c8913336e8fa18d358339 (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 7abdb32ecbfecc3f01016c64b8f3f8faff45a93e
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon May 21 14:46:53 2012 -0400

    QueryParser: comma-delimit multiple WITH clauses
    
    Bill Erickson's fix for my breakage of QueryParser.pm for the speedup
    via the WITH common table expression usage inadvertently left out
    the commas required to delimit multiple WITH clauses, resulting in SQL
    query errors.
    
    This fixes that oversight. Note that the fts-replacement.pl script came
    in quite handy for testing this; recommended.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

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 f833a6b..144ee55 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
@@ -746,8 +746,8 @@ sub flatten {
                 $from .= "\n\t\t\tJOIN config.metabib_field AS fe_weight ON (fe_weight.id = fe.field)";
 
                 if ($node->dummy_count < @{$node->only_atoms} ) {
-                    #$with.= "\n\t\t\tWITH ${talias}_xq AS (SELECT ". $node->tsquery ." AS tsq )";
-                    $with.= "${talias}_xq AS (SELECT ". $node->tsquery ." AS tsq )";
+                    $with .= ",\n" if $with;
+                    $with .= "${talias}_xq AS (SELECT ". $node->tsquery ." AS tsq )";
                     $from .= "\n\t\t\tJOIN ${talias}_xq ON (fe.index_vector @@ ${talias}_xq.tsq)";
                 } else {
                     $from .= "\n\t\t\t, (SELECT NULL::tsquery AS tsq ) AS x";

-----------------------------------------------------------------------

Summary of changes:
 .../Application/Storage/Driver/Pg/QueryParser.pm   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS