[Rt-commit] [svn] r1374 - in DBIx-SearchBuilder/trunk: . SearchBuilder

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Mon Aug 30 17:39:12 2004
New Revision: 1374

Modified:
   DBIx-SearchBuilder/trunk/Changes
   DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm
Log:

Revision history for Perl extension DBIx::SearchBuilder.

1.10_04 Mon Aug 30 17:33:18 EDT 2004


A query builder fix for an issue that bit RT2: 

 Unsatisfied dependency chain in Joins Users_2 at /usr/local/share/perl/5.8.3/DBIx/SearchBuilder/Handle.pm line 965,  line 69.

Stack:
  [/usr/local/share/perl/5.8.3/DBIx/SearchBuilder/Handle.pm:965]
  [/usr/local/share/perl/5.8.3/DBIx/SearchBuilder.pm:326]
  [/usr/local/share/perl/5.8.3/DBIx/SearchBuilder.pm:119]
  [/usr/local/share/perl/5.8.3/DBIx/SearchBuilder.pm:410]



Modified: DBIx-SearchBuilder/trunk/Changes
==============================================================================
--- DBIx-SearchBuilder/trunk/Changes	(original)
+++ DBIx-SearchBuilder/trunk/Changes	Mon Aug 30 17:39:12 2004
@@ -1,5 +1,19 @@
 Revision history for Perl extension DBIx::SearchBuilder.
 
+1.10_04 Mon Aug 30 17:33:18 EDT 2004
+
+
+A query builder fix for an issue that bit RT2: 
+
+ Unsatisfied dependency chain in Joins Users_2 at /usr/local/share/perl/5.8.3/DBIx/SearchBuilder/Handle.pm line 965,  line 69.
+
+Stack:
+  [/usr/local/share/perl/5.8.3/DBIx/SearchBuilder/Handle.pm:965]
+  [/usr/local/share/perl/5.8.3/DBIx/SearchBuilder.pm:326]
+  [/usr/local/share/perl/5.8.3/DBIx/SearchBuilder.pm:119]
+  [/usr/local/share/perl/5.8.3/DBIx/SearchBuilder.pm:410]
+
+
 1.10_03 Mon Aug 30 14:31:10 EDT 2004
         - Cache Sanity fixes from Autrijus Tang <autrijus at autrijus.org>
 

Modified: DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm	(original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder/Handle.pm	Mon Aug 30 17:39:12 2004
@@ -372,7 +372,6 @@
 
 =cut
 
-## Please see file perltidy.ERR
 sub UpdateRecordValue {
     my $self = shift;
     my %args = ( Table         => undef,
@@ -859,10 +858,7 @@
 
         }
 
-        unless ($alias) {
-            return ( $self->_NormalJoin(%args) );
-        }
-        if ( $args{'ALIAS1'} ) {
+        if ( !$alias || $args{'ALIAS1'} ) {
             return ( $self->_NormalJoin(%args) );
         }
 
@@ -943,8 +939,16 @@
 
     $seen_aliases{'main'} = 1;
 
+   	# We don't want to get tripped up on a dependency on a simple alias. 
+    	foreach my $alias ( @{ $sb->{'aliases'}} ) {
+          if ( $alias =~ /^(.*?)\s+(.*?)$/ ) {
+              $seen_aliases{$2} = 1;
+          }
+    }
+
     my $join_clause = $sb->{'table'} . " main ";
 
+	
     my @keys = ( keys %{ $sb->{'left_joins'} } );
     my %seen;