From 52c70d496f34ed4d6c9c8cc1719bc7f86011634b Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Mon, 17 Nov 2014 18:09:40 -0800 Subject: :nail_care: Put escape clause first, keeps @sgrif happy :grin: See comment on 6f7910a --- activerecord/lib/active_record/type/integer.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/type/integer.rb b/activerecord/lib/active_record/type/integer.rb index fb6d9df58f..0149d60b6e 100644 --- a/activerecord/lib/active_record/type/integer.rb +++ b/activerecord/lib/active_record/type/integer.rb @@ -13,7 +13,8 @@ module ActiveRecord end def type_cast_from_database(value) - value.to_i unless value.nil? + return if value.nil? + value.to_i end protected -- cgit v1.2.3