diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-22 13:59:18 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-22 13:59:18 -0300 |
| commit | b343e310970f2dbbee76691bd4ef78983578e9be (patch) | |
| tree | 2913057b0572f51c70630d87e0d40ff0afaea072 /activerecord/test/cases/adapters/postgresql | |
| parent | 71248fc89efe0d73f8dd41bb834917ab469746dd (diff) | |
| parent | 4826a4ab348e59c3ac1f6c31fd73f93eabb91a3b (diff) | |
| download | rails-b343e310970f2dbbee76691bd4ef78983578e9be.tar.gz rails-b343e310970f2dbbee76691bd4ef78983578e9be.tar.bz2 rails-b343e310970f2dbbee76691bd4ef78983578e9be.zip | |
Merge pull request #15249 from sgrif/sg-register-types-in-adapter
Use the generic type map for all PG type registrations
Diffstat (limited to 'activerecord/test/cases/adapters/postgresql')
| -rw-r--r-- | activerecord/test/cases/adapters/postgresql/composite_test.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/composite_test.rb b/activerecord/test/cases/adapters/postgresql/composite_test.rb index f01717d1a7..1f55cce352 100644 --- a/activerecord/test/cases/adapters/postgresql/composite_test.rb +++ b/activerecord/test/cases/adapters/postgresql/composite_test.rb @@ -102,15 +102,7 @@ class PostgresqlCompositeWithCustomOIDTest < ActiveRecord::TestCase def setup super - @registration = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID - @registration.register_type "full_address", FullAddressType.new - end - - def teardown - super - - # there is currently no clean way to unregister a OID::Type - @registration::NAMES.delete("full_address") + @connection.type_map.register_type "full_address", FullAddressType.new end def test_column |