aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-12-07 02:38:47 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-12-07 02:38:47 -0800
commitee5999d14015782ee06a9d03ff4c2f007a52ac66 (patch)
tree949c63aa828c7dd1e66e41b6775e8883f99f1f16 /activerecord/lib/active_record/relation
parentaf73e3cb15c966129221009f1de35dea8de6578e (diff)
parent74e3f3005c3212443d75c9bdcf49667087651fab (diff)
downloadrails-ee5999d14015782ee06a9d03ff4c2f007a52ac66.tar.gz
rails-ee5999d14015782ee06a9d03ff4c2f007a52ac66.tar.bz2
rails-ee5999d14015782ee06a9d03ff4c2f007a52ac66.zip
Merge pull request #8445 from claudiob/match_rdoc_with_6ba0f97
Update #where rdoc to match 6ba0f97 [ci skip]
Diffstat (limited to 'activerecord/lib/active_record/relation')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 256a7e839f..ad9ed98382 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -432,9 +432,9 @@ module ActiveRecord
# User.joins(:posts).where({ "posts.published" => true })
# User.joins(:posts).where({ posts: { published: true } })
#
- # === no argument or nil
+ # === no argument or :chain
#
- # If no argument or nil is passed, #where returns a new instance of WhereChain which, when
+ # If no argument or :chain is passed, #where returns a new instance of WhereChain which, when
# chained with either #not, #like, or #not_like, returns a new relation.
#
# User.where.not(name: "Jon")
@@ -448,9 +448,9 @@ module ActiveRecord
#
# See WhereChain for more details on #not, #like, and #not_like.
#
- # === empty condition
+ # === blank condition
#
- # If the condition is any other blank-ish object than nil, then where is a # no-op and returns
+ # If the condition is any blank-ish object, then #where is a no-op and returns
# the current relation.
def where(opts = :chain, *rest)
if opts == :chain