diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 342fa55d89..1f2a363085 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added a join parameter as the third argument to Base.find_first #426 [skaes@web.de] + * Fixed bug in Base#hash method that would treat records with the same string-based id as different [Dave Thomas] * Renamed DateHelper#distance_of_time_in_words_to_now to DateHelper#time_ago_in_words (old method name is still available as a deprecated alias) diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index bba321dd9b..bf36e9815b 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -384,8 +384,8 @@ module ActiveRecord #:nodoc: # be used to create the object. In such cases, it might be beneficial to also specify # +orderings+, like "income DESC, name", to control exactly which record is to be used. Example: # Employee.find_first "income > 50000", "income DESC, name" - def find_first(conditions = nil, orderings = nil) - find_all(conditions, orderings, 1).first + def find_first(conditions = nil, orderings = nil, joins = nil) + find_all(conditions, orderings, 1, joins).first end # Creates an object, instantly saves it as a record (if the validation permits it), and returns it. If the save |