From 38bae0a9695aeaf200b5d62cee2dba2928c847d9 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Fri, 24 Mar 2006 14:46:17 +0000 Subject: Change has_many :through to use the :source option to specify the source association. :class_name is now ignored. [Rick Olson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4022 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/fixtures/author.rb | 2 +- activerecord/test/fixtures/post.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'activerecord/test/fixtures') diff --git a/activerecord/test/fixtures/author.rb b/activerecord/test/fixtures/author.rb index df78a7ada8..1a9b6d788a 100644 --- a/activerecord/test/fixtures/author.rb +++ b/activerecord/test/fixtures/author.rb @@ -4,7 +4,7 @@ class Author < ActiveRecord::Base has_many :posts_with_categories, :include => :categories, :class_name => "Post" has_many :posts_with_comments_and_categories, :include => [ :comments, :categories ], :order => "posts.id", :class_name => "Post" has_many :comments, :through => :posts - has_many :funky_comments, :through => :posts, :class_name => 'Comment' + has_many :funky_comments, :through => :posts, :source => :comments has_many :special_posts, :class_name => "Post" has_many :hello_posts, :class_name => "Post", :conditions=>"\#{aliased_table_name}.body = 'hello'" diff --git a/activerecord/test/fixtures/post.rb b/activerecord/test/fixtures/post.rb index 14b1c18117..9b42fbdb27 100644 --- a/activerecord/test/fixtures/post.rb +++ b/activerecord/test/fixtures/post.rb @@ -28,12 +28,12 @@ class Post < ActiveRecord::Base end end - has_many :funky_tags, :through => :taggings, :class_name => 'Tag' + has_many :funky_tags, :through => :taggings, :source => :tag has_many :super_tags, :through => :taggings has_one :tagging, :as => :taggable has_many :invalid_taggings, :as => :taggable, :class_name => "Tagging", :conditions => 'taggings.id < 0' - has_many :invalid_tags, :through => :invalid_taggings, :class_name => "Tag" + has_many :invalid_tags, :through => :invalid_taggings, :source => :tag has_many :categorizations, :foreign_key => :category_id has_many :authors, :through => :categorizations -- cgit v1.2.3