Merge pull request #18809 from meltheadorable/bugfix/postgres_money

Fix bug causing table creation to fail for models with postgresql 'money' field

3 files changed, 7 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
index a9522e152f..b9078d4c86 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
@@ -76,15 +76,15 @@ module ActiveRecord
           column(name, :point, options)
         end
 
-        def bit(name, options)
+        def bit(name, options = {})
           column(name, :bit, options)
         end
 
-        def bit_varying(name, options)
+        def bit_varying(name, options = {})
           column(name, :bit_varying, options)
         end
 
-        def money(name, options)
+        def money(name, options = {})
           column(name, :money, options)
         end
       end
diff --git a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
index d6b976a6d0..52fa46bd01 100644
--- a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
@@ -13,6 +13,8 @@ class PostgresqlBitStringTest < ActiveRecord::TestCase
     @connection.create_table('postgresql_bit_strings', :force => true) do |t|
       t.bit :a_bit, default: "00000011", limit: 8
       t.bit_varying :a_bit_varying, default: "0011", limit: 4
+      t.bit :another_bit
+      t.bit_varying :another_bit_varying
     end
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/money_test.rb b/activerecord/test/cases/adapters/postgresql/money_test.rb
index 4288f754c0..f5621fd3ec 100644
--- a/activerecord/test/cases/adapters/postgresql/money_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/money_test.rb
@@ -10,8 +10,8 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
     @connection = ActiveRecord::Base.connection
     @connection.execute("set lc_monetary = 'C'")
     @connection.create_table('postgresql_moneys', force: true) do |t|
-      t.column "wealth", "money"
-      t.column "depth", "money", default: "150.55"
+      t.money "wealth"
+      t.money "depth", default: "150.55"
     end
   end