diff options
author | Rick Olson <technoweenie@gmail.com> | 2006-03-18 22:38:49 +0000 |
---|---|---|
committer | Rick Olson <technoweenie@gmail.com> | 2006-03-18 22:38:49 +0000 |
commit | fbd1e01bd6ca1b093811b0781d85f53850df12e3 (patch) | |
tree | cad9138fbecb159c9820f5aaed2d3d8ffdac0915 /activerecord/test/fixtures | |
parent | 1e7ce13b372e554438aa58c466dc100ef174ae9e (diff) | |
download | rails-fbd1e01bd6ca1b093811b0781d85f53850df12e3.tar.gz rails-fbd1e01bd6ca1b093811b0781d85f53850df12e3.tar.bz2 rails-fbd1e01bd6ca1b093811b0781d85f53850df12e3.zip |
Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) [andylien@gmail.com / Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3954 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/fixtures')
-rw-r--r-- | activerecord/test/fixtures/db_definitions/schema.rb | 1 | ||||
-rw-r--r-- | activerecord/test/fixtures/post.rb | 1 | ||||
-rw-r--r-- | activerecord/test/fixtures/tagging.rb | 1 | ||||
-rw-r--r-- | activerecord/test/fixtures/taggings.yml | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/fixtures/db_definitions/schema.rb b/activerecord/test/fixtures/db_definitions/schema.rb index 53aa7c1967..efe9cb35ab 100644 --- a/activerecord/test/fixtures/db_definitions/schema.rb +++ b/activerecord/test/fixtures/db_definitions/schema.rb @@ -2,6 +2,7 @@ ActiveRecord::Schema.define do create_table :taggings, :force => true do |t| t.column :tag_id, :integer + t.column :super_tag_id, :integer t.column :taggable_type, :string t.column :taggable_id, :integer end diff --git a/activerecord/test/fixtures/post.rb b/activerecord/test/fixtures/post.rb index a00fd80671..9456582729 100644 --- a/activerecord/test/fixtures/post.rb +++ b/activerecord/test/fixtures/post.rb @@ -22,6 +22,7 @@ class Post < ActiveRecord::Base has_many :taggings, :as => :taggable has_many :tags, :through => :taggings + has_many :super_tags, :through => :taggings has_one :tagging, :as => :taggable diff --git a/activerecord/test/fixtures/tagging.rb b/activerecord/test/fixtures/tagging.rb index 8bc844c370..4d3878933a 100644 --- a/activerecord/test/fixtures/tagging.rb +++ b/activerecord/test/fixtures/tagging.rb @@ -1,4 +1,5 @@ class Tagging < ActiveRecord::Base belongs_to :tag + belongs_to :super_tag, :class_name => 'Tag', :foreign_key => 'super_tag_id' belongs_to :taggable, :polymorphic => true, :counter_cache => true end
\ No newline at end of file diff --git a/activerecord/test/fixtures/taggings.yml b/activerecord/test/fixtures/taggings.yml index 38ec1ba5b1..617210d604 100644 --- a/activerecord/test/fixtures/taggings.yml +++ b/activerecord/test/fixtures/taggings.yml @@ -1,6 +1,7 @@ welcome_general: id: 1 tag_id: 1 + super_tag_id: 2 taggable_id: 1 taggable_type: Post |