diff options
-rw-r--r-- | activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | 6 | ||||
-rw-r--r-- | activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb | 29 |
2 files changed, 32 insertions, 3 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 d4143e0645..4fa8e9d0a8 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 @@ -35,10 +35,10 @@ module ActiveRecord columns = @owner.connection.columns(@reflection.options[:join_table], "#{@reflection.options[:join_table]} Columns") attributes = columns.inject({}) do |attrs, column| - case column.name - when @reflection.primary_key_name + case column.name.to_s + when @reflection.primary_key_name.to_s attrs[column.name] = @owner.quoted_id - when @reflection.association_foreign_key + when @reflection.association_foreign_key.to_s attrs[column.name] = record.quoted_id else if record.has_attribute?(column.name) diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb index 7867727e2c..64565141f9 100644 --- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb @@ -50,6 +50,23 @@ class DeveloperForProjectWithAfterCreateHook < ActiveRecord::Base :foreign_key => "developer_id" end +class ProjectWithSymbolsForKeys < ActiveRecord::Base + set_table_name 'projects' + has_and_belongs_to_many :developers, + :class_name => "DeveloperWithSymbolsForKeys", + :join_table => :developers_projects, + :foreign_key => :project_id, + :association_foreign_key => "developer_id" +end + +class DeveloperWithSymbolsForKeys < ActiveRecord::Base + set_table_name 'developers' + has_and_belongs_to_many :projects, + :class_name => "ProjectWithSymbolsForKeys", + :join_table => :developers_projects, + :association_foreign_key => :project_id, + :foreign_key => "developer_id" +end class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase fixtures :accounts, :companies, :categories, :posts, :categories_posts, :developers, :projects, :developers_projects, @@ -650,4 +667,16 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase def test_has_many_through_polymorphic_has_manys_works assert_equal [10, 20].to_set, pirates(:redbeard).treasure_estimates.map(&:price).to_set end + + def test_symbols_as_keys + developer = DeveloperWithSymbolsForKeys.new(:name => 'David') + project = ProjectWithSymbolsForKeys.new(:name => 'Rails Testing') + project.developers << developer + project.save! + + assert_equal 1, project.developers.size + assert_equal 1, developer.projects.size + assert_equal developer, project.developers.find(:first) + assert_equal project, developer.projects.find(:first) + end end |