aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-09 19:31:31 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-09 19:31:31 +0000
commit9d2da04680db202ba006ff66199b345a3f29b2cb (patch)
treecb2707e167905ae9a8639c4650a5bcca5fcf84ac /activerecord/lib/active_record/associations.rb
parent0342393b30e46a5a6433420e9e1b192ec65f8a11 (diff)
downloadrails-9d2da04680db202ba006ff66199b345a3f29b2cb.tar.gz
rails-9d2da04680db202ba006ff66199b345a3f29b2cb.tar.bz2
rails-9d2da04680db202ba006ff66199b345a3f29b2cb.zip
Cache inheritance_column. Closes #6592.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5474 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rwxr-xr-xactiverecord/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 f9713199d5..5921492433 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1170,7 +1170,7 @@ module ActiveRecord
sql << "GROUP BY #{options[:group]} " if options[:group]
- add_order!(sql, options[:order])
+ add_order!(sql, options[:order], scope)
add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
return sanitize_sql(sql)