diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-14 02:13:23 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-14 02:13:23 +0530 |
| commit | 74e46e51564b38ee0af70387634e0e4138c31742 (patch) | |
| tree | c5acd2a915cefb8b7b1ca5e5186b96ef575e25d7 /activerecord/lib | |
| parent | 5dc4868962b77858ce477e17dbaf07bb4155d38d (diff) | |
| parent | 23bd340a485d72b1a6d30ad55aeec7d3903e0d79 (diff) | |
| download | rails-74e46e51564b38ee0af70387634e0e4138c31742.tar.gz rails-74e46e51564b38ee0af70387634e0e4138c31742.tar.bz2 rails-74e46e51564b38ee0af70387634e0e4138c31742.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 04314ff562..0efa111d12 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1185,7 +1185,7 @@ module ActiveRecord # has_many :subscribers, :through => :subscriptions, :source => :user # has_many :subscribers, :class_name => "Person", :finder_sql => Proc.new { # %Q{ - # SELECT DISTINCT people.* + # SELECT DISTINCT * # FROM people p, post_subscriptions ps # WHERE ps.post_id = #{id} AND ps.person_id = p.id # ORDER BY p.first_name |