Merge pull request #174 from eduardordm/master

Revert fixes involving issue #99 (which makes Arel unusable in large datasets) Conflicts: lib/arel/visitors/oracle.rb test/visitors/test_oracle.rb
rails · Mar 15, 2013 · b3c22a5 · b3c22a5
1 parent d3a8fa9
commit b3c22a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/arel/visitors/oracle.rb b/lib/arel/visitors/oracle.rb
@@ -25,8 +25,9 @@ def visit_Arel_Nodes_SelectStatement o
               SELECT * FROM (
                 SELECT raw_sql_.*, rownum raw_rnum_
                 FROM (#{sql}) raw_sql_
+                WHERE rownum <= #{offset.expr.to_i + limit}
               )
-              WHERE raw_rnum_ between #{offset.expr.to_i + 1 } and #{offset.expr.to_i + limit}
+              WHERE #{visit offset}
           eosql
         end
 

diff --git a/test/visitors/test_oracle.rb b/test/visitors/test_oracle.rb
@@ -102,8 +102,9 @@ module Visitors
               SELECT * FROM (
                 SELECT raw_sql_.*, rownum raw_rnum_
                 FROM (SELECT) raw_sql_
+                 WHERE rownum <= 20
               )
-              WHERE raw_rnum_ between 11 and 20
+              WHERE raw_rnum_ > 10
             }
           end