aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-03 15:43:38 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-03 15:43:38 -0800
commit9a44cd1f44197d1c04c4543dd285d9146ddb44d0 (patch)
tree5d85ad7e7282a5a5147ed0ebedba8f9ce8e79c33 /activerecord/lib
parent229042fb73eb5a802d97768a59edb40ccda5c1fa (diff)
parente842dbbdf74c1aec904a6325f1e5d84924b90e94 (diff)
downloadrails-9a44cd1f44197d1c04c4543dd285d9146ddb44d0.tar.gz
rails-9a44cd1f44197d1c04c4543dd285d9146ddb44d0.tar.bz2
rails-9a44cd1f44197d1c04c4543dd285d9146ddb44d0.zip
Merge pull request #8718 from jstirk/column_writer_to_i_errors
Fix undefined method `to_i' introduced since 3.2.8
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/column.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index e6269c78cf..b93a728a39 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -175,7 +175,11 @@ module ActiveRecord
when TrueClass, FalseClass
value ? 1 : 0
else
- value.to_i
+ if value.respond_to?(:to_i)
+ value.to_i
+ else
+ nil
+ end
end
end