adding a bind value collector

3 files changed, 37 insertions, 5 deletions

diff --git a/lib/arel/collectors/bind.rb b/lib/arel/collectors/bind.rb
new file mode 100644
index 0000000000..4309de75c9
--- /dev/null
+++ b/lib/arel/collectors/bind.rb
@@ -0,0 +1,32 @@
+module Arel
+  module Collectors
+    class Bind
+      def initialize
+        @parts = []
+      end
+
+      def << str
+        @parts << str
+        self
+      end
+
+      def add_bind bind
+        @parts << bind
+        self
+      end
+
+      def value; @parts; end
+
+      def substitute_binds bvs
+        bvs = bvs.dup
+        @parts.map do |val|
+          if Arel::Nodes::BindParam === val
+            bvs.shift
+          else
+            val
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/arel/collectors/sql_string.rb b/lib/arel/collectors/sql_string.rb
index 824b0a1712..526de66416 100644
--- a/lib/arel/collectors/sql_string.rb
+++ b/lib/arel/collectors/sql_string.rb
@@ -16,11 +16,8 @@ module Arel
         self
       end
 
-      def start;  self; end
-      def finish; self; end
-
       def add_bind bind
-        self << bind
+        self << bind.to_s
         self
       end
     end
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index fd1332a4db..9cda88454b 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -693,7 +693,10 @@ module Arel
 
       def literal o, collector; collector << o.to_s; end
 
-      alias :visit_Arel_Nodes_BindParam  :literal
+      def visit_Arel_Nodes_BindParam o, collector
+        collector.add_bind o
+      end
+
       alias :visit_Arel_Nodes_SqlLiteral :literal
       alias :visit_Bignum                :literal
       alias :visit_Fixnum                :literal