2 files changed, 5 insertions, 0 deletions
diff --git a/lib/arel/tree_manager.rb b/lib/arel/tree_manager.rb
index 21a52d8a60..1adb230991 100644
--- a/lib/arel/tree_manager.rb
+++ b/lib/arel/tree_manager.rb
@@ -4,9 +4,12 @@ module Arel
 
     attr_reader :ast, :engine
 
+    attr_accessor :bind_values
+
     def initialize engine
       @engine = engine
       @ctx    = nil
+      @bind_values = []
     end
 
     def to_dot
diff --git a/lib/arel/visitors/postgresql.rb b/lib/arel/visitors/postgresql.rb
index 080e402e3b..7520a1ccc7 100644
--- a/lib/arel/visitors/postgresql.rb
+++ b/lib/arel/visitors/postgresql.rb
@@ -4,10 +4,12 @@ module Arel
       private
 
       def visit_Arel_Nodes_Matches o, a
+        a = o.left if Arel::Attributes::Attribute === o.left
         "#{visit o.left, a} ILIKE #{visit o.right, a}"
       end
 
       def visit_Arel_Nodes_DoesNotMatch o, a
+        a = o.left if Arel::Attributes::Attribute === o.left
         "#{visit o.left, a} NOT ILIKE #{visit o.right, a}"
       end