From 7eed50c7208a1b605e6ad04e877a3cbeb7cc3434 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Mon, 29 Dec 2014 10:57:15 -0700
Subject: Rely on the injectable type caster for `arel_table`

This API will require much less consuming code to change to accomodate
the removal of automatic type casting from Arel. As long as the
predicates are constructed using the `arel_table` off of an AR subclass,
there will be no changes that need to happen.
---
 .../relation/predicate_builder/array_handler.rb          |  7 +------
 .../relation/predicate_builder/basic_object_handler.rb   |  1 -
 .../relation/predicate_builder/range_handler.rb          | 16 ----------------
 3 files changed, 1 insertion(+), 23 deletions(-)

(limited to 'activerecord/lib/active_record/relation/predicate_builder')

diff --git a/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
index 7c90563d96..4b5f5773a0 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/array_handler.rb
@@ -19,12 +19,7 @@ module ActiveRecord
           case values.length
           when 0 then NullPredicate
           when 1 then predicate_builder.build(attribute, values.first)
-          else
-            attribute_name = attribute.name
-            casted_values = values.map do |v|
-              predicate_builder.type_cast_for_database(attribute_name, v)
-            end
-            attribute.in(casted_values)
+          else attribute.in(values)
           end
 
         unless nils.empty?
diff --git a/activerecord/lib/active_record/relation/predicate_builder/basic_object_handler.rb b/activerecord/lib/active_record/relation/predicate_builder/basic_object_handler.rb
index 57a8b63001..6cec75dc0a 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/basic_object_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/basic_object_handler.rb
@@ -6,7 +6,6 @@ module ActiveRecord
       end
 
       def call(attribute, value)
-        value = predicate_builder.type_cast_for_database(attribute.name, value)
         attribute.eq(value)
       end
 
diff --git a/activerecord/lib/active_record/relation/predicate_builder/range_handler.rb b/activerecord/lib/active_record/relation/predicate_builder/range_handler.rb
index a6638738fa..1b3849e3ad 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/range_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/range_handler.rb
@@ -6,11 +6,6 @@ module ActiveRecord
       end
 
       def call(attribute, value)
-        value = QuotedRange.new(
-          predicate_builder.type_cast_for_database(attribute.name, value.begin),
-          predicate_builder.type_cast_for_database(attribute.name, value.end),
-          value.exclude_end?,
-        )
         attribute.between(value)
       end
 
@@ -18,16 +13,5 @@ module ActiveRecord
 
       attr_reader :predicate_builder
     end
-
-    class QuotedRange # :nodoc:
-      attr_reader :begin, :end, :exclude_end
-      alias_method :exclude_end?, :exclude_end
-
-      def initialize(begin_val, end_val, exclude)
-        @begin = begin_val
-        @end = end_val
-        @exclude_end = exclude
-      end
-    end
   end
 end
-- 
cgit v1.2.3