[Jifty-commit] r7335 - in Jifty-DBI/branches/tisql: lib/Jifty/DBI

[Jifty commits]

Author: ruz
Date: Sat Jul 18 08:34:29 2009
New Revision: 7335

Modified:
   Jifty-DBI/branches/tisql/   (props changed)
   Jifty-DBI/branches/tisql/lib/Jifty/DBI/Handle.pm

Log:
 r7222 at Macintosh:  ruz | 2009-06-10 00:14:50 +0300
 * don't adjust join's type


Modified: Jifty-DBI/branches/tisql/lib/Jifty/DBI/Handle.pm
==============================================================================
--- Jifty-DBI/branches/tisql/lib/Jifty/DBI/Handle.pm	(original)
+++ Jifty-DBI/branches/tisql/lib/Jifty/DBI/Handle.pm	Sat Jul 18 08:34:29 2009
@@ -901,7 +901,7 @@
     my $self = shift;
     my %args = (
         collection  => undef,
-        type        => 'normal',
+        type        => 'CROSS',
         alias1      => 'main',
         column1     => undef,
         table2      => undef,
@@ -971,11 +971,7 @@
     my $meta = $args{'collection'}->{'joins'}{$alias} ||= {};
     $meta->{'table'} = $args{'table2'};
     $meta->{'alias'} = $alias;
-    if ( $args{'type'} =~ /LEFT/i ) {
-        $meta->{'type'} = 'LEFT';
-    } else {
-        $meta->{'type'} = 'CROSS';
-    }
+    $meta->{'type'} = $args{'type'};
     $meta->{'depends_on'}       = [ $args{'alias1'} ];
     $meta->{'is_distinct'}      = $args{'is_distinct'};
     $meta->{'class'}            = $args{'class2'} if $args{'class2'};