From 2831996483c6a045f1f38d8030256eb58d9771c3 Mon Sep 17 00:00:00 2001 From: Eric Chapweske Date: Sun, 18 Oct 2009 10:22:22 -0500 Subject: Fixed: #without_typecast should only disable typecasting on the duplicated attributes [#3387 state:resolved] Signed-off-by: Joshua Peek --- activerecord/lib/active_record/attributes/typecasting.rb | 6 ++++++ activerecord/test/cases/attributes/typecasting_test.rb | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/activerecord/lib/active_record/attributes/typecasting.rb b/activerecord/lib/active_record/attributes/typecasting.rb index de36a297eb..56c32f9895 100644 --- a/activerecord/lib/active_record/attributes/typecasting.rb +++ b/activerecord/lib/active_record/attributes/typecasting.rb @@ -37,6 +37,12 @@ module ActiveRecord hash.merge!(self) hash end + + def dup # :nodoc: + copy = super + copy.types = types.dup + copy + end # Provides a duplicate with typecasting disabled. # diff --git a/activerecord/test/cases/attributes/typecasting_test.rb b/activerecord/test/cases/attributes/typecasting_test.rb index c712f224b2..8a3b551375 100644 --- a/activerecord/test/cases/attributes/typecasting_test.rb +++ b/activerecord/test/cases/attributes/typecasting_test.rb @@ -86,12 +86,14 @@ class TypecastingTest < ActiveRecord::TestCase end test "without typecasting" do + @attributes.merge!('comments_count' => '5') attributes = @attributes.without_typecast - attributes['comments_count'] = '5' - + assert_equal '5', attributes['comments_count'] + assert_equal 5, @attributes['comments_count'], "Original attributes should typecast" end + test "typecast all attributes" do attributes = @attributes.merge('title' => 'I love sandwiches', 'comments_count' => '5') attributes.typecast! -- cgit v1.2.3