2 files changed, 49 insertions, 11 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index 8f78dbecf5..2631b6a939 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -112,13 +112,7 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
     end
 
     def test_type_cast_hstore
-      assert @column
-
-      data = "\"1\"=>\"2\""
-      hash = @column.class.string_to_hstore data
-      assert_equal({'1' => '2'}, hash)
-      assert_equal({'1' => '2'}, @column.type_cast_from_database(data))
-
+      assert_equal({'1' => '2'}, @column.type_cast_from_database("\"1\"=>\"2\""))
       assert_equal({}, @column.type_cast_from_database(""))
       assert_equal({'key'=>nil}, @column.type_cast_from_database('key => NULL'))
       assert_equal({'c'=>'}','"a"'=>'b "a b'}, @column.type_cast_from_database(%q(c=>"}", "\"a\""=>"b \"a b")))
@@ -173,19 +167,19 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
     end
 
     def test_gen1
-      assert_equal(%q(" "=>""), @column.class.hstore_to_string({' '=>''}))
+      assert_equal(%q(" "=>""), @column.cast_type.type_cast_for_database({' '=>''}))
     end
 
     def test_gen2
-      assert_equal(%q(","=>""), @column.class.hstore_to_string({','=>''}))
+      assert_equal(%q(","=>""), @column.cast_type.type_cast_for_database({','=>''}))
     end
 
     def test_gen3
-      assert_equal(%q("="=>""), @column.class.hstore_to_string({'='=>''}))
+      assert_equal(%q("="=>""), @column.cast_type.type_cast_for_database({'='=>''}))
     end
 
     def test_gen4
-      assert_equal(%q(">"=>""), @column.class.hstore_to_string({'>'=>''}))
+      assert_equal(%q(">"=>""), @column.cast_type.type_cast_for_database({'>'=>''}))
     end
 
     def test_parse1
diff --git a/activerecord/test/cases/adapters/postgresql/infinity_test.rb b/activerecord/test/cases/adapters/postgresql/infinity_test.rb
new file mode 100644
index 0000000000..22e8873333
--- /dev/null
+++ b/activerecord/test/cases/adapters/postgresql/infinity_test.rb
@@ -0,0 +1,44 @@
+require "cases/helper"
+
+class PostgresqlInfinityTest < ActiveRecord::TestCase
+  class PostgresqlInfinity < ActiveRecord::Base
+  end
+
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table(:postgresql_infinities) do |t|
+      t.float :float
+      t.datetime :datetime
+    end
+  end
+
+  teardown do
+    @connection.execute("DROP TABLE IF EXISTS postgresql_infinities")
+  end
+
+  test "type casting infinity on a float column" do
+    record = PostgresqlInfinity.create!(float: Float::INFINITY)
+    record.reload
+    assert_equal Float::INFINITY, record.float
+  end
+
+  test "update_all with infinity on a float column" do
+    record = PostgresqlInfinity.create!
+    PostgresqlInfinity.update_all(float: Float::INFINITY)
+    record.reload
+    assert_equal Float::INFINITY, record.float
+  end
+
+  test "type casting infinity on a datetime column" do
+    record = PostgresqlInfinity.create!(datetime: Float::INFINITY)
+    record.reload
+    assert_equal Float::INFINITY, record.datetime
+  end
+
+  test "update_all with infinity on a datetime column" do
+    record = PostgresqlInfinity.create!
+    PostgresqlInfinity.update_all(datetime: Float::INFINITY)
+    record.reload
+    assert_equal Float::INFINITY, record.datetime
+  end
+end