diff options
| author | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-02-18 15:08:03 -0800 |
|---|---|---|
| committer | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-02-18 15:08:03 -0800 |
| commit | 2a91d807538a4d39c5755fb83a5e9462e8056fa6 (patch) | |
| tree | 93e7f9439c60231a71c8857478333dfdba7c5e2e /lib/active_relation/relations/join.rb | |
| parent | b0eb6244122a5fd86beaaabb6381835aebb139d4 (diff) | |
| download | rails-2a91d807538a4d39c5755fb83a5e9462e8056fa6.tar.gz rails-2a91d807538a4d39c5755fb83a5e9462e8056fa6.tar.bz2 rails-2a91d807538a4d39c5755fb83a5e9462e8056fa6.zip | |
made descend public; added test coverage for it; tests for qualify are now in terms of descend
Diffstat (limited to 'lib/active_relation/relations/join.rb')
| -rw-r--r-- | lib/active_relation/relations/join.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/active_relation/relations/join.rb b/lib/active_relation/relations/join.rb index 6185293c8a..850a773ee5 100644 --- a/lib/active_relation/relations/join.rb +++ b/lib/active_relation/relations/join.rb @@ -31,6 +31,10 @@ module ActiveRelation end alias_method :aliased_prefix_for, :prefix_for + def descend(&block) + Join.new(join_sql, relation1.descend(&block), relation2.descend(&block), *predicates.collect(&block)) + end + protected def joins right_table_sql = relation2.aggregation?? relation2.to_sql(Sql::Aggregation.new) : relation2.send(:table_sql) @@ -48,9 +52,5 @@ module ActiveRelation def table_sql relation1.aggregation?? relation1.to_sql(Sql::Aggregation.new) : relation1.send(:table_sql) end - - def descend(&block) - Join.new(join_sql, relation1.descend(&block), relation2.descend(&block), *predicates.collect(&block)) - end end end
\ No newline at end of file |