diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-05-26 12:54:38 -0700 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-05-26 12:54:38 -0700 |
commit | 09e431aa893bb1d08705381e2bfcd006de22a70e (patch) | |
tree | 746bcadc52e2886b725183fd54b0b22c731c8795 /activerecord/lib/active_record | |
parent | 0731945e74380176d3af91549f09882814694260 (diff) | |
parent | ded7e35cb021512124f491c5ee90aa52829f9932 (diff) | |
download | rails-09e431aa893bb1d08705381e2bfcd006de22a70e.tar.gz rails-09e431aa893bb1d08705381e2bfcd006de22a70e.tar.bz2 rails-09e431aa893bb1d08705381e2bfcd006de22a70e.zip |
Merge pull request #1318 from TheEmpty/master
Resolve issue #534
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/associations.rb | 6 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 1c7209e64e..a0a1ff23db 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -76,12 +76,6 @@ module ActiveRecord end end - class HasAndBelongsToManyAssociationWithPrimaryKeyError < ActiveRecordError #:nodoc: - def initialize(reflection) - super("Primary key is not allowed in a has_and_belongs_to_many join table (#{reflection.options[:join_table]}).") - end - end - class HasAndBelongsToManyAssociationForeignKeyNeeded < ActiveRecordError #:nodoc: def initialize(reflection) super("Cannot create self referential has_and_belongs_to_many association on '#{reflection.class_name rescue nil}##{reflection.name rescue nil}'. :association_foreign_key cannot be the same as the :foreign_key.") diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb index 4b48757da7..d7632b2ea9 100644 --- a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb +++ b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb @@ -39,10 +39,6 @@ module ActiveRecord::Associations::Builder model.send(:undecorated_table_name, model.to_s), model.send(:undecorated_table_name, reflection.class_name) ) - - if model.connection.supports_primary_key? && (model.connection.primary_key(reflection.options[:join_table]) rescue false) - raise ActiveRecord::HasAndBelongsToManyAssociationWithPrimaryKeyError.new(reflection) - end end # Generates a join table name from two provided table names. |