0
@@ -1,5 +1,10 @@
0
 *Edge*
0
 
0
+* Allow conditions on multiple tables to be specified using hash. [Pratik Naik]. Example:
0
+
0
+  User.all :joins => :items, :conditions => { :age => 10, :items => { :color => 'black' } }
0
+  Item.first :conditions => { :items => { :color => 'red' } }
0
+
0
 * Always treat integer :limit as byte length.  #420 [Tarmo Tänav]
0
 
0
 * Partial updates don't update lock_version if nothing changed.  #426 [Daniel Morrison]

0
@@ -1999,24 +1999,28 @@ module ActiveRecord #:nodoc:
0
         #     # => "age BETWEEN 13 AND 18"
0
         #   { 'other_records.id' => 7 }
0
         #     # => "`other_records`.`id` = 7"
0
+        #   { :other_records => { :id => 7 } }
0
+        #     # => "`other_records`.`id` = 7"
0
         # And for value objects on a composed_of relationship:
0
         #   { :address => Address.new("123 abc st.", "chicago") }
0
         #     # => "address_street='123 abc st.' and address_city='chicago'"
0
-        def sanitize_sql_hash_for_conditions(attrs)
0
+        def sanitize_sql_hash_for_conditions(attrs, table_name = quoted_table_name)
0
           attrs = expand_hash_conditions_for_aggregates(attrs)
0
 
0
           conditions = attrs.map do |attr, value|
0
-            attr = attr.to_s
0
+            unless value.is_a?(Hash)
0
+              attr = attr.to_s
0
+
0
+              # Extract table name from qualified attribute names.
0
+              if attr.include?('.')
0
+                table_name, attr = attr.split('.', 2)
0
+                table_name = connection.quote_table_name(table_name)
0
+              end
0
 
0
-            # Extract table name from qualified attribute names.
0
-            if attr.include?('.')
0
-              table_name, attr = attr.split('.', 2)
0
-              table_name = connection.quote_table_name(table_name)
0
+              "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}"
0
             else
0
-              table_name = quoted_table_name
0
+              sanitize_sql_hash_for_conditions(value, connection.quote_table_name(attr.to_s))
0
             end
0
-
0
-            "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}"
0
           end.join(' AND ')
0
 
0
           replace_bind_variables(conditions, expand_range_bind_variables(attrs.values))
0
@@ -2070,6 +2074,8 @@ module ActiveRecord #:nodoc:
0
           expanded = []
0
 
0
           bind_vars.each do |var|
0
+            next if var.is_a?(Hash)
0
+
0
             if var.is_a?(Range)
0
               expanded << var.first
0
               expanded << var.last

0
@@ -200,6 +200,23 @@ class FinderTest < ActiveRecord::TestCase
0
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { 'topics.approved' => true }) }
0
   end
0
 
0
+  def test_find_on_hash_conditions_with_hashed_table_name
0
+    assert Topic.find(1, :conditions => {:topics => { :approved => false }})
0
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => {:topics => { :approved => true }}) }
0
+  end
0
+
0
+  def test_find_with_hash_conditions_on_joined_table
0
+    firms = Firm.all :joins => :account, :conditions => {:accounts => { :credit_limit => 50 }}
0
+    assert_equal 1, firms.size
0
+    assert_equal companies(:first_firm), firms.first
0
+  end
0
+
0
+  def test_find_with_hash_conditions_on_joined_table_and_with_range
0
+    firms = DependentFirm.all :joins => :account, :conditions => {:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}
0
+    assert_equal 1, firms.size
0
+    assert_equal companies(:rails_core), firms.first
0
+  end
0
+
0
   def test_find_on_hash_conditions_with_explicit_table_name_and_aggregate
0
     david = customers(:david)
0
     assert Customer.find(david.id, :conditions => { 'customers.name' => david.name, :address => david.address })