From 8caaa08ae1cd76b26a89b0d29d50396ffd76882e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 9 Apr 2014 15:56:40 -0700
Subject: push the collectors up to the abstract adapter

---
 .../connection_adapters/abstract_adapter.rb        | 22 ++++++++++++++++++++++
 .../connection_adapters/abstract_mysql_adapter.rb  | 20 --------------------
 .../connection_adapters/sqlite3_adapter.rb         | 20 --------------------
 3 files changed, 22 insertions(+), 40 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters')

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 17f24dc4e0..78343cf4f5 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -6,6 +6,8 @@ require 'active_record/connection_adapters/schema_cache'
 require 'active_record/connection_adapters/abstract/schema_dumper'
 require 'active_record/connection_adapters/abstract/schema_creation'
 require 'monitor'
+require 'arel/collectors/bind'
+require 'arel/collectors/sql_string'
 
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
@@ -105,6 +107,26 @@ module ActiveRecord
         @prepared_statements = false
       end
 
+      class BindCollector < Arel::Collectors::Bind
+        def compile(bvs, conn)
+          super(bvs.map { |bv| conn.quote(*bv.reverse) })
+        end
+      end
+
+      class SQLString < Arel::Collectors::SQLString
+        def compile(bvs, conn)
+          super(bvs)
+        end
+      end
+
+      def collector
+        if @prepared_statements
+          SQLString.new
+        else
+          BindCollector.new
+        end
+      end
+
       def valid_type?(type)
         true
       end
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 4a51bddbdf..75c58ac7d9 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -198,26 +198,6 @@ module ActiveRecord
         end
       end
 
-      class BindCollector < Arel::Collectors::Bind
-        def compile(bvs, conn)
-          super(bvs.map { |bv| conn.quote(*bv.reverse) })
-        end
-      end
-
-      class SQLString < Arel::Collectors::SQLString
-        def compile(bvs, conn)
-          super(bvs)
-        end
-      end
-
-      def collector
-        if @prepared_statements
-          SQLString.new
-        else
-          BindCollector.new
-        end
-      end
-
       def adapter_name #:nodoc:
         self.class::ADAPTER_NAME
       end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 042bf49145..f59c2432dd 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -140,26 +140,6 @@ module ActiveRecord
         end
       end
 
-      class BindCollector < Arel::Collectors::Bind
-        def compile(bvs, conn)
-          super(bvs.map { |bv| conn.quote(*bv.reverse) })
-        end
-      end
-
-      class SQLString < Arel::Collectors::SQLString
-        def compile(bvs, conn)
-          super(bvs)
-        end
-      end
-
-      def collector
-        if @prepared_statements
-          SQLString.new
-        else
-          BindCollector.new
-        end
-      end
-
       def adapter_name #:nodoc:
         'SQLite'
       end
-- 
cgit v1.2.3