Browse files

Merge pull request #8542 from le0pard/fixed_ar_intrange

AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix #8528 pull request
  • Loading branch information...
2 parents cc74088 + 49182b8 commit 504ed9095810c40b0967802dfbdd347c7e3a4e89 @rafaelfranca rafaelfranca committed Dec 17, 2012
View
15 activerecord/lib/active_record/connection_adapters/postgresql/cast.rb
@@ -97,8 +97,7 @@ def string_to_intrange(string)
nil
elsif "empty" == string
(nil..nil)
- elsif String === string
- matches = /^(\(|\[)([0-9]+),(\s?)([0-9]+)(\)|\])$/i.match(string)
+ elsif String === string && (matches = /^(\(|\[)([0-9]+),(\s?)([0-9]+)(\)|\])$/i.match(string))
lower_bound = ("(" == matches[1] ? (matches[2].to_i + 1) : matches[2].to_i)
upper_bound = (")" == matches[5] ? (matches[4].to_i - 1) : matches[4].to_i)
(lower_bound..upper_bound)
@@ -108,8 +107,16 @@ def string_to_intrange(string)
end
def intrange_to_string(object)
- if Range === object
- "[#{object.first},#{object.exclude_end? ? object.last : object.last.to_i + 1})"
+ if object.nil?
+ nil
+ elsif Range === object
+ if [object.first, object.last].all? { |el| Integer === el }
+ "[#{object.first.to_i},#{object.exclude_end? ? object.last.to_i : object.last.to_i + 1})"
+ elsif [object.first, object.last].all? { |el| NilClass === el }
+ "empty"
+ else
+ nil
+ end
else
object
end
View
19 activerecord/test/cases/adapters/postgresql/intrange_test.rb
@@ -84,4 +84,21 @@ def test_rewrite_to_nil
assert_equal(nil, x.int_range)
end
-end
+ def test_invalid_intrange
+ assert IntRangeDataType.create!(int_range: ('a'..'d'))
+ x = IntRangeDataType.first
+ assert_equal(nil, x.int_range)
+ end
+
+ def test_save_empty_range
+ assert IntRangeDataType.create!(int_range: (nil..nil))
+ x = IntRangeDataType.first
+ assert_equal((nil..nil), x.int_range)
+ end
+
+ def test_save_invalid_data
+ assert_raises(ActiveRecord::StatementInvalid) do
+ IntRangeDataType.create!(int_range: "empty1")
+ end
+ end
+end

0 comments on commit 504ed90

Please sign in to comment.