diff options
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/associations_join_model_test.rb | 7 | ||||
-rw-r--r-- | activerecord/test/fixtures/author.rb | 6 | ||||
-rw-r--r-- | activerecord/test/fixtures/db_definitions/schema.rb | 5 |
3 files changed, 18 insertions, 0 deletions
diff --git a/activerecord/test/associations_join_model_test.rb b/activerecord/test/associations_join_model_test.rb index d7a230ddba..ee99d77931 100644 --- a/activerecord/test/associations_join_model_test.rb +++ b/activerecord/test/associations_join_model_test.rb @@ -287,6 +287,13 @@ class AssociationsJoinModelTest < Test::Unit::TestCase end end + def test_eager_belongs_to_and_has_one_not_singularized + assert_nothing_raised do + Author.find(:first, :include => :author_address) + AuthorAddress.find(:first, :include => :author) + end + end + private # create dynamic Post models to allow different dependency options def find_post_with_dependency(post_id, association, association_name, dependency) diff --git a/activerecord/test/fixtures/author.rb b/activerecord/test/fixtures/author.rb index 1dda0f837c..e510dd1992 100644 --- a/activerecord/test/fixtures/author.rb +++ b/activerecord/test/fixtures/author.rb @@ -28,6 +28,8 @@ class Author < ActiveRecord::Base has_many :nothings, :through => :kateggorisatons, :class_name => 'Category' + belongs_to :author_address + attr_accessor :post_log def after_initialize @@ -55,3 +57,7 @@ class Author < ActiveRecord::Base raise Exception.new("You can't add a post") end end + +class AuthorAddress < ActiveRecord::Base + has_one :author +end
\ No newline at end of file diff --git a/activerecord/test/fixtures/db_definitions/schema.rb b/activerecord/test/fixtures/db_definitions/schema.rb index efe9cb35ab..6e8e23a9c4 100644 --- a/activerecord/test/fixtures/db_definitions/schema.rb +++ b/activerecord/test/fixtures/db_definitions/schema.rb @@ -19,5 +19,10 @@ ActiveRecord::Schema.define do end add_column :posts, :taggings_count, :integer, :default => 0 + add_column :authors, :author_address_id, :integer + + create_table :author_addresses, :force => true do |t| + t.column :author_address_id, :integer + end end
\ No newline at end of file |