aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/select_manager.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-01-03 10:31:25 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-01-03 10:31:25 -0800
commitd4259c5ce2f6b05226a8b934537678ade1606e97 (patch)
tree9059008ad935fcf93e979a3b057e1fdc19994dc9 /lib/arel/select_manager.rb
parentcefad1e2139c4bba6e45f3281a6d54394aaeb366 (diff)
parent1215c28311aab325c55c083d15cbf3e16599d502 (diff)
downloadrails-d4259c5ce2f6b05226a8b934537678ade1606e97.tar.gz
rails-d4259c5ce2f6b05226a8b934537678ade1606e97.tar.bz2
rails-d4259c5ce2f6b05226a8b934537678ade1606e97.zip
Merge branch '2-0-stable' into merge
* 2-0-stable: updating history Patched Arel v2.0.6 to support MSSQL SQL queries. Based on work of James Abley (https://github.com/jabley/arel). consolidating dot visitor methods refactoring where, fixing subselect implementation for passing a subquery to #in and #not_in tests for passing a subquery to #in and #not_in limit members of the AST are visited quoting limit nodes Conflicts: History.txt lib/arel/nodes.rb lib/arel/nodes/select_core.rb lib/arel/select_manager.rb lib/arel/visitors/to_sql.rb test/visitors/test_to_sql.rb
Diffstat (limited to 'lib/arel/select_manager.rb')
-rw-r--r--lib/arel/select_manager.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index 274633c9db..3e0d4038d7 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -10,7 +10,7 @@ module Arel
end
def limit
- @ast.limit
+ @ast.limit && @ast.limit.expr
end
alias :taken :limit
@@ -137,7 +137,8 @@ module Arel
end
def take limit
- @ast.limit = limit
+ @ast.limit = Nodes::Limit.new(limit)
+ @ctx.top = Nodes::Top.new(limit)
self
end