From 0472839d684d836e1e7ecd39722c313410d76d5b Mon Sep 17 00:00:00 2001
From: Tristan Dunn <tristanzdunn@gmail.com>
Date: Mon, 10 Aug 2009 00:41:36 +0100
Subject: [PATCH] Prevent overwriting of table name in merging SQL conditions
 [#2949 state:resolved]

---
 activerecord/lib/active_record/base.rb      | 4 +++-
 activerecord/test/cases/named_scope_test.rb | 6 ++++++
 activerecord/test/models/comment.rb         | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 2219edaa3a..c5be561ea3 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2294,10 +2294,12 @@ def expand_hash_conditions_for_aggregates(attrs)
         # And for value objects on a composed_of relationship:
         #   { :address => Address.new("123 abc st.", "chicago") }
         #     # => "address_street='123 abc st.' and address_city='chicago'"
-        def sanitize_sql_hash_for_conditions(attrs, table_name = quoted_table_name)
+        def sanitize_sql_hash_for_conditions(attrs, default_table_name = quoted_table_name)
           attrs = expand_hash_conditions_for_aggregates(attrs)
 
           conditions = attrs.map do |attr, value|
+            table_name = default_table_name
+
             unless value.is_a?(Hash)
               attr = attr.to_s
 
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 2a729f0678..bb2aba9d92 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -368,6 +368,12 @@ def test_named_scopes_batch_finders
       end
     end
   end
+
+  def test_table_names_for_chaining_scopes_with_and_without_table_name_included
+    assert_nothing_raised do
+      Comment.for_first_post.for_first_author.all
+    end
+  end
 end
 
 class DynamicScopeMatchTest < ActiveRecord::TestCase
diff --git a/activerecord/test/models/comment.rb b/activerecord/test/models/comment.rb
index f7f07c103f..399dea9f12 100644
--- a/activerecord/test/models/comment.rb
+++ b/activerecord/test/models/comment.rb
@@ -1,6 +1,10 @@
 class Comment < ActiveRecord::Base
   named_scope :containing_the_letter_e, :conditions => "comments.body LIKE '%e%'"
-  
+  named_scope :for_first_post, :conditions => { :post_id => 1 }
+  named_scope :for_first_author,
+              :joins => :post,
+              :conditions => { "posts.author_id" => 1 }
+
   belongs_to :post, :counter_cache => true
 
   def self.what_are_you
-- 
GitLab