aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2014-08-14 08:56:14 -0700
committerZachary Scott <e@zzak.io>2014-08-14 08:56:14 -0700
commitb131978f366c38a269661e158bf53393817d7020 (patch)
treefda25d1a8a43a77709fb090644ccb9b725154887
parent9a7d7624a1e20094fddd0ff90d67e4049c09a568 (diff)
parent006225b01517628421964a038bbded3dc7372a30 (diff)
downloadrails-b131978f366c38a269661e158bf53393817d7020.tar.gz
rails-b131978f366c38a269661e158bf53393817d7020.tar.bz2
rails-b131978f366c38a269661e158bf53393817d7020.zip
Merge pull request #16501 from tomkadwill/update_delete_to_new_style
[ci skip] updated 'where' in association documention to new style syntax
-rw-r--r--activerecord/lib/active_record/associations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 830c633c36..6a1ea9623b 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1209,7 +1209,7 @@ module ActiveRecord
# Option examples:
# has_many :comments, -> { order "posted_on" }
# has_many :comments, -> { includes :author }
- # has_many :people, -> { where("deleted = 0").order("name") }, class_name: "Person"
+ # has_many :people, -> { where(deleted: false).order(:name) }, class_name: "Person"
# has_many :tracks, -> { order "position" }, dependent: :destroy
# has_many :comments, dependent: :nullify
# has_many :tags, as: :taggable