diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-14 09:47:55 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-14 09:47:55 -0300 |
| commit | 24260dc0c8338aef8e24407e00750fd72a0366ea (patch) | |
| tree | 849b286decba65c1136947ef6f52235335df2383 /activerecord/lib/active_record/associations | |
| parent | 0489f0c582d2ab70595296f058545b102466bebd (diff) | |
| parent | 181cd109d9812d371e2d554a4846f0b2b25b1690 (diff) | |
| download | rails-24260dc0c8338aef8e24407e00750fd72a0366ea.tar.gz rails-24260dc0c8338aef8e24407e00750fd72a0366ea.tar.bz2 rails-24260dc0c8338aef8e24407e00750fd72a0366ea.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index da1fbfe0b7..4672b0723e 100644 --- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -24,8 +24,8 @@ module ActiveRecord def has_primary_key? return @has_primary_key unless @has_primary_key.nil? - @has_primary_key = (ActiveRecord::Base.connection.supports_primary_key? && - ActiveRecord::Base.connection.primary_key(@reflection.options[:join_table])) + @has_primary_key = (@owner.connection.supports_primary_key? && + @owner.connection.primary_key(@reflection.options[:join_table])) end protected |