adding Distinct ON node

1 files changed, 2 insertions, 25 deletions

diff --git a/lib/arel/visitors/postgresql.rb b/lib/arel/visitors/postgresql.rb
index c423dc6fc6..377a65a216 100644
--- a/lib/arel/visitors/postgresql.rb
+++ b/lib/arel/visitors/postgresql.rb
@@ -6,25 +6,6 @@ module Arel
         visit o.expr
       end
 
-      def visit_Arel_Nodes_SelectStatement o
-        if !o.orders.empty? && using_distinct_on?(o)
-          subquery        = o.dup
-          subquery.orders = []
-          subquery.limit  = nil
-          subquery.offset = nil
-
-          sql = super(subquery)
-          [
-            "SELECT * FROM (#{sql}) AS id_list",
-            "ORDER BY #{aliased_orders(o.orders).join(', ')}",
-            (visit(o.limit) if o.limit),
-            (visit(o.offset) if o.offset),
-          ].compact.join ' '
-        else
-          super
-        end
-      end
-
       def visit_Arel_Nodes_Matches o
         "#{visit o.left} ILIKE #{visit o.right}"
       end
@@ -33,12 +14,8 @@ module Arel
         "#{visit o.left} NOT ILIKE #{visit o.right}"
       end
 
-      def using_distinct_on?(o)
-        o.cores.any? do |core|
-          core.projections.any? do |projection|
-            /DISTINCT ON/ === projection
-          end
-        end
+      def visit_Arel_Nodes_DistinctOn o
+        "DISTINCT ON ( #{visit o.expr} )"
       end
 
       def aliased_orders orders