aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/nodes
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/nodes
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/nodes')
-rw-r--r--lib/arel/nodes/limit.rb7
-rw-r--r--lib/arel/nodes/select_core.rb3
-rw-r--r--lib/arel/nodes/top.rb6
-rw-r--r--lib/arel/nodes/unary.rb6
4 files changed, 19 insertions, 3 deletions
diff --git a/lib/arel/nodes/limit.rb b/lib/arel/nodes/limit.rb
new file mode 100644
index 0000000000..68ea95daf5
--- /dev/null
+++ b/lib/arel/nodes/limit.rb
@@ -0,0 +1,7 @@
+module Arel
+ module Nodes
+ class Limit < Arel::Nodes::Unary
+ end
+ end
+end
+
diff --git a/lib/arel/nodes/select_core.rb b/lib/arel/nodes/select_core.rb
index 8eb7c0d3e7..7f577e0a05 100644
--- a/lib/arel/nodes/select_core.rb
+++ b/lib/arel/nodes/select_core.rb
@@ -1,11 +1,12 @@
module Arel
module Nodes
class SelectCore < Arel::Nodes::Node
- attr_accessor :projections, :wheres, :groups
+ attr_accessor :top, :projections, :wheres, :groups
attr_accessor :having, :source
def initialize
@source = JoinSource.new nil
+ @top = nil
@projections = []
@wheres = []
@groups = []
diff --git a/lib/arel/nodes/top.rb b/lib/arel/nodes/top.rb
new file mode 100644
index 0000000000..56e2e97e8d
--- /dev/null
+++ b/lib/arel/nodes/top.rb
@@ -0,0 +1,6 @@
+module Arel
+ module Nodes
+ class Top < Arel::Nodes::Unary
+ end
+ end
+end
diff --git a/lib/arel/nodes/unary.rb b/lib/arel/nodes/unary.rb
index f679017597..e1576b9c99 100644
--- a/lib/arel/nodes/unary.rb
+++ b/lib/arel/nodes/unary.rb
@@ -10,12 +10,14 @@ module Arel
end
%w{
- Not
Group
Grouping
- Offset
Having
+ Limit
+ Not
+ Offset
On
+ Top
}.each do |name|
const_set(name, Class.new(Unary))
end