[Jifty-commit] r5692 - Jifty-DBI/branches/tisql/lib/Jifty/DBI
Jifty commits
jifty-commit at lists.jifty.org
Tue Aug 12 03:05:58 EDT 2008
Author: ruz
Date: Tue Aug 12 03:05:57 2008
New Revision: 5692
Modified:
Jifty-DBI/branches/tisql/lib/Jifty/DBI/Handle.pm
Log:
* cross joins may have join criteria too
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 Tue Aug 12 03:05:57 2008
@@ -996,6 +996,12 @@
values %{ $collection->{'joins'} };
my $join_clause = ( $collection->table . " main" )
. CORE::join( " ", map { $_->{alias_string} } @cross );
+ foreach my $j ( grep $_->{'criteria'}, @cross ) {
+ while (my ($k, $v) = each %{ $j->{'criteria'} } ) {
+ $collection->{restrictions}{ $j->{'alias'} . $k } = $v;
+ }
+ delete $j->{'criteria'};
+ }
my %processed = map { $_->{alias} => 1 } @cross;
$processed{'main'} = 1;
More information about the Jifty-commit
mailing list