4 files changed, 4 insertions, 7 deletions
diff --git a/lib/arel/nodes/lock.rb b/lib/arel/nodes/lock.rb
deleted file mode 100644
index e5fb258e26..0000000000
--- a/lib/arel/nodes/lock.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Arel
-  module Nodes
-    class Lock < Arel::Nodes::Node
-    end
-  end
-end
diff --git a/lib/arel/nodes/named_function.rb b/lib/arel/nodes/named_function.rb
index 56669bf858..5fca33e323 100644
--- a/lib/arel/nodes/named_function.rb
+++ b/lib/arel/nodes/named_function.rb
@@ -3,6 +3,8 @@ module Arel
     class NamedFunction < Arel::Nodes::Function
       attr_accessor :name
 
+      include Arel::Predications
+
       def initialize name, expr, aliaz = nil
         super(expr, aliaz)
         @name = name
diff --git a/lib/arel/nodes/node.rb b/lib/arel/nodes/node.rb
index 711fa34b6d..1a5bc27856 100644
--- a/lib/arel/nodes/node.rb
+++ b/lib/arel/nodes/node.rb
@@ -10,7 +10,7 @@ module Arel
       # Factory method to create a Nodes::Not node that has the recipient of
       # the caller as a child.
       def not
-        Nodes::Not.new Nodes::Grouping.new self
+        Nodes::Not.new self
       end
 
       ###
diff --git a/lib/arel/nodes/unary.rb b/lib/arel/nodes/unary.rb
index e1576b9c99..1b1dcb1053 100644
--- a/lib/arel/nodes/unary.rb
+++ b/lib/arel/nodes/unary.rb
@@ -18,6 +18,7 @@ module Arel
       Offset
       On
       Top
+      Lock
     }.each do |name|
       const_set(name, Class.new(Unary))
     end