aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-28 06:41:49 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-28 06:41:49 -0700
commit2596aeba5b81d49ae4c31fcdedbf534da5b085bb (patch)
tree812aea77bf42a684233da9a2d3f7dc922576fe98 /activerecord
parent45639950966b36c7a02f7d1c80a717e6150480ec (diff)
parentb6ce2306cdbc5b074b75d5a22d6bfdc83a6a037a (diff)
downloadrails-2596aeba5b81d49ae4c31fcdedbf534da5b085bb.tar.gz
rails-2596aeba5b81d49ae4c31fcdedbf534da5b085bb.tar.bz2
rails-2596aeba5b81d49ae4c31fcdedbf534da5b085bb.zip
Merge pull request #6894 from subbarao/master
fixing typo in active record from method
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index d61df216bc..6f49548aab 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -415,10 +415,10 @@ module ActiveRecord
#
# Can accept other relation objects. For example:
#
- # Topic.select('title').from(Topics.approved)
+ # Topic.select('title').from(Topic.approved)
# # => SELECT title FROM (SELECT * FROM topics WHERE approved = 't') subquery
#
- # Topics.select('a.title').from(Topics.approved, :a)
+ # Topic.select('a.title').from(Topic.approved, :a)
# # => SELECT a.title FROM (SELECT * FROM topics WHERE approved = 't') a
#
def from(value, subquery_name = nil)