Skip to content

Commit

Permalink
Fix uniqueness validation with out of range value
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Voronkov committed Apr 8, 2015
1 parent 0a120a8 commit 1a36be3
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 0 deletions.
4 changes: 4 additions & 0 deletions activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
* Uniqueness validation with out of range value fixed

*Andrey Voronkov*

* MySQL: `:charset` and `:collation` support for string and text columns.

Example:
Expand Down
2 changes: 2 additions & 0 deletions activerecord/lib/active_record/validations/uniqueness.rb
Expand Up @@ -76,6 +76,8 @@ def build_relation(klass, table, attribute, value) #:nodoc:
klass.connection.case_sensitive_comparison(table, attribute, column, value)
end
klass.unscoped.where(comparison)
rescue RangeError
klass.none
end

def scope_relation(record, table, relation)
Expand Down
25 changes: 25 additions & 0 deletions activerecord/test/cases/validations/uniqueness_validation_test.rb
Expand Up @@ -34,6 +34,19 @@ class TopicWithUniqEvent < Topic
validates :event, uniqueness: true
end

class BigIntTest < ActiveRecord::Base
PG_MAX_INTEGER = 2147483647
self.table_name = 'cars'
validates :engines_count, uniqueness: true, inclusion: { in: 0..PG_MAX_INTEGER }
end

class BigIntReverseTest < ActiveRecord::Base
PG_MAX_INTEGER = 2147483647
self.table_name = 'cars'
validates :engines_count, inclusion: { in: 0..PG_MAX_INTEGER }
validates :engines_count, uniqueness: true
end

class UniquenessValidationTest < ActiveRecord::TestCase
fixtures :topics, 'warehouse-things'

Expand Down Expand Up @@ -86,6 +99,18 @@ def test_validates_uniqueness_with_validates
assert t2.errors[:title]
end

if current_adapter? :PostgreSQLAdapter
def test_validate_uniqueness_when_integer_out_of_range
entry = BigIntTest.create(engines_count: (BigIntTest::PG_MAX_INTEGER + 1))
assert_equal entry.errors[:engines_count], ['is not included in the list']
end

def test_validate_uniqueness_when_integer_out_of_range_show_order_does_not_matter
entry = BigIntReverseTest.create(engines_count: (BigIntTest::PG_MAX_INTEGER + 1))
assert_equal entry.errors[:engines_count], ['is not included in the list']
end
end

def test_validates_uniqueness_with_newline_chars
Topic.validates_uniqueness_of(:title, :case_sensitive => false)

Expand Down

0 comments on commit 1a36be3

Please sign in to comment.