diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-15 14:24:53 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-15 14:24:53 -0700 |
| commit | 933ea218116645eafaf3b7ea5695520db0f9d9ba (patch) | |
| tree | b07f0365f59ac490ff9e3b30e1c0f19ca6ab638c | |
| parent | 026695ae4068d2714ba5ff77d712b99769bf72e9 (diff) | |
| parent | 47d530218968ca7bfaeab08c561cecf99e880260 (diff) | |
| download | rails-933ea218116645eafaf3b7ea5695520db0f9d9ba.tar.gz rails-933ea218116645eafaf3b7ea5695520db0f9d9ba.tar.bz2 rails-933ea218116645eafaf3b7ea5695520db0f9d9ba.zip | |
Merge pull request #174 from eduardordm/master
Revert fixes involving issue #99 (which makes Arel unusable in large datasets)
| -rw-r--r-- | lib/arel/visitors/oracle.rb | 3 | ||||
| -rw-r--r-- | test/visitors/test_oracle.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/arel/visitors/oracle.rb b/lib/arel/visitors/oracle.rb index 6a58a3cff2..375f7dbfe9 100644 --- a/lib/arel/visitors/oracle.rb +++ b/lib/arel/visitors/oracle.rb @@ -25,8 +25,9 @@ module Arel SELECT * FROM ( SELECT raw_sql_.*, rownum raw_rnum_ FROM (#{sql}) raw_sql_ + WHERE rownum <= #{offset.expr.to_i + limit} ) - WHERE raw_rnum_ >= #{offset.expr.to_i + 1 } and rownum <= #{limit} + WHERE #{visit offset} eosql end diff --git a/test/visitors/test_oracle.rb b/test/visitors/test_oracle.rb index 42bfaadf8a..421e9951e6 100644 --- a/test/visitors/test_oracle.rb +++ b/test/visitors/test_oracle.rb @@ -102,8 +102,9 @@ module Arel SELECT * FROM ( SELECT raw_sql_.*, rownum raw_rnum_ FROM (SELECT) raw_sql_ + WHERE rownum <= 20 ) - WHERE raw_rnum_ >= 11 and rownum <= 10 + WHERE raw_rnum_ > 10 } end |