diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-02-26 11:42:47 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-02-26 11:42:47 -0800 |
commit | ffeb7ddcffa6509f03721ba29ebf16e9be255795 (patch) | |
tree | f3750829f257eef2e2a31777f0af63591ac3796a /activerecord/test/cases/schema_dumper_test.rb | |
parent | 5112a6ccdfb930200d6d476f5e40bfe3d1a6ef33 (diff) | |
parent | 72a4670af1f0362868769a34fc8dd0323d5cf4df (diff) | |
download | rails-ffeb7ddcffa6509f03721ba29ebf16e9be255795.tar.gz rails-ffeb7ddcffa6509f03721ba29ebf16e9be255795.tar.bz2 rails-ffeb7ddcffa6509f03721ba29ebf16e9be255795.zip |
Merge pull request #8010 from subwindow/postgres_inet_default_fix
Fix default output for postgres network address types
Diffstat (limited to 'activerecord/test/cases/schema_dumper_test.rb')
-rw-r--r-- | activerecord/test/cases/schema_dumper_test.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb index bfecc0d1e9..1147b9a09e 100644 --- a/activerecord/test/cases/schema_dumper_test.rb +++ b/activerecord/test/cases/schema_dumper_test.rb @@ -261,22 +261,22 @@ class SchemaDumperTest < ActiveRecord::TestCase def test_schema_dump_includes_inet_shorthand_definition output = standard_dump - if %r{create_table "postgresql_network_address"} =~ output - assert_match %r{t.inet "inet_address"}, output + if %r{create_table "postgresql_network_addresses"} =~ output + assert_match %r{t.inet\s+"inet_address",\s+default: "192.168.1.1"}, output end end def test_schema_dump_includes_cidr_shorthand_definition output = standard_dump - if %r{create_table "postgresql_network_address"} =~ output - assert_match %r{t.cidr "cidr_address"}, output + if %r{create_table "postgresql_network_addresses"} =~ output + assert_match %r{t.cidr\s+"cidr_address",\s+default: "192.168.1.0/24"}, output end end def test_schema_dump_includes_macaddr_shorthand_definition output = standard_dump - if %r{create_table "postgresql_network_address"} =~ output - assert_match %r{t.macaddr "macaddr_address"}, output + if %r{create_table "postgresql_network_addresses"} =~ output + assert_match %r{t.macaddr\s+"mac_address",\s+default: "ff:ff:ff:ff:ff:ff"}, output end end |