1 files changed, 26 insertions, 4 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/money_test.rb b/activerecord/test/cases/adapters/postgresql/money_test.rb
index bdfeedafab..54cff192c1 100644
--- a/activerecord/test/cases/adapters/postgresql/money_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/money_test.rb
@@ -10,7 +10,7 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
   setup do
     @connection = ActiveRecord::Base.connection
     @connection.execute("set lc_monetary = 'C'")
-    @connection.create_table('postgresql_moneys') do |t|
+    @connection.create_table('postgresql_moneys', force: true) do |t|
       t.column "wealth", "money"
       t.column "depth", "money", default: "150.55"
     end
@@ -26,14 +26,12 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
     assert_equal "money", column.sql_type
     assert_equal 2, column.scale
     assert column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
 
   def test_default
-    column = PostgresqlMoney.columns_hash["depth"]
-    assert_equal BigDecimal.new("150.55"), column.default
+    assert_equal BigDecimal.new("150.55"), PostgresqlMoney.column_defaults['depth']
     assert_equal BigDecimal.new("150.55"), PostgresqlMoney.new.depth
   end
 
@@ -71,4 +69,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