From f7b8fbd4b12e07d94b2fbd23b07e8dd9c3f0e702 Mon Sep 17 00:00:00 2001
From: Dan Seaver <git@danseaver.com>
Date: Sat, 5 May 2012 13:51:01 -0400
Subject: Adds migration and schema dump support for INET, CIDR, and MACADDR

---
 .../connection_adapters/postgresql_adapter.rb      | 27 ++++++++++++++++++----
 .../cases/adapters/postgresql/datatype_test.rb     |  6 ++---
 activerecord/test/cases/schema_dumper_test.rb      | 21 +++++++++++++++++
 3 files changed, 47 insertions(+), 7 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 4d5459939b..c68c08a488 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -197,6 +197,13 @@ module ActiveRecord
           :decimal
         when 'hstore'
           :hstore
+        # Network address types
+        when 'inet'
+          :inet
+        when 'cidr'
+          :cidr
+        when 'macaddr'
+          :macaddr
         # Character types
         when /^(?:character varying|bpchar)(?:\(\d+\))?$/
           :string
@@ -211,9 +218,6 @@ module ActiveRecord
         # Geometric types
         when /^(?:point|line|lseg|box|"?path"?|polygon|circle)$/
           :string
-        # Network address types
-        when /^(?:cidr|inet|macaddr)$/
-          :string
         # Bit strings
         when /^bit(?: varying)?(?:\(\d+\))?$/
           :string
@@ -282,6 +286,18 @@ module ActiveRecord
         def hstore(name, options = {})
           column(name, 'hstore', options)
         end
+
+        def inet(name, options = {})
+          column(name, 'inet', options)
+        end
+
+        def cidr(name, options = {})
+          column(name, 'cidr', options)
+        end
+
+        def macaddr(name, options = {})
+          column(name, 'macaddr', options)
+        end
       end
 
       ADAPTER_NAME = 'PostgreSQL'
@@ -301,7 +317,10 @@ module ActiveRecord
         :boolean     => { :name => "boolean" },
         :xml         => { :name => "xml" },
         :tsvector    => { :name => "tsvector" },
-        :hstore      => { :name => "hstore" }
+        :hstore      => { :name => "hstore" },
+        :inet        => { :name => "inet" },
+        :cidr        => { :name => "cidr" },
+        :macaddr     => { :name => "macaddr" }
       }
 
       # Returns 'PostgreSQL' as adapter name for identification purposes.
diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index ce08e4c6a7..d42f1ff5a1 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -86,9 +86,9 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
   end
 
   def test_data_type_of_network_address_types
-    assert_equal :string, @first_network_address.column_for_attribute(:cidr_address).type
-    assert_equal :string, @first_network_address.column_for_attribute(:inet_address).type
-    assert_equal :string, @first_network_address.column_for_attribute(:mac_address).type
+    assert_equal :cidr, @first_network_address.column_for_attribute(:cidr_address).type
+    assert_equal :inet, @first_network_address.column_for_attribute(:inet_address).type
+    assert_equal :macaddr, @first_network_address.column_for_attribute(:mac_address).type
   end
 
   def test_data_type_of_bit_string_types
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index 15ceaa1fcc..ab80dd1d6d 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -236,6 +236,27 @@ class SchemaDumperTest < ActiveRecord::TestCase
       end
     end
 
+    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
+      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
+      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
+      end
+    end
+
     def test_schema_dump_includes_hstores_shorthand_definition
       output = standard_dump
       if %r{create_table "postgresql_hstores"} =~ output
-- 
cgit v1.2.3