From 51f5bece0867316d035d5d8eeb3a2eb44cf89ad1 Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Thu, 6 Jun 2013 21:33:20 +0900
Subject: Support `columns_for_distinct`
---
lib/arel/visitors/oracle.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'lib/arel/visitors')
diff --git a/lib/arel/visitors/oracle.rb b/lib/arel/visitors/oracle.rb
index b58d7338ef..b6f7b4cc3c 100644
--- a/lib/arel/visitors/oracle.rb
+++ b/lib/arel/visitors/oracle.rb
@@ -8,7 +8,7 @@ module Arel
# if need to select first records without ORDER BY and GROUP BY and without DISTINCT
# then can use simple ROWNUM in WHERE clause
- if o.limit && o.orders.empty? && !o.offset && o.cores.first.projections.first !~ /^DISTINCT /
+ if o.limit && o.orders.empty? && !o.offset && o.cores.first.set_quantifier.class.to_s !~ /Distinct/
o.cores.last.wheres.push Nodes::LessThanOrEqual.new(
Nodes::SqlLiteral.new('ROWNUM'), o.limit.expr
)
@@ -83,7 +83,7 @@ module Arel
return o if o.orders.empty?
return o unless o.cores.any? do |core|
core.projections.any? do |projection|
- /DISTINCT.*FIRST_VALUE/ === projection
+ /FIRST_VALUE/ === projection
end
end
# Previous version with join and split broke ORDER BY clause
--
cgit v1.2.3