[Bps-public-commit] dbix-searchbuilder branch, distinct-in-join, updated. 1.61-9-g99cafcb

[? sunnavy]

The branch, distinct-in-join has been updated
       via  99cafcb6cca8d4abca545a6c2f4f0a6d73847de5 (commit)
      from  47d75fb2eff108dd31a9fb7438215235130e26e6 (commit)

Summary of changes:
 lib/DBIx/SearchBuilder.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 99cafcb6cca8d4abca545a6c2f4f0a6d73847de5
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Sep 4 21:39:42 2012 +0800

    better option name: joins_are_distinct

diff --git a/lib/DBIx/SearchBuilder.pm b/lib/DBIx/SearchBuilder.pm
index bed0c59..4421970 100755
--- a/lib/DBIx/SearchBuilder.pm
+++ b/lib/DBIx/SearchBuilder.pm
@@ -134,7 +134,7 @@ sub CleanSlate {
     $self->{'first_row'}        = 0;
     $self->{'must_redo_search'} = 1;
     $self->{'show_rows'}        = 0;
-    $self->{'distinct_in_join'} = 1;
+    $self->{'joins_are_distinct'} = 1;
     @{ $self->{'aliases'} } = ();
 
     delete $self->{$_} for qw(
@@ -438,7 +438,7 @@ sub BuildSelectQuery {
         $QueryString .= $clause;
         $QueryString .= $self->_OrderClause;
     }
-    elsif ($self->_isJoined && $self->{'distinct_in_join'}) {
+    elsif ($self->_isJoined && $self->{'joins_are_distinct'}) {
         $self->_DistinctQuery(\$QueryString);
     }
     else {

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