aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-04-08 21:15:15 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-04-08 21:15:15 -0700
commit4861bc62cf4832bcfbaecac9ad9ee73deb172c0c (patch)
treed6afaf91c5aadb93d5cc7b23e58d76eb2fa0ace1
parent136025996196a3c279d9d37a76ce69eb9cc7937b (diff)
downloadrails-4861bc62cf4832bcfbaecac9ad9ee73deb172c0c.tar.gz
rails-4861bc62cf4832bcfbaecac9ad9ee73deb172c0c.tar.bz2
rails-4861bc62cf4832bcfbaecac9ad9ee73deb172c0c.zip
fixing ibm db
-rw-r--r--lib/arel/visitors/ibm_db.rb6
-rw-r--r--test/visitors/test_ibm_db.rb8
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/arel/visitors/ibm_db.rb b/lib/arel/visitors/ibm_db.rb
index a41f8ff573..f1d126790d 100644
--- a/lib/arel/visitors/ibm_db.rb
+++ b/lib/arel/visitors/ibm_db.rb
@@ -3,8 +3,10 @@ module Arel
class IBM_DB < Arel::Visitors::ToSql
private
- def visit_Arel_Nodes_Limit o
- "FETCH FIRST #{visit o.expr } ROWS ONLY"
+ def visit_Arel_Nodes_Limit o, collector
+ collector << "FETCH FIRST "
+ collector = visit o.expr, collector
+ collector << " ROWS ONLY"
end
end
diff --git a/test/visitors/test_ibm_db.rb b/test/visitors/test_ibm_db.rb
index 75f1daff6a..f1aa7612be 100644
--- a/test/visitors/test_ibm_db.rb
+++ b/test/visitors/test_ibm_db.rb
@@ -7,10 +7,14 @@ module Arel
@visitor = IBM_DB.new Table.engine.connection
end
+ def compile node
+ @visitor.accept(node, Collectors::SQLString.new).value
+ end
+
it 'uses FETCH FIRST n ROWS to limit results' do
stmt = Nodes::SelectStatement.new
stmt.limit = Nodes::Limit.new(1)
- sql = @visitor.accept(stmt)
+ sql = compile(stmt)
sql.must_be_like "SELECT FETCH FIRST 1 ROWS ONLY"
end
@@ -20,7 +24,7 @@ module Arel
stmt.relation = table
stmt.limit = Nodes::Limit.new(Nodes.build_quoted(1))
stmt.key = table[:id]
- sql = @visitor.accept(stmt)
+ sql = compile(stmt)
sql.must_be_like "UPDATE \"users\" WHERE \"users\".\"id\" IN (SELECT \"users\".\"id\" FROM \"users\" FETCH FIRST 1 ROWS ONLY)"
end