From dd8b5fb9d30f355d4eab6376b8d9e025e90b14d3 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Tue, 16 Dec 2014 15:19:47 -0700
Subject: `update_column` take ruby-land input, not database-land input

In the case of serialized columns, we would expect the unserialized
value as input, not the serialized value. The original issue which made
this distinction, #14163, introduced a bug. If you passed serialized
input to the method, it would double serialize when it was sent to the
database. You would see the wrong input upon reloading, or get an error
if you had a specific type on the serialized column.

To put it another way, `update_column` is a special case of
`update_all`, which would take `['a']` and not `['a'].to_yaml`, but you
would not pass data from `params` to it.

Fixes #18037
---
 activerecord/lib/active_record/attribute.rb            | 18 ++++++++++++++++++
 .../lib/active_record/attribute_methods/write.rb       |  2 +-
 activerecord/lib/active_record/attribute_set.rb        |  4 ++++
 3 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/attribute.rb b/activerecord/lib/active_record/attribute.rb
index 8cc1904575..88536eaac0 100644
--- a/activerecord/lib/active_record/attribute.rb
+++ b/activerecord/lib/active_record/attribute.rb
@@ -9,6 +9,10 @@ module ActiveRecord
         FromUser.new(name, value, type)
       end
 
+      def with_cast_value(name, value, type)
+        WithCastValue.new(name, value, type)
+      end
+
       def null(name)
         Null.new(name)
       end
@@ -58,6 +62,10 @@ module ActiveRecord
       self.class.from_database(name, value, type)
     end
 
+    def with_cast_value(value)
+      self.class.with_cast_value(name, value, type)
+    end
+
     def type_cast(*)
       raise NotImplementedError
     end
@@ -93,6 +101,16 @@ module ActiveRecord
       end
     end
 
+    class WithCastValue < Attribute # :nodoc:
+      def type_cast(value)
+        value
+      end
+
+      def changed_in_place_from?(old_value)
+        false
+      end
+    end
+
     class Null < Attribute # :nodoc:
       def initialize(name)
         super(name, nil, Type::Value.new)
diff --git a/activerecord/lib/active_record/attribute_methods/write.rb b/activerecord/lib/active_record/attribute_methods/write.rb
index b3c8209a74..16804f86bf 100644
--- a/activerecord/lib/active_record/attribute_methods/write.rb
+++ b/activerecord/lib/active_record/attribute_methods/write.rb
@@ -73,7 +73,7 @@ module ActiveRecord
         if should_type_cast
           @attributes.write_from_user(attr_name, value)
         else
-          @attributes.write_from_database(attr_name, value)
+          @attributes.write_cast_value(attr_name, value)
         end
 
         value
diff --git a/activerecord/lib/active_record/attribute_set.rb b/activerecord/lib/active_record/attribute_set.rb
index 6b1d7ea79e..66fcaf6945 100644
--- a/activerecord/lib/active_record/attribute_set.rb
+++ b/activerecord/lib/active_record/attribute_set.rb
@@ -39,6 +39,10 @@ module ActiveRecord
       attributes[name] = self[name].with_value_from_user(value)
     end
 
+    def write_cast_value(name, value)
+      attributes[name] = self[name].with_cast_value(value)
+    end
+
     def freeze
       @attributes.freeze
       super
-- 
cgit v1.2.3