diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2015-02-04 09:13:55 -0700 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-02-04 09:13:55 -0700 |
commit | e440e8daba74e6d888c0fe0069e07fa38fed469b (patch) | |
tree | 5d693ab5e5c1e5d072ef19cf2567d76697ad3f4c /activerecord/test/cases | |
parent | cd0ed12d1a9edc73be953d700748b5827df890c7 (diff) | |
parent | 2eeb29a925f440d607801d609124ffc3140c2bba (diff) | |
download | rails-e440e8daba74e6d888c0fe0069e07fa38fed469b.tar.gz rails-e440e8daba74e6d888c0fe0069e07fa38fed469b.tar.bz2 rails-e440e8daba74e6d888c0fe0069e07fa38fed469b.zip |
Merge pull request #18809 from meltheadorable/bugfix/postgres_money
Fix bug causing table creation to fail for models with postgresql 'money' field
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/bit_string_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/money_test.rb | 4 |
2 files changed, 4 insertions, 2 deletions
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 |