Permalink
Browse files

Merge pull request #7582 from tchandy/fix_type_cast_code

type_cast_code should always convert values to integer calling #to_i
  • Loading branch information...
2 parents 146eaf3 + 652107e commit 924ad60151db70a3a63889a156c4d9f9cfeda431 @rafaelfranca rafaelfranca committed Sep 9, 2012
@@ -1,4 +1,8 @@
## Rails 3.2.9 (unreleased)
+* Fix ConnectionAdapters::Column.type_cast_code integer conversion,
+ to always convert values to integer calling #to_i. Fixes #7509.
+
+ *Thiago Pradi*
* Fix time column type casting for invalid time string values to correctly return nil.
@@ -75,7 +75,7 @@ def type_cast(value)
case type
when :string, :text then value
- when :integer then value.to_i rescue value ? 1 : 0
+ when :integer then value.to_i
when :float then value.to_f
when :decimal then klass.value_to_decimal(value)
when :datetime, :timestamp then klass.string_to_time(value)
@@ -92,7 +92,7 @@ def type_cast_code(var_name)
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})"
@@ -63,6 +63,12 @@ def test_natural_assignment
assert_equal apple.id, citibank.firm_id
end
+ def test_id_assignment
+ apple = Firm.create("name" => "Apple")
+ citibank = Account.create("credit_limit" => 10)
+ assert_raise(NoMethodError) { citibank.firm_id = apple }
+ end
+
def test_natural_assignment_with_primary_key
apple = Firm.create("name" => "Apple")
citibank = Client.create("name" => "Primary key client")
@@ -24,6 +24,30 @@ def test_type_cast_boolean
assert !column.type_cast('off')
assert !column.type_cast('OFF')
end
+
+ def test_type_cast_integer
+ column = Column.new("field", nil, "integer")
+ assert_equal 1, column.type_cast(1)
+ assert_equal 1, column.type_cast('1')
+ assert_equal 1, column.type_cast('1ignore')
+ assert_equal 0, column.type_cast('bad1')
+ assert_equal 0, column.type_cast('bad')
+ assert_equal 1, column.type_cast(1.7)
+ assert_nil column.type_cast(nil)
+ end
+
+ def test_type_cast_non_integer_to_integer
+ column = Column.new("field", nil, "integer")
+ assert_raises(NoMethodError) do
+ column.type_cast([])
+ end
+ assert_raises(NoMethodError) do
+ column.type_cast(true)
+ end
+ assert_raises(NoMethodError) do
+ column.type_cast(false)
+ end
+ end
end
end
end

0 comments on commit 924ad60

Please sign in to comment.