1 files changed, 52 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index e536d2b408..93eb42a52c 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,57 @@
 *Rails 3.1.0 (unreleased)*
 
+* Passing a proc (or other object that responds to #call) to scope is deprecated. If you need your
+  scope to be lazily evaluated, or takes parameters, please define it as a normal class method
+  instead. For example, change this:
+
+    class Post < ActiveRecord::Base
+      scope :unpublished, lambda { where('published_at > ?', Time.now) }
+    end
+
+  To this:
+
+    class Post < ActiveRecord::Base
+      def self.unpublished
+        where('published_at > ?', Time.now)
+      end
+    end
+
+  [Jon Leighton]
+
+* 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.
+
+  Note that this means that if you are inspecting the internal structure of an
+  ActiveRecord::Relation, it will *not* contain the default scope, though the resulting
+  query will do. You can get a relation containing the default scope by calling
+  ActiveRecord#with_default_scope, though this is not part of the public API.
+
+  [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:
+
+    class Post < ActiveRecord::Base
+      default_scope where(:published => true)
+    end
+
+    To this:
+
+    class Post < ActiveRecord::Base
+      def self.default_scope
+        where(:published => true)
+      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.
+
 * ConnectionManagement middleware is changed to clean up the connection pool
   after the rack body has been flushed.