1 files changed, 34 insertions, 11 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/network_test.rb b/activerecord/test/cases/adapters/postgresql/network_test.rb
index 4f4c1103fa..033695518e 100644
--- a/activerecord/test/cases/adapters/postgresql/network_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/network_test.rb
@@ -1,35 +1,51 @@
-# encoding: utf-8
 require "cases/helper"
+require 'support/schema_dumping_helper'
 
 class PostgresqlNetworkTest < ActiveRecord::TestCase
-  class PostgresqlNetworkAddress < ActiveRecord::Base
+  include SchemaDumpingHelper
+  class PostgresqlNetworkAddress < ActiveRecord::Base; end
+
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table('postgresql_network_addresses', force: true) do |t|
+      t.inet 'inet_address', default: "192.168.1.1"
+      t.cidr 'cidr_address', default: "192.168.1.0/24"
+      t.macaddr 'mac_address', default: "ff:ff:ff:ff:ff:ff"
+    end
+  end
+
+  teardown do
+    @connection.drop_table 'postgresql_network_addresses', if_exists: true
   end
 
   def test_cidr_column
     column = PostgresqlNetworkAddress.columns_hash["cidr_address"]
     assert_equal :cidr, column.type
     assert_equal "cidr", column.sql_type
-    assert_not column.number?
-    assert_not column.binary?
-    assert_not column.array
+    assert_not column.array?
+
+    type = PostgresqlNetworkAddress.type_for_attribute("cidr_address")
+    assert_not type.binary?
   end
 
   def test_inet_column
     column = PostgresqlNetworkAddress.columns_hash["inet_address"]
     assert_equal :inet, column.type
     assert_equal "inet", column.sql_type
-    assert_not column.number?
-    assert_not column.binary?
-    assert_not column.array
+    assert_not column.array?
+
+    type = PostgresqlNetworkAddress.type_for_attribute("inet_address")
+    assert_not type.binary?
   end
 
   def test_macaddr_column
     column = PostgresqlNetworkAddress.columns_hash["mac_address"]
     assert_equal :macaddr, column.type
     assert_equal "macaddr", column.sql_type
-    assert_not column.number?
-    assert_not column.binary?
-    assert_not column.array
+    assert_not column.array?
+
+    type = PostgresqlNetworkAddress.type_for_attribute("mac_address")
+    assert_not type.binary?
   end
 
   def test_network_types
@@ -68,4 +84,11 @@ class PostgresqlNetworkTest < ActiveRecord::TestCase
     assert_nil invalid_address.cidr_address_before_type_cast
     assert_nil invalid_address.inet_address_before_type_cast
   end
+
+  def test_schema_dump_with_shorthand
+    output = dump_table_schema("postgresql_network_addresses")
+    assert_match %r{t\.inet\s+"inet_address",\s+default: "192\.168\.1\.1"}, output
+    assert_match %r{t\.cidr\s+"cidr_address",\s+default: "192\.168\.1\.0/24"}, output
+    assert_match %r{t\.macaddr\s+"mac_address",\s+default: "ff:ff:ff:ff:ff:ff"}, output
+  end
 end