diff options
-rw-r--r-- | lib/arel/algebra/relations/operations/order.rb | 11 | ||||
-rw-r--r-- | spec/support/model.rb | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/lib/arel/algebra/relations/operations/order.rb b/lib/arel/algebra/relations/operations/order.rb index bf0e0f723c..d91e400419 100644 --- a/lib/arel/algebra/relations/operations/order.rb +++ b/lib/arel/algebra/relations/operations/order.rb @@ -20,17 +20,6 @@ module Arel (orderings + relation.orders).collect { |o| o.bind(self) }.collect { |o| o.to_ordering } end - def engine - engine = relation.engine - - # Temporary check of whether or not the engine supports where. - if engine.respond_to?(:supports) && !engine.supports(:ordering) - Memory::Engine.new - else - engine - end - end - def eval unoperated_rows.sort do |row1, row2| ordering = orders.detect { |o| o.eval(row1, row2) != 0 } || orders.last diff --git a/spec/support/model.rb b/spec/support/model.rb index 969af83cc6..ebcde0ee9a 100644 --- a/spec/support/model.rb +++ b/spec/support/model.rb @@ -13,7 +13,7 @@ module Arel def read(relation) case relation - when Arel::Take + when Arel::Take, Arel::Order relation.eval else @rows.dup.map { |r| Row.new(relation, r) } |