aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activerecord/lib/active_record/null_relation.rb2
-rw-r--r--activerecord/lib/active_record/relation.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb
index aca8291d75..741ec31646 100644
--- a/activerecord/lib/active_record/null_relation.rb
+++ b/activerecord/lib/active_record/null_relation.rb
@@ -2,7 +2,7 @@
module ActiveRecord
# = Active Record Null Relation
- module NullRelation
+ module NullRelation # :nodoc:
def exec_queries
@records = []
end
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 6f8f3259a4..cc03ebf5d6 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -490,9 +490,9 @@ module ActiveRecord
@to_sql ||= klass.connection.to_sql(arel, bind_values.dup)
end
- # Returns an hash of where conditions
+ # Returns a hash of where conditions
#
- # Users.where(name: 'Oscar').to_sql
+ # Users.where(name: 'Oscar').where_values_hash
# # => {:name=>"oscar"}
def where_values_hash
equalities = with_default_scope.where_values.grep(Arel::Nodes::Equality).find_all { |node|
@@ -550,7 +550,7 @@ module ActiveRecord
end
end
- # Returns true if relation is blank>
+ # Returns true if relation is blank.
def blank?
to_a.blank?
end