[Bast-commits] r7484 - DBIx-Class/0.08/trunk/lib/DBIx/Class

ribasushi at dev.catalyst.perl.org ribasushi at dev.catalyst.perl.org
Wed Sep 2 10:25:36 GMT 2009


Author: ribasushi
Date: 2009-09-02 10:25:35 +0000 (Wed, 02 Sep 2009)
New Revision: 7484

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm
Log:
Invoke default_join_type only on undefined types

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm	2009-09-02 10:19:11 UTC (rev 7483)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm	2009-09-02 10:25:35 UTC (rev 7484)
@@ -1237,10 +1237,11 @@
     my $type;
     if ($force_left) {
       $type = 'left';
-    } else {
-      $type = $rel_info->{attrs}{join_type} || '';
-      $force_left = 1 if lc($type) eq 'left';
     }
+    else {
+      $type = $rel_info->{attrs}{join_type};
+      $force_left = 1 if lc($type||'') eq 'left';
+    }
 
     my $rel_src = $self->related_source($join);
     return [ { $as => $rel_src->from,

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm	2009-09-02 10:19:11 UTC (rev 7483)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm	2009-09-02 10:25:35 UTC (rev 7484)
@@ -517,7 +517,7 @@
       $join_type =~ s/^\s+ | \s+$//xg;
     }
 
-    $join_type ||= $self->_default_jointype;
+    $join_type = $self->_default_jointype if not defined $join_type;
 
     my $join_clause = sprintf ('%s JOIN ',
       $join_type ?  ' ' . uc($join_type) : ''




More information about the Bast-commits mailing list