2 files changed, 36 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/money_test.rb b/activerecord/test/cases/adapters/postgresql/money_test.rb
index cf2a4ab6ea..fa5e3cc281 100644
--- a/activerecord/test/cases/adapters/postgresql/money_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/money_test.rb
@@ -70,4 +70,28 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
     money.reload
     assert_equal new_value, money.wealth
   end
+
+  def test_update_all_with_money_string
+    money = PostgresqlMoney.create!
+    PostgresqlMoney.update_all(wealth: "987.65")
+    money.reload
+
+    assert_equal 987.65, money.wealth
+  end
+
+  def test_update_all_with_money_big_decimal
+    money = PostgresqlMoney.create!
+    PostgresqlMoney.update_all(wealth: '123.45'.to_d)
+    money.reload
+
+    assert_equal 123.45, money.wealth
+  end
+
+  def test_update_all_with_money_numeric
+    money = PostgresqlMoney.create!
+    PostgresqlMoney.update_all(wealth: 123.45)
+    money.reload
+
+    assert_equal 123.45, money.wealth
+  end
 end
diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb
index 1192ecd6b4..9b762fc0d5 100644
--- a/activerecord/test/cases/persistence_test.rb
+++ b/activerecord/test/cases/persistence_test.rb
@@ -865,4 +865,16 @@ class PersistenceTest < ActiveRecord::TestCase
     assert_equal 1, post[:wibble]
     assert_nil post.reload[:wibble]
   end
+
+  def test_find_via_reload
+    post = Post.new
+
+    assert post.new_record?
+
+    post.id = 1
+    post.reload
+
+    assert_equal "Welcome to the weblog", post.title
+    assert_not post.new_record?
+  end
 end