diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-12 20:35:40 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-12 20:35:40 -0700 |
| commit | c4b857299b3322572b006d825bb9dc9912101e99 (patch) | |
| tree | ddf29c32b4f3231b771b8fe1bfeecbaa55781294 /activerecord | |
| parent | 9641cdd88478fa5369def216de0718c3fb139f92 (diff) | |
| parent | d4b3fdb00314857ee0b402d880d3b0d1c18e5989 (diff) | |
| download | rails-c4b857299b3322572b006d825bb9dc9912101e99.tar.gz rails-c4b857299b3322572b006d825bb9dc9912101e99.tar.bz2 rails-c4b857299b3322572b006d825bb9dc9912101e99.zip | |
Merge pull request #7623 from tchandy/master
update ConnectionAdapter::Column#type_cast_code to be compatible with rails 3.2 branch
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/column.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb index 0390168461..816b5e17c1 100644 --- a/activerecord/lib/active_record/connection_adapters/column.rb +++ b/activerecord/lib/active_record/connection_adapters/column.rb @@ -114,7 +114,7 @@ module ActiveRecord case type when :string, :text then var_name - when :integer then "(#{var_name}.to_i rescue #{var_name} ? 1 : 0)" + when :integer then "(#{var_name}.to_i)" when :float then "#{var_name}.to_f" when :decimal then "#{klass}.value_to_decimal(#{var_name})" when :datetime, :timestamp then "#{klass}.string_to_time(#{var_name})" |