diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-01 23:37:10 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-01 23:37:10 +0000 |
| commit | 7aa9eed88fdfb1a8010c4ca7468e9ebd527494f1 (patch) | |
| tree | e736033782ccfe7fa1baade11be59d589cdb24fd /activerecord | |
| parent | 667d8ea2ea6d3a24009c531fefd6b4a78572ded2 (diff) | |
| download | rails-7aa9eed88fdfb1a8010c4ca7468e9ebd527494f1.tar.gz rails-7aa9eed88fdfb1a8010c4ca7468e9ebd527494f1.tar.bz2 rails-7aa9eed88fdfb1a8010c4ca7468e9ebd527494f1.zip | |
Deprecation: update docs. Closes #5998.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4898 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/README | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index beac6b3940..9b633d5674 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark] + * Add some XmlSerialization tests for ActiveRecord [Rick Olson] * has_many :through conditions are sanitized by the associating class. #5971 [martin.emde@gmail.com] diff --git a/activerecord/README b/activerecord/README index 1be4df6189..265d8cc61e 100755 --- a/activerecord/README +++ b/activerecord/README @@ -264,7 +264,7 @@ Lots of different finders next_angle = Firm.find(1) # SQL: SELECT * FROM companies WHERE id = 1 AND name = 'Next Angle' - next_angle = Company.find_first "name = 'Next Angle'" + next_angle = Company.find(:first, :conditions => "name = 'Next Angle'") next_angle = Firm.find_by_sql("SELECT * FROM companies WHERE id = 1").first diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 65db5f9b23..b2ea56be4c 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -84,7 +84,7 @@ module ActiveRecord # * <tt>Project#portfolio, Project#portfolio=(portfolio), Project#portfolio.nil?</tt> # * <tt>Project#project_manager, Project#project_manager=(project_manager), Project#project_manager.nil?,</tt> # * <tt>Project#milestones.empty?, Project#milestones.size, Project#milestones, Project#milestones<<(milestone),</tt> - # <tt>Project#milestones.delete(milestone), Project#milestones.find(milestone_id), Project#milestones.find_all(conditions),</tt> + # <tt>Project#milestones.delete(milestone), Project#milestones.find(milestone_id), Project#milestones.find(:all, options),</tt> # <tt>Project#milestones.build, Project#milestones.create</tt> # * <tt>Project#categories.empty?, Project#categories.size, Project#categories, Project#categories<<(category1),</tt> # <tt>Project#categories.delete(category1)</tt> |