diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/deprecated_finders.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 6cc7c245d5..33a874f5b8 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Formally deprecate the deprecated finders. [Koz] + * Formally deprecate rich associations. [Koz] * Fixed that default timezones for new / initialize should uphold utc setting #5709 [daniluk@yahoo.com] diff --git a/activerecord/lib/active_record/deprecated_finders.rb b/activerecord/lib/active_record/deprecated_finders.rb index 6f56bf5581..03b2b3d03f 100644 --- a/activerecord/lib/active_record/deprecated_finders.rb +++ b/activerecord/lib/active_record/deprecated_finders.rb @@ -10,6 +10,7 @@ module ActiveRecord def find_on_conditions(ids, conditions) # :nodoc: find(ids, :conditions => conditions) end + deprecate :find_on_conditions # This method is deprecated in favor of find(:first, options). # @@ -21,6 +22,7 @@ module ActiveRecord def find_first(conditions = nil, orderings = nil, joins = nil) # :nodoc: find(:first, :conditions => conditions, :order => orderings, :joins => joins) end + deprecate :find_first # This method is deprecated in favor of find(:all, options). # @@ -36,6 +38,7 @@ module ActiveRecord limit, offset = limit.is_a?(Array) ? limit : [ limit, nil ] find(:all, :conditions => conditions, :order => orderings, :joins => joins, :limit => limit, :offset => offset) end + deprecate :find_all end end end
\ No newline at end of file |