Changeset 3463

Timestamp:

01/22/06 09:34:41 (3 years ago)

Author:

marcel

Message:

Make dynamic finders honor additional passed in :conditions. Closes #3569.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/test/finder_test.rb (modified) (2 diffs)
• trunk/activerecord/test/fixtures/accounts.yml (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make dynamic finders honor additional passed in :conditions. #3569 [Oleg Pudeyev <pudeyo@rpi.edu>, Marcel Molina Jr.]
-
-* Show a meaningful error when the DB2 adapter cannot be loaded due to missing dependencies. [Nicholas Seckar]

trunk/activerecord/lib/active_record/base.rb

@@ -991 +991 @@
-            conditions = construct_conditions_from_arguments(attribute_names, arguments)
-
-
-
+
+
+
+
+
+
+
+
+
-            else
-              send("find_#{finder}", conditions, *arguments[attribute_names.length..-1]) # deprecated API

trunk/activerecord/test/finder_test.rb

@@ -7 +7 @@
-
-class FinderTest < Test::Unit::TestCase
-
+, :accounts
-
-  def test_find
@@ -201 +201 @@
-  end
-
+  def test_find_by_one_attribute_with_order_option
+    assert_equal accounts(:signals37), Account.find_by_credit_limit(50)
+    assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :order => 'id DESC')
+  end
+
+  def test_find_by_one_attribute_with_conditions
+    assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6])
+  end
+
+  def test_find_by_one_attribute_with_several_options
+    assert_equal accounts(:unknown), Account.find_by_credit_limit(50, :order => 'id DESC', :conditions => ['id != ?', 3])
+  end
+  
-  def test_find_by_one_missing_attribute
-    assert_raises(NoMethodError) { Topic.find_by_undertitle("The First Topic!") }

trunk/activerecord/test/fixtures/accounts.yml

@@ -12 +12 @@
-  firm_id: 6
-  credit_limit: 50
+
+last_account:
+  id: 4
+  firm_id: 2
+  credit_limit: 60