diff options
| author | Ernie Miller <ernie@metautonomo.us> | 2010-05-21 11:45:12 -0400 |
|---|---|---|
| committer | Ernie Miller <ernie@metautonomo.us> | 2010-05-21 11:45:12 -0400 |
| commit | 43bfd3fae496a2a859aad0a654a91437357c3450 (patch) | |
| tree | bd95f3b7add4ba7841a6fa9dd717de9c60ea90a8 /lib/arel/engines/memory | |
| parent | d144b8d5af11c819b8f70a97006998bf89ee926c (diff) | |
| download | rails-43bfd3fae496a2a859aad0a654a91437357c3450.tar.gz rails-43bfd3fae496a2a859aad0a654a91437357c3450.tar.bz2 rails-43bfd3fae496a2a859aad0a654a91437357c3450.zip | |
Fix tests to work properly on Ruby 1.9, honor multiple calls to #order in memory engine, and make having clauses behave like where clauses in SQL engine (join with AND, allow multiple calls to having to add predicates)
Diffstat (limited to 'lib/arel/engines/memory')
| -rw-r--r-- | lib/arel/engines/memory/relations/operations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb index 55b4dcb677..75777a0c7f 100644 --- a/lib/arel/engines/memory/relations/operations.rb +++ b/lib/arel/engines/memory/relations/operations.rb @@ -8,7 +8,7 @@ module Arel class Order < Compound def eval unoperated_rows.sort do |row1, row2| - ordering = orderings.detect { |o| o.eval(row1, row2) != 0 } || orderings.last + ordering = orders.detect { |o| o.eval(row1, row2) != 0 } || orders.last ordering.eval(row1, row2) end end |