diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-03 13:40:00 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-03 13:40:00 -0800 |
commit | a846eef9110c39e5d0f48df9a4a6948545f6cfe5 (patch) | |
tree | ea759f0b07a6b91ce1d78e8007bf13f60e20dc8b /test/visitors | |
parent | 90be95a0aba12787882d9821d9a4d5f00781beb6 (diff) | |
parent | b035def39a8b4966fd33779bd5a2a9d0c9a33e66 (diff) | |
download | rails-a846eef9110c39e5d0f48df9a4a6948545f6cfe5.tar.gz rails-a846eef9110c39e5d0f48df9a4a6948545f6cfe5.tar.bz2 rails-a846eef9110c39e5d0f48df9a4a6948545f6cfe5.zip |
Merge branch '2-0-stable'
* 2-0-stable:
fixing tests for oracle visitor
fisting lots of oracle errors
Diffstat (limited to 'test/visitors')
-rw-r--r-- | test/visitors/test_oracle.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/visitors/test_oracle.rb b/test/visitors/test_oracle.rb index 2c9bba15d8..c6fcb7134c 100644 --- a/test/visitors/test_oracle.rb +++ b/test/visitors/test_oracle.rb @@ -59,7 +59,7 @@ module Arel describe 'limit' do it 'adds a rownum clause' do stmt = Nodes::SelectStatement.new - stmt.limit = 10 + stmt.limit = Nodes::Limit.new(10) sql = @visitor.accept stmt sql.must_be_like %{ SELECT WHERE ROWNUM <= 10 } end @@ -67,7 +67,7 @@ module Arel it 'is idempotent' do stmt = Nodes::SelectStatement.new stmt.orders << Nodes::SqlLiteral.new('foo') - stmt.limit = 10 + stmt.limit = Nodes::Limit.new(10) sql = @visitor.accept stmt sql2 = @visitor.accept stmt sql.must_equal sql2 @@ -76,7 +76,7 @@ module Arel it 'creates a subquery when there is order_by' do stmt = Nodes::SelectStatement.new stmt.orders << Nodes::SqlLiteral.new('foo') - stmt.limit = 10 + stmt.limit = Nodes::Limit.new(10) sql = @visitor.accept stmt sql.must_be_like %{ SELECT * FROM (SELECT ORDER BY foo) WHERE ROWNUM <= 10 @@ -86,7 +86,7 @@ module Arel it 'creates a subquery when there is DISTINCT' do stmt = Nodes::SelectStatement.new stmt.cores.first.projections << Nodes::SqlLiteral.new('DISTINCT id') - stmt.limit = 10 + stmt.limit = Arel::Nodes::Limit.new(10) sql = @visitor.accept stmt sql.must_be_like %{ SELECT * FROM (SELECT DISTINCT id) WHERE ROWNUM <= 10 @@ -95,7 +95,7 @@ module Arel it 'creates a different subquery when there is an offset' do stmt = Nodes::SelectStatement.new - stmt.limit = 10 + stmt.limit = Nodes::Limit.new(10) stmt.offset = Nodes::Offset.new(10) sql = @visitor.accept stmt sql.must_be_like %{ @@ -110,7 +110,7 @@ module Arel it 'is idempotent with different subquery' do stmt = Nodes::SelectStatement.new - stmt.limit = 10 + stmt.limit = Nodes::Limit.new(10) stmt.offset = Nodes::Offset.new(10) sql = @visitor.accept stmt sql2 = @visitor.accept stmt |