aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/nodes
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-05-27 14:25:01 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-05-27 14:25:01 -0700
commit593002080cbcbb6e14acf3bc909aab819811f215 (patch)
tree40c61fb51f9583c7eeaa3a2f6bbb7dedac156af4 /lib/arel/nodes
parent58c3d1d56cf38aebf09e64803441b606680b680a (diff)
parent00d1482fefa1cf9c3753b58f4fe9b580c52ae935 (diff)
downloadrails-593002080cbcbb6e14acf3bc909aab819811f215.tar.gz
rails-593002080cbcbb6e14acf3bc909aab819811f215.tar.bz2
rails-593002080cbcbb6e14acf3bc909aab819811f215.zip
Merge pull request #55 from samuelkadolph/add_predicates_to_function_node
Include Arel::Predicates to Arel::Nodes::Function
Diffstat (limited to 'lib/arel/nodes')
-rw-r--r--lib/arel/nodes/function.rb1
-rw-r--r--lib/arel/nodes/named_function.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/arel/nodes/function.rb b/lib/arel/nodes/function.rb
index 85347fc028..b6f6644678 100644
--- a/lib/arel/nodes/function.rb
+++ b/lib/arel/nodes/function.rb
@@ -2,6 +2,7 @@ module Arel
module Nodes
class Function < Arel::Nodes::Node
include Arel::Expression
+ include Arel::Predications
attr_accessor :expressions, :alias, :distinct
def initialize expr, aliaz = nil
diff --git a/lib/arel/nodes/named_function.rb b/lib/arel/nodes/named_function.rb
index 5fca33e323..56669bf858 100644
--- a/lib/arel/nodes/named_function.rb
+++ b/lib/arel/nodes/named_function.rb
@@ -3,8 +3,6 @@ module Arel
class NamedFunction < Arel::Nodes::Function
attr_accessor :name
- include Arel::Predications
-
def initialize name, expr, aliaz = nil
super(expr, aliaz)
@name = name