Merge pull request rails#9553 from neerajdotname/7365-mergin-scopes-and-where

7365 merging scopes for where clauses

Author: jonleighton

activerecord/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Previously `Post.active.inactive` used to result in `Post.inactive`
+    since the last where clause used to win while combining scopes.
+    Now all the scopes will be merged using `AND`. Fixes #7365 .
+
+    *Neeraj Singh* and *Jon Leighton*
+
 *   Expand `#cache_key` to consult all relevant updated timestamps.
 
     Previously only `updated_at` column was checked, now it will

activerecord/lib/active_record/scoping/named.rb

@@ -159,10 +159,20 @@ def scope(name, body, &block)
           end
 
           singleton_class.send(:define_method, name) do |*args|
-            options  = body.respond_to?(:call) ? unscoped { body.call(*args) } : body
-            relation = all.merge(options)
+            if body.respond_to?(:call)
+              scope = extension ? body.call(*args).extending(extension) : body.call(*args)
 
-            extension ? relation.extending(extension) : relation
+              if scope
+                default_scoped = scope.default_scoped
+                scope = relation.merge(scope)
+                scope.default_scoped = default_scoped
+              end
+
+            else
+              scope = body
+            end
+
+            scope || all
           end
         end
       end

activerecord/test/cases/named_scope_test.rb

@@ -325,11 +325,11 @@ def test_chaining_should_use_latest_conditions_when_creating
 
   def test_chaining_should_use_latest_conditions_when_searching
     # Normal hash conditions
-    assert_equal Topic.where(:approved => true).to_a, Topic.rejected.approved.to_a
-    assert_equal Topic.where(:approved => false).to_a, Topic.approved.rejected.to_a
+    assert_equal Topic.where(approved: false).where(approved: true).to_a, Topic.rejected.approved.to_a
+    assert_equal Topic.where(approved: true).where(approved: false).to_a, Topic.approved.rejected.to_a
 
     # Nested hash conditions with same keys
-    assert_equal [posts(:sti_comments)], Post.with_special_comments.with_very_special_comments.to_a
+    assert_equal [], Post.with_special_comments.with_very_special_comments.to_a
 
     # Nested hash conditions with different keys
     assert_equal [posts(:sti_comments)], Post.with_special_comments.with_post(4).to_a.uniq