Fix Visitors::PostgreSQL#aliased_orders to handle Ordering nodes.

rails · Jul 6, 2011 · b927452 · b927452
1 parent 5214189
commit b927452
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/arel/visitors/postgresql.rb b/lib/arel/visitors/postgresql.rb
@@ -42,7 +42,7 @@ def using_distinct_on?(o)
       end
 
       def aliased_orders orders
-        #orders = o.orders.map { |x| visit x }.join(', ').split(',')
+        orders = orders.map { |x| visit x }.join(', ').split(',')
         list = []
         orders.each_with_index do |o,i|
           list <<

diff --git a/test/visitors/test_postgres.rb b/test/visitors/test_postgres.rb
@@ -31,6 +31,14 @@ module Visitors
         assert_match(/LIMIT 'omg'/, sql)
         assert_equal 1, sql.scan(/LIMIT/).length, 'should have one limit'
       end
+
+      it 'should alias Ordering nodes when using distinct on' do
+        sm = Arel::SelectManager.new Table.engine, Table.new(:blah)
+        sm.project 'DISTINCT ON (id) id'
+        sm.order(Nodes::Ordering.new(:id, :desc))
+        sql = @visitor.accept(sm.ast)
+        assert_match(/ORDER BY id_list.alias_0 DESC/, sql)
+      end
     end
   end
 end