kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Removes the restriction on primary key when joining in a habtm && test that it was properly removed

Browse source
This commit is contained in:
Mohammad El-Abid 2011-05-26 00:54:51 -04:00
parent bf9272b9d4
commit ec44763f03
3 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activerecord/lib/active_record/associations.rb
View file

@ -76,12 +76,6 @@ module ActiveRecord
end end
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: class HasAndBelongsToManyAssociationForeignKeyNeeded < ActiveRecordError #:nodoc:
def initialize(reflection) 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.") 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.")

4
activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
View file

@ -39,10 +39,6 @@ module ActiveRecord::Associations::Builder
model.send(:undecorated_table_name, model.to_s), model.send(:undecorated_table_name, model.to_s),
model.send(:undecorated_table_name, reflection.class_name) 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 end
# Generates a join table name from two provided table names. # Generates a join table name from two provided table names.

9
activerecord/test/cases/associations/habtm_join_table_test.rb
View file

@ -33,12 +33,11 @@ class HabtmJoinTableTest < ActiveRecord::TestCase
ActiveRecord::Base.connection.drop_table :my_books_my_readers ActiveRecord::Base.connection.drop_table :my_books_my_readers
end end
uses_transaction :test_should_raise_exception_when_join_table_has_a_primary_key uses_transaction :test_should_not_raise_exception_when_join_table_has_a_primary_key
def test_should_raise_exception_when_join_table_has_a_primary_key def test_should_not_raise_exception_when_join_table_has_a_primary_key
if ActiveRecord::Base.connection.supports_primary_key? if ActiveRecord::Base.connection.supports_primary_key?
assert_raise ActiveRecord::HasAndBelongsToManyAssociationWithPrimaryKeyError do # This test is to confirm that this feature is now gone
MyReader.has_and_belongs_to_many :my_books assert MyReader.has_and_belongs_to_many(:my_books).is_a?(ActiveRecord::Reflection::AssociationReflection)
end
end end
end end
end end