aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/preloader.rb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-05-23 23:26:39 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-05-23 23:26:39 +0530
commit91305adef8e94c2bbc3b771747dc0fbb00e3a171 (patch)
tree64ee12feaa67a6ee671091e11ca802e978875546 /activerecord/lib/active_record/associations/preloader.rb
parent9ae0c6678784379de3eab601d9ee39a17955b5e1 (diff)
parent1c94868033c631dcb44d705f70433a64d48e0938 (diff)
downloadrails-91305adef8e94c2bbc3b771747dc0fbb00e3a171.tar.gz
rails-91305adef8e94c2bbc3b771747dc0fbb00e3a171.tar.bz2
rails-91305adef8e94c2bbc3b771747dc0fbb00e3a171.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader.rb')
-rw-r--r--activerecord/lib/active_record/associations/preloader.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb
index fafed94ff2..54705e4950 100644
--- a/activerecord/lib/active_record/associations/preloader.rb
+++ b/activerecord/lib/active_record/associations/preloader.rb
@@ -12,7 +12,7 @@ module ActiveRecord
# and all of its books via a single query:
#
# SELECT * FROM authors
- # LEFT OUTER JOIN books ON authors.id = books.id
+ # LEFT OUTER JOIN books ON authors.id = books.author_id
# WHERE authors.name = 'Ken Akamatsu'
#
# However, this could result in many rows that contain redundant data. After