kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #7942 from IPGlider/master

Browse source 
Fix typo in inet and cidr saving
This commit is contained in:
Rafael Mendonça França 2012-10-14 10:44:39 -07:00
commit ae61c03891
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
View file

@ -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)

13
activerecord/test/cases/adapters/postgresql/quoting_test.rb
View file

@ -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')