1 files changed, 29 insertions, 9 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 6b3d408720..9ff29f1155 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,16 @@
 *Rails 3.1.0 (unreleased)*
 
+* default_scope can take a block, lambda, or any other object which responds to `call` for lazy
+  evaluation:
+
+    default_scope { ... }
+    default_scope lambda { ... }
+    default_scope method(:foo)
+
+  This feature was originally implemented by Tim Morgan, but was then removed in favour of
+  defining a 'default_scope' class method, but has now been added back in by Jon Leighton.
+  The relevant lighthouse ticket is #1812.
+
 * Default scopes are now evaluated at the latest possible moment, to avoid problems where
   scopes would be created which would implicitly contain the default scope, which would then
   be impossible to get rid of via Model.unscoped.
@@ -11,25 +22,34 @@
 
   [Jon Leighton]
 
-* Deprecated support for passing hashes and relations to 'default_scope'. Please create a class
-  method for your scope instead. For example, change this:
+* Calling 'default_scope' multiple times in a class (including when a superclass calls
+  'default_scope') is deprecated. The current behavior is that this will merge the default
+  scopes together:
 
-    class Post < ActiveRecord::Base
+    class Post < ActiveRecord::Base # Rails 3.1
       default_scope where(:published => true)
+      default_scope where(:hidden => false)
+      # The default scope is now: where(:published => true, :hidden => false)
     end
 
-    To this:
+  In Rails 3.2, the behavior will be changed to overwrite previous scopes:
+
+    class Post < ActiveRecord::Base # Rails 3.2
+      default_scope where(:published => true)
+      default_scope where(:hidden => false)
+      # The default scope is now: where(:hidden => false)
+    end
+
+  If you wish to merge default scopes in special ways, it is recommended to define your default
+  scope as a class method and use the standard techniques for sharing code (inheritance, mixins,
+  etc.):
 
     class Post < ActiveRecord::Base
       def self.default_scope
-        where(:published => true)
+        where(:published => true).where(:hidden => false)
       end
     end
 
-  Rationale: It will make the implementation simpler because we can simply use inheritance to
-  handle inheritance scenarios, rather than trying to make up our own rules about what should
-  happen when you call default_scope multiple times or in subclasses.
-
   [Jon Leighton]
 
 * PostgreSQL adapter only supports PostgreSQL version 8.2 and higher.