From d6e6e9bd61c00416afdc1491a822a55bee62381f Mon Sep 17 00:00:00 2001 From: Melody Berton Date: Tue, 3 Feb 2015 20:10:36 -0500 Subject: Adds default options hash for postgres money type --- .../active_record/connection_adapters/postgresql/schema_definitions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') 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..04b7147388 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb @@ -84,7 +84,7 @@ module ActiveRecord column(name, :bit_varying, options) end - def money(name, options) + def money(name, options = {}) column(name, :money, options) end end -- cgit v1.2.3 From 17c5379827819a25a0501c4aff90e7d59ac080bd Mon Sep 17 00:00:00 2001 From: Melody Date: Tue, 3 Feb 2015 22:54:36 -0500 Subject: Add default options to 'bit' and 'bit_varying' methods --- .../connection_adapters/postgresql/schema_definitions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord') 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 04b7147388..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,11 +76,11 @@ 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 -- cgit v1.2.3 From 2eeb29a925f440d607801d609124ffc3140c2bba Mon Sep 17 00:00:00 2001 From: Melody Date: Wed, 4 Feb 2015 11:07:08 -0500 Subject: Fix test cases for money, bit and bit_varying --- activerecord/test/cases/adapters/postgresql/bit_string_test.rb | 2 ++ activerecord/test/cases/adapters/postgresql/money_test.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'activerecord') 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 -- cgit v1.2.3