aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/fixtures
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-03-19 16:13:52 +0000
committerRick Olson <technoweenie@gmail.com>2006-03-19 16:13:52 +0000
commitea25e246e0ac796446f025bb369076adbcb390ab (patch)
treedf507bd6608e6209f0f6b4e759c666fff3417321 /activerecord/test/fixtures
parentfcd4c9529c071d3c77cbf57fe733869da0d3fde8 (diff)
downloadrails-ea25e246e0ac796446f025bb369076adbcb390ab.tar.gz
rails-ea25e246e0ac796446f025bb369076adbcb390ab.tar.bz2
rails-ea25e246e0ac796446f025bb369076adbcb390ab.zip
Quit ignoring default :include options in has_many :through calls [Mark James]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3974 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/fixtures')
-rw-r--r--activerecord/test/fixtures/post.rb2
-rw-r--r--activerecord/test/fixtures/tagging.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/fixtures/post.rb b/activerecord/test/fixtures/post.rb
index eca9369723..d3fa126b88 100644
--- a/activerecord/test/fixtures/post.rb
+++ b/activerecord/test/fixtures/post.rb
@@ -21,7 +21,7 @@ class Post < ActiveRecord::Base
has_and_belongs_to_many :special_categories, :join_table => "categories_posts", :association_foreign_key => 'category_id'
has_many :taggings, :as => :taggable
- has_many :tags, :through => :taggings
+ has_many :tags, :through => :taggings, :include => :tagging
has_many :funky_tags, :through => :taggings, :class_name => 'Tag'
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 51c3bd3604..4695f0755e 100644
--- a/activerecord/test/fixtures/tagging.rb
+++ b/activerecord/test/fixtures/tagging.rb
@@ -1,5 +1,5 @@
class Tagging < ActiveRecord::Base
- belongs_to :tag
+ belongs_to :tag, :include => :tagging
belongs_to :super_tag, :class_name => 'Tag', :foreign_key => 'super_tag_id'
belongs_to :invalid_tag, :class_name => 'Tag', :foreign_key => 'tag_id'
belongs_to :taggable, :polymorphic => true, :counter_cache => true