github-migration
/
mysql2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor refactor to casting code to better match what the MysqlAdapter does, removing unneeded checks

This commit is contained in:
Brian Lopez 2010-05-13 00:13:55 -07:00
parent 1f7ff62c8b
commit 6b285dcd85
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/active_record/connection_adapters/mysql2_adapter.rb
View File

@ -54,11 +54,10 @@ module ActiveRecord
case type
when :string then value
when :text then value
when :integer then value.is_a?(Fixnum) ? value : (value.to_i rescue value ? 1 : 0)
when :float then value.class == Float ? value : value.to_f
when :decimal then value.class == BigDecimal ? value : self.class.value_to_decimal(value)
when :datetime then value.class == Time ? value : self.class.string_to_time(value)
when :timestamp then value.class == Time ? value : self.class.string_to_time(value)
when :integer then value.to_i rescue value ? 1 : 0
when :float then value.to_f # returns self if it's already a Float
when :decimal then self.class.value_to_decimal(value)
when :datetime, :timestamp then value.class == Time ? value : self.class.string_to_time(value)
when :time then value.class == Time ? value : self.class.string_to_dummy_time(value)
when :date then value.class == Date ? value : self.class.string_to_date(value)
when :binary then value
@ -71,11 +70,10 @@ module ActiveRecord
case type
when :string then nil
when :text then nil
when :integer then "(#{var_name}.is_a?(Fixnum) ? #{var_name} : (#{var_name}.to_i rescue value ? 1 : 0))"
when :float then "#{var_name}.class == Float ? #{var_name} : #{var_name}.to_f"
when :decimal then "#{var_name}.class == BigDecimal ? #{var_name} : #{self.class.name}.value_to_decimal(#{var_name})"
when :datetime then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_time(#{var_name})"
when :timestamp then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_time(#{var_name})"
when :integer then "#{var_name}.to_i rescue value ? 1 : 0)"
when :float then "#{var_name}.to_f"
when :decimal then "#{self.class.name}.value_to_decimal(#{var_name})"
when :datetime, :timestamp then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_time(#{var_name})"
when :time then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_dummy_time(#{var_name})"
when :date then "#{var_name}.class == Date ? #{var_name} : #{self.class.name}.string_to_date(#{var_name})"
when :binary then nil