Merge pull request #8528 from le0pard/fixed_ar_intrange

AR supporting new int4range and int8range data type on PostgreSQL >= 9.2

1 files changed, 11 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
index 52344f61c0..18ea83ce42 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
@@ -168,6 +168,14 @@ module ActiveRecord
           end
         end
 
+        class IntRange < Type
+          def type_cast(value)
+            return if value.nil?
+
+            ConnectionAdapters::PostgreSQLColumn.string_to_intrange value
+          end
+        end
+
         class TypeMap
           def initialize
             @mapping = {}
@@ -269,6 +277,9 @@ module ActiveRecord
         register_type 'hstore', OID::Hstore.new
         register_type 'json', OID::Json.new
 
+        register_type 'int4range', OID::IntRange.new
+        alias_type 'int8range', 'int4range'
+
         register_type 'cidr', OID::Cidr.new
         alias_type 'inet', 'cidr'
       end