aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-01-28 17:39:38 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-01-28 17:39:38 -0800
commit72c18189410513bbf474cb9d678b14d2e3591cc5 (patch)
treee20c277d633088e4e9b6fc13b21e00afdd9550cd /activerecord/lib/active_record/connection_adapters
parentfa779c5357fd9396644ffc46e8ec575444f2f029 (diff)
downloadrails-72c18189410513bbf474cb9d678b14d2e3591cc5.tar.gz
rails-72c18189410513bbf474cb9d678b14d2e3591cc5.tar.bz2
rails-72c18189410513bbf474cb9d678b14d2e3591cc5.zip
use an identity conversion to avoid conditional codes
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 60ccf9edf3..1a5d0c2f6d 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -87,8 +87,8 @@ module ActiveRecord
def type_cast_code(var_name)
case type
- when :string then nil
- when :text then nil
+ when :string then var_name
+ when :text then var_name
when :integer then "(#{var_name}.to_i rescue #{var_name} ? 1 : 0)"
when :float then "#{var_name}.to_f"
when :decimal then "#{self.class.name}.value_to_decimal(#{var_name})"