diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-23 13:25:54 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-23 13:25:54 -0700 |
| commit | 9ca3f4b6b99553e684714637949a7576cedea97a (patch) | |
| tree | 74da54535278ddd8aa2134230e51a973c90b8f11 /lib/arel | |
| parent | 19c6eeb7b08917622e5e4e01175466dd092592d7 (diff) | |
| parent | c78227d9b219933f54cecefb99c72bb231fbb8f2 (diff) | |
| download | rails-9ca3f4b6b99553e684714637949a7576cedea97a.tar.gz rails-9ca3f4b6b99553e684714637949a7576cedea97a.tar.bz2 rails-9ca3f4b6b99553e684714637949a7576cedea97a.zip | |
Merge pull request #121 from ernie/predications-on-grouping
Include Predications in Grouping
Diffstat (limited to 'lib/arel')
| -rw-r--r-- | lib/arel/nodes.rb | 1 | ||||
| -rw-r--r-- | lib/arel/nodes/grouping.rb | 7 | ||||
| -rw-r--r-- | lib/arel/nodes/ordering.rb | 6 | ||||
| -rw-r--r-- | lib/arel/nodes/unary.rb | 1 |
4 files changed, 8 insertions, 7 deletions
diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index 0477591cae..54caea69a1 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -13,6 +13,7 @@ require 'arel/nodes/false' # unary require 'arel/nodes/unary' +require 'arel/nodes/grouping' require 'arel/nodes/ascending' require 'arel/nodes/descending' require 'arel/nodes/unqualified_column' diff --git a/lib/arel/nodes/grouping.rb b/lib/arel/nodes/grouping.rb new file mode 100644 index 0000000000..e7f4bd9cd5 --- /dev/null +++ b/lib/arel/nodes/grouping.rb @@ -0,0 +1,7 @@ +module Arel + module Nodes + class Grouping < Unary + include Arel::Predications + end + end +end diff --git a/lib/arel/nodes/ordering.rb b/lib/arel/nodes/ordering.rb deleted file mode 100644 index efb4d18ae4..0000000000 --- a/lib/arel/nodes/ordering.rb +++ /dev/null @@ -1,6 +0,0 @@ -module Arel - module Nodes - class Ordering < Unary - end - end -end diff --git a/lib/arel/nodes/unary.rb b/lib/arel/nodes/unary.rb index 4688fff623..7828cceae5 100644 --- a/lib/arel/nodes/unary.rb +++ b/lib/arel/nodes/unary.rb @@ -12,7 +12,6 @@ module Arel %w{ Bin Group - Grouping Having Limit Not |