From 70bd5eb4bb8d4b0e285bacb397f0ce39e9d5d1d1 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 9 Apr 2014 15:20:56 -0700
Subject: fix bind collecting for mysql

---
 .../connection_adapters/abstract_mysql_adapter.rb  | 24 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 7c8f020065..88c90b06bf 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -193,11 +193,31 @@ module ActiveRecord
         @connection_options, @config = connection_options, config
         @quoted_column_names, @quoted_table_names = {}, {}
 
+        @visitor = Arel::Visitors::MySQL.new self
+
         if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
           @prepared_statements = true
-          @visitor = Arel::Visitors::MySQL.new self
         else
-          @visitor = unprepared_visitor
+          @prepared_statements = false
+        end
+      end
+
+      class BindCollector < Arel::Collectors::Bind
+        def initialize(conn)
+          @conn = conn
+          super()
+        end
+
+        def compile(bvs)
+          super(bvs.map { |bv| @conn.quote(*bv.reverse) })
+        end
+      end
+
+      def collector
+        if @prepared_statements
+          Arel::Collectors::SQLString.new
+        else
+          BindCollector.new self
         end
       end
 
-- 
cgit v1.2.3