Merge pull request #7942 from IPGlider/master

Fix typo in inet and cidr saving

2 files changed, 14 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
index 37d43d891d..9d3fa18e3a 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -90,7 +90,7 @@ module ActiveRecord
             else super(value, column)
             end
           when IPAddr
-            return super(value, column) unless ['inet','cidr'].includes? column.sql_type
+            return super(value, column) unless ['inet','cidr'].include? column.sql_type
             PostgreSQLColumn.cidr_to_string(value)
           else
             super(value, column)
diff --git a/activerecord/test/cases/adapters/postgresql/quoting_test.rb b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
index f8a605b67c..685f0ea74f 100644
--- a/activerecord/test/cases/adapters/postgresql/quoting_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+require 'ipaddr'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -20,6 +21,18 @@ module ActiveRecord
           assert_equal 'f', @conn.type_cast(false, c)
         end
 
+        def test_type_cast_cidr
+          ip = IPAddr.new('255.0.0.0/8')
+          c = Column.new(nil, ip, 'cidr')
+          assert_equal ip, @conn.type_cast(ip, c)
+        end
+
+        def test_type_cast_inet
+          ip = IPAddr.new('255.1.0.0/8')
+          c = Column.new(nil, ip, 'inet')
+          assert_equal ip, @conn.type_cast(ip, c)
+        end
+
         def test_quote_float_nan
           nan = 0.0/0
           c = Column.new(nil, 1, 'float')