Permalink
Browse files

Merge pull request #8204 from nikitug/fix_dynamic_finder_result_check

Use nil? instead of blank? to check dynamic finder result

Conflicts:
	activerecord/CHANGELOG.md
  • Loading branch information...
2 parents aac0320 + b56376b commit e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32 @rafaelfranca rafaelfranca committed Nov 13, 2012
View
10 activerecord/CHANGELOG.md
@@ -1,6 +1,14 @@
## Rails 3.2.10 (unreleased)
-* Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. Fixes #5332.
+* Use `nil?` instead of `blank?` to check whether dynamic finder with a bang
+ should raise RecordNotFound.
+ Fixes #7238.
+
+ *Nikita Afanasenko*
+
+* Fix deleting from a HABTM join table upon destroying an object of a model
+ with optimistic locking enabled.
+ Fixes #5332.
*Nick Rogers*
View
2 activerecord/lib/active_record/relation/finder_methods.rb
@@ -263,7 +263,7 @@ def find_by_attributes(match, attributes, *args)
conditions = Hash[attributes.map {|a| [a, args[attributes.index(a)]]}]
result = where(conditions).send(match.finder)
- if match.bang? && result.blank?
+ if match.bang? && result.nil?
raise RecordNotFound, "Couldn't find #{@klass.name} with #{conditions.to_a.collect {|p| p.join(' = ')}.join(', ')}"
else
yield(result) if block_given?
View
5 activerecord/test/cases/finder_test.rb
@@ -652,6 +652,11 @@ def test_find_by_one_attribute_bang
assert_raise(ActiveRecord::RecordNotFound) { Topic.find_by_title!("The First Topic!") }
end
+ def test_find_by_one_attribute_bang_with_blank_defined
+ blank_topic = BlankTopic.create(:title => "The Blank One")
+ assert_equal blank_topic, BlankTopic.find_by_title!("The Blank One")
+ end
+
def test_find_by_one_attribute_with_order_option
assert_equal accounts(:signals37), Account.find_by_credit_limit(50, :order => 'id')
assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :order => 'id DESC')
View
6 activerecord/test/models/topic.rb
@@ -112,6 +112,12 @@ class ImportantTopic < Topic
serialize :important, Hash
end
+class BlankTopic < Topic
+ def blank?
+ true
+ end
+end
+
module Web
class Topic < ActiveRecord::Base
has_many :replies, :dependent => :destroy, :foreign_key => "parent_id", :class_name => 'Web::Reply'

0 comments on commit e4e2bcc

Please sign in to comment.