Permalink
Browse files

Fixed that Base#find will return an array if given an array -- regard…

…less of the number of elements #270 [Marten]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@164 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed Dec 15, 2004
1 parent df28bdd commit 57ed93ee66d99eb2cbcbcab3207fe9a8d293ce85
Showing with 11 additions and 2 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +3 −1 activerecord/lib/active_record/base.rb
  3. +6 −1 activerecord/test/finder_test.rb
View
@@ -1,5 +1,7 @@
*CVS*
+* Fixed that Base#find will return an array if given an array -- regardless of the number of elements #270 [Marten]
+
* Fixed that has_and_belongs_to_many would generate bad sql when naming conventions differed from using vanilla "id" everywhere [RedTerror]
* Added a better exception for when a type column is used in a table without the intention of triggering single-table inheritance. Example:
@@ -234,8 +234,10 @@ class << self # Class methods
# Person.find(1) # returns the object for ID = 1
# Person.find(1, 2, 6) # returns an array for objects with IDs in (1, 2, 6)
# Person.find([7, 17]) # returns an array for objects with IDs in (7, 17)
+ # Person.find([1]) # returns an array for objects the object with ID = 1
# +RecordNotFound+ is raised if no record can be found.
def find(*ids)
+ expects_array = ids.first.kind_of?(Array)
ids = ids.flatten.compact.uniq
if ids.length > 1
@@ -253,7 +255,7 @@ def find(*ids)
sql << " AND #{type_condition}" unless descends_from_active_record?
if record = connection.select_one(sql, "#{name} Find")
- instantiate(record)
+ expects_array ? [instantiate(record)] : instantiate(record)
else
raise RecordNotFound, "Couldn't find #{name} with ID = #{id}"
end
@@ -14,9 +14,14 @@ def test_find
assert_equal(@topic_fixtures["first"]["title"], Topic.find(1).title)
end
+ def test_find_by_array_of_one_id
+ assert_kind_of(Array, Topic.find([ 1 ]))
+ assert_equal(1, Topic.find([ 1 ]).length)
+ end
+
def test_find_by_ids
assert_equal(2, Topic.find(1, 2).length)
- assert_equal(@topic_fixtures["second"]["title"], Topic.find([ 2 ]).title)
+ assert_equal(@topic_fixtures["second"]["title"], Topic.find([ 2 ]).first.title)
end
def test_find_by_ids_missing_one

0 comments on commit 57ed93e

Please sign in to comment.