1 files changed, 13 insertions, 15 deletions
diff --git a/activerecord/lib/arel/select_manager.rb b/activerecord/lib/arel/select_manager.rb
index 22a04b00c6..ddc9e394dd 100644
--- a/activerecord/lib/arel/select_manager.rb
+++ b/activerecord/lib/arel/select_manager.rb
@@ -146,6 +146,13 @@ module Arel # :nodoc: all
       @ctx.projections = projections
     end
 
+    def optimizer_hints(*hints)
+      unless hints.empty?
+        @ctx.optimizer_hints = Arel::Nodes::OptimizerHints.new(hints)
+      end
+      self
+    end
+
     def distinct(value = true)
       if value
         @ctx.set_quantifier = Arel::Nodes::Distinct.new
@@ -222,10 +229,8 @@ module Arel # :nodoc: all
     def take(limit)
       if limit
         @ast.limit = Nodes::Limit.new(limit)
-        @ctx.top   = Nodes::Top.new(limit)
       else
         @ast.limit = nil
-        @ctx.top   = nil
       end
       self
     end
@@ -239,22 +244,15 @@ module Arel # :nodoc: all
       @ctx.source
     end
 
-    class Row < Struct.new(:data) # :nodoc:
-      def id
-        data["id"]
-      end
-
-      def method_missing(name, *args)
-        name = name.to_s
-        return data[name] if data.key?(name)
-        super
-      end
+    def comment(*values)
+      @ctx.comment = Nodes::Comment.new(values)
+      self
     end
 
     private
-      def collapse(exprs, existing = nil)
-        exprs = exprs.unshift(existing.expr) if existing
-        exprs = exprs.compact.map { |expr|
+      def collapse(exprs)
+        exprs = exprs.compact
+        exprs.map! { |expr|
           if String === expr
             # FIXME: Don't do this automatically
             Arel.sql(expr)