From 652107e2e137cf18cf517d96ee9063660e86d686 Mon Sep 17 00:00:00 2001
From: Thiago Pradi <thiago.pradi@gmail.com>
Date: Sun, 2 Sep 2012 18:56:45 -0300
Subject: ConnectionAdapters::Column.type_cast_code should always convert
 values to integer calling #to_i

---
 .../associations/belongs_to_associations_test.rb   |  6 ++++++
 activerecord/test/cases/column_test.rb             | 24 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 1160d236c9..e7d1893ff3 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -63,6 +63,12 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     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")
diff --git a/activerecord/test/cases/column_test.rb b/activerecord/test/cases/column_test.rb
index ccc57cb876..4fcf8a33a4 100644
--- a/activerecord/test/cases/column_test.rb
+++ b/activerecord/test/cases/column_test.rb
@@ -24,6 +24,30 @@ module ActiveRecord
         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
-- 
cgit v1.2.3