Changeset 4893

Timestamp:

09/01/06 05:31:56 (2 years ago)

Author:

bitsweat

Message:

has_many :through conditions are sanitized by the associating class. Closes #5971.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/association_proxy.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_many_through_association.rb (modified) (1 diff)
• trunk/activerecord/test/associations_join_model_test.rb (modified) (1 diff)
• trunk/activerecord/test/associations_test.rb (modified) (2 diffs)
• trunk/activerecord/test/fixtures/author.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/project.rb (modified) (1 diff)
• trunk/activerecord/test/reflection_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* has_many :through conditions are sanitized by the associating class.  #5971 [martin.emde@gmail.com]
-
-* Tighten rescue clauses.  #5985 [james@grayproductions.net]

trunk/activerecord/lib/active_record/associations/association_proxy.rb

@@ -42 +42 @@
-      
-      def conditions
-active_record
+klass
-      end
-      alias :sql_conditions :conditions

trunk/activerecord/lib/active_record/associations/has_many_through_association.rb

@@ -208 +208 @@
-        def conditions
-          @conditions ||= [
-active_record
-active_record
+klass
+through_reflection.klass
-          ].compact.collect { |condition| "(#{condition})" }.join(' AND ') unless (!@reflection.options[:conditions] && !@reflection.through_reflection.options[:conditions])
-        end

trunk/activerecord/test/associations_join_model_test.rb

@@ -246 +246 @@
-  def test_has_many_find_first
-    assert_equal categories(:general), authors(:david).categories.find(:first)
+  end
+
+  def test_has_many_with_hash_conditions
+    assert_equal categories(:general), authors(:david).categories_like_general.find(:first)
-  end
-  

trunk/activerecord/test/associations_test.rb

@@ -409 +409 @@
-  def test_finding_with_condition
-    assert_equal "Microsoft", Firm.find(:first).clients_like_ms.first.name
+  end
+
+  def test_finding_with_condition_hash
+    assert_equal "Microsoft", Firm.find(:first).clients_like_ms_with_hash_conditions.first.name
-  end
-
@@ -1547 +1551 @@
-    assert_equal 3, projects(:active_record).developers.size
-    assert_equal 1, projects(:active_record).developers_named_david.size
+    assert_equal 1, projects(:active_record).developers_named_david_with_hash_conditions.size
-
-    assert_equal developers(:david), projects(:active_record).developers_named_david.find(developers(:david).id)
+    assert_equal developers(:david), projects(:active_record).developers_named_david_with_hash_conditions.find(developers(:david).id)
-    assert_equal developers(:david), projects(:active_record).salaried_developers.find(developers(:david).id)
-

trunk/activerecord/test/fixtures/author.rb

@@ -37 +37 @@
-  has_many :categorizations
-  has_many :categories, :through => :categorizations
+
+  has_many :categories_like_general, :through => :categorizations, :source => :category, :class_name => 'Category', :conditions => { :name => 'General' }
-
-  has_many :categorized_posts, :through => :categorizations, :source => :post

trunk/activerecord/test/fixtures/project.rb

@@ -4 +4 @@
-  has_and_belongs_to_many :limited_developers, :class_name => "Developer", :limit => 1
-  has_and_belongs_to_many :developers_named_david, :class_name => "Developer", :conditions => "name = 'David'", :uniq => true
+  has_and_belongs_to_many :developers_named_david_with_hash_conditions, :class_name => "Developer", :conditions => { :name => 'David' }, :uniq => true
-  has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0"
-  has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id}'

trunk/activerecord/test/reflection_test.rb

@@ -144 +144 @@
-  
-  def test_reflection_of_all_associations
-4
-2
+5
+3
-    assert_equal 2, Firm.reflect_on_all_associations(:has_one).size
-    assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size