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 ++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'activerecord/lib')

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.
-- 
cgit v1.2.3