aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/relations/order.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/arel/relations/order.rb b/lib/arel/relations/order.rb
index b1454973c8..662d3740df 100644
--- a/lib/arel/relations/order.rb
+++ b/lib/arel/relations/order.rb
@@ -1,15 +1,19 @@
module Arel
class Order < Compound
- attr_reader :orders
-
- def initialize(relation, *orders)
- @relation, @orders = relation, orders.collect { |o| o.bind(relation) }
+ attr_reader :orderings
+
+ def initialize(relation, *orderings)
+ @relation, @orderings = relation, orderings.collect { |o| o.bind(relation) }
end
def ==(other)
self.class == other.class and
relation == other.relation and
- orders == other.orders
+ orderings == other.orderings
+ end
+
+ def orders
+ orderings + relation.orders
end
end
end \ No newline at end of file