aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2010-10-31 11:21:28 +0000
committerJon Leighton <j@jonathanleighton.com>2010-10-31 11:21:28 +0000
commit9a1a32ac2b8a526f543367bc7e8258bbd7e6a164 (patch)
treea14e5d2b8d0b9f34766a91d3bac9bf78b445eb51 /activerecord/test
parentd010fb13ef622bdb781e3134005fc849db4c9bea (diff)
downloadrails-9a1a32ac2b8a526f543367bc7e8258bbd7e6a164.tar.gz
rails-9a1a32ac2b8a526f543367bc7e8258bbd7e6a164.tar.bz2
rails-9a1a32ac2b8a526f543367bc7e8258bbd7e6a164.zip
Fix naughty trailing whitespace
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/associations/has_many_through_associations_test.rb10
-rw-r--r--activerecord/test/cases/associations/has_one_through_associations_test.rb12
-rw-r--r--activerecord/test/cases/associations/nested_through_associations_test.rb180
-rw-r--r--activerecord/test/cases/reflection_test.rb18
-rw-r--r--activerecord/test/models/author.rb6
-rw-r--r--activerecord/test/models/categorization.rb2
-rw-r--r--activerecord/test/models/category.rb2
-rw-r--r--activerecord/test/models/job.rb2
-rw-r--r--activerecord/test/models/member.rb8
-rw-r--r--activerecord/test/models/member_detail.rb2
-rw-r--r--activerecord/test/models/organization.rb2
-rw-r--r--activerecord/test/models/person.rb2
-rw-r--r--activerecord/test/models/post.rb4
-rw-r--r--activerecord/test/models/reference.rb2
14 files changed, 126 insertions, 126 deletions
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 713c492f5e..4e398751d2 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -456,19 +456,19 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
def test_has_many_through_polymorphic_with_primary_key_option
assert_equal [categories(:general)], authors(:david).essay_categories
-
+
authors = Author.joins(:essay_categories).where('categories.id' => categories(:general).id)
assert_equal authors(:david), authors.first
-
+
assert_equal [owners(:blackbeard)], authors(:david).essay_owners
-
+
authors = Author.joins(:essay_owners).where("owners.name = 'blackbeard'")
assert_equal authors(:david), authors.first
end
-
+
def test_has_many_through_with_primary_key_option
assert_equal [categories(:general)], authors(:david).essay_categories_2
-
+
authors = Author.joins(:essay_categories_2).where('categories.id' => categories(:general).id)
assert_equal authors(:david), authors.first
end
diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index 39e14b4bfd..1cf8c0539d 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -217,22 +217,22 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
minivan.dashboard
end
end
-
+
def test_has_one_through_polymorphic_with_primary_key_option
assert_equal categories(:general), authors(:david).essay_category
-
+
authors = Author.joins(:essay_category).where('categories.id' => categories(:general).id)
assert_equal authors(:david), authors.first
-
+
assert_equal owners(:blackbeard), authors(:david).essay_owner
-
+
authors = Author.joins(:essay_owner).where("owners.name = 'blackbeard'")
assert_equal authors(:david), authors.first
end
-
+
def test_has_one_through_with_primary_key_option
assert_equal categories(:general), authors(:david).essay_category_2
-
+
authors = Author.joins(:essay_category_2).where('categories.id' => categories(:general).id)
assert_equal authors(:david), authors.first
end
diff --git a/activerecord/test/cases/associations/nested_through_associations_test.rb b/activerecord/test/cases/associations/nested_through_associations_test.rb
index bfc290e877..db7c8b6c45 100644
--- a/activerecord/test/cases/associations/nested_through_associations_test.rb
+++ b/activerecord/test/cases/associations/nested_through_associations_test.rb
@@ -30,18 +30,18 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
:categorizations, :memberships, :essays
# Through associations can either use the has_many or has_one macros.
- #
+ #
# has_many
# - Source reflection can be has_many, has_one, belongs_to or has_and_belongs_to_many
# - Through reflection can be has_many, has_one, belongs_to or has_and_belongs_to_many
- #
+ #
# has_one
# - Source reflection can be has_one or belongs_to
# - Through reflection can be has_one or belongs_to
- #
+ #
# Additionally, the source reflection and/or through reflection may be subject to
# polymorphism and/or STI.
- #
+ #
# When testing these, we need to make sure it works via loading the association directly, or
# joining the association, or including the association. We also need to ensure that associations
# are readonly where relevant.
@@ -51,18 +51,18 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
# Through: has_many
def test_has_many_through_has_many_with_has_many_through_source_reflection
general = tags(:general)
-
+
assert_equal [general, general], authors(:david).tags
-
+
assert_includes_and_joins_equal(
Author.where('tags.id' => tags(:general).id),
[authors(:david)], :tags
)
-
+
# This ensures that the polymorphism of taggings is being observed correctly
authors = Author.joins(:tags).where('taggings.taggable_type' => 'FakeModel')
assert authors.empty?
-
+
authors = assert_queries(5) { Author.includes(:tags).to_a }
assert_no_queries do
assert_equal [general, general], authors.first.tags
@@ -74,236 +74,236 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
# Through: has_many through
def test_has_many_through_has_many_through_with_has_many_source_reflection
luke, david = subscribers(:first), subscribers(:second)
-
+
author = authors(:david)
assert_equal [luke, david, david], author.subscribers.order('subscribers.nick')
-
+
# All authors with subscribers where one of the subscribers' nick is 'alterself'
assert_includes_and_joins_equal(
Author.where('subscribers.nick' => 'alterself'),
[authors(:david)], :subscribers
)
-
+
authors = assert_queries(4) { Author.includes(:subscribers).to_a }
assert_no_queries do
assert_equal [luke, david, david], authors.first.subscribers.sort_by(&:nick)
end
end
-
+
# has_many through
# Source: has_one through
# Through: has_one
def test_has_many_through_has_one_with_has_one_through_source_reflection
founding = member_types(:founding)
-
+
assert_equal [founding], members(:groucho).nested_member_types
-
+
assert_includes_and_joins_equal(
Member.where('member_types.id' => founding.id),
[members(:groucho)], :nested_member_types
)
-
+
members = assert_queries(4) { Member.includes(:nested_member_types).to_a }
assert_no_queries do
assert_equal [founding], members.first.nested_member_types
end
end
-
+
# has_many through
# Source: has_one
# Through: has_one through
def test_has_many_through_has_one_through_with_has_one_source_reflection
mustache = sponsors(:moustache_club_sponsor_for_groucho)
-
+
assert_equal [mustache], members(:groucho).nested_sponsors
-
+
assert_includes_and_joins_equal(
Member.where('sponsors.id' => mustache.id),
[members(:groucho)], :nested_sponsors
)
-
+
members = assert_queries(4) { Member.includes(:nested_sponsors).to_a }
assert_no_queries do
assert_equal [mustache], members.first.nested_sponsors
end
end
-
+
# has_many through
# Source: has_many through
# Through: has_one
def test_has_many_through_has_one_with_has_many_through_source_reflection
groucho_details, other_details = member_details(:groucho), member_details(:some_other_guy)
-
+
assert_equal [groucho_details, other_details],
members(:groucho).organization_member_details.order('member_details.id')
-
+
assert_includes_and_joins_equal(
Member.where('member_details.id' => member_details(:groucho).id).order('member_details.id'),
[members(:groucho), members(:some_other_guy)], :organization_member_details
)
-
+
members = Member.joins(:organization_member_details).
where('member_details.id' => 9)
assert members.empty?
-
+
members = assert_queries(4) { Member.includes(:organization_member_details).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal [groucho_details, other_details], members.first.organization_member_details.sort_by(&:id)
end
end
-
+
# has_many through
# Source: has_many
# Through: has_one through
def test_has_many_through_has_one_through_with_has_many_source_reflection
groucho_details, other_details = member_details(:groucho), member_details(:some_other_guy)
-
+
assert_equal [groucho_details, other_details],
members(:groucho).organization_member_details_2.order('member_details.id')
-
+
assert_includes_and_joins_equal(
Member.where('member_details.id' => groucho_details.id).order('member_details.id'),
[members(:groucho), members(:some_other_guy)], :organization_member_details_2
)
-
+
members = Member.joins(:organization_member_details_2).
where('member_details.id' => 9)
assert members.empty?
-
+
members = assert_queries(4) { Member.includes(:organization_member_details_2).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal [groucho_details, other_details], members.first.organization_member_details_2.sort_by(&:id)
end
end
-
+
# has_many through
# Source: has_and_belongs_to_many
# Through: has_many
def test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection
general, cooking = categories(:general), categories(:cooking)
-
+
assert_equal [general, cooking], authors(:bob).post_categories.order('categories.id')
-
+
assert_includes_and_joins_equal(
Author.where('categories.id' => cooking.id),
[authors(:bob)], :post_categories
)
-
+
authors = assert_queries(3) { Author.includes(:post_categories).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal [general, cooking], authors[2].post_categories.sort_by(&:id)
end
end
-
+
# has_many through
# Source: has_many
# Through: has_and_belongs_to_many
def test_has_many_through_has_and_belongs_to_many_with_has_many_source_reflection
greetings, more = comments(:greetings), comments(:more_greetings)
-
+
assert_equal [greetings, more], categories(:technology).post_comments.order('comments.id')
-
+
assert_includes_and_joins_equal(
Category.where('comments.id' => more.id).order('comments.id'),
[categories(:general), categories(:technology)], :post_comments
)
-
+
categories = assert_queries(3) { Category.includes(:post_comments).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal [greetings, more], categories[1].post_comments.sort_by(&:id)
end
end
-
+
# has_many through
# Source: has_many through a habtm
# Through: has_many through
def test_has_many_through_has_many_with_has_many_through_habtm_source_reflection
greetings, more = comments(:greetings), comments(:more_greetings)
-
+
assert_equal [greetings, more], authors(:bob).category_post_comments.order('comments.id')
-
+
assert_includes_and_joins_equal(
Author.where('comments.id' => comments(:does_it_hurt).id).order('comments.id'),
[authors(:david), authors(:mary)], :category_post_comments
)
-
+
authors = assert_queries(5) { Author.includes(:category_post_comments).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal [greetings, more], authors[2].category_post_comments.sort_by(&:id)
end
end
-
+
# has_many through
# Source: belongs_to
# Through: has_many through
def test_has_many_through_has_many_through_with_belongs_to_source_reflection
general = tags(:general)
-
+
assert_equal [general, general], authors(:david).tagging_tags
-
+
assert_includes_and_joins_equal(
Author.where('tags.id' => tags(:general).id),
[authors(:david)], :tagging_tags
)
-
+
authors = assert_queries(5) { Author.includes(:tagging_tags).to_a }
assert_no_queries do
assert_equal [general, general], authors.first.tagging_tags
end
end
-
+
# has_many through
# Source: has_many through
# Through: belongs_to
def test_has_many_through_belongs_to_with_has_many_through_source_reflection
welcome_general, thinking_general = taggings(:welcome_general), taggings(:thinking_general)
-
+
assert_equal [welcome_general, thinking_general],
categorizations(:david_welcome_general).post_taggings.order('taggings.id')
-
+
assert_includes_and_joins_equal(
Categorization.where('taggings.id' => welcome_general.id).order('taggings.id'),
[categorizations(:david_welcome_general)], :post_taggings
)
-
+
categorizations = assert_queries(4) { Categorization.includes(:post_taggings).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal [welcome_general, thinking_general], categorizations.first.post_taggings.sort_by(&:id)
end
end
-
+
# has_one through
# Source: has_one through
# Through: has_one
def test_has_one_through_has_one_with_has_one_through_source_reflection
founding = member_types(:founding)
-
+
assert_equal founding, members(:groucho).nested_member_type
-
+
assert_includes_and_joins_equal(
Member.where('member_types.id' => founding.id),
[members(:groucho)], :nested_member_type
)
-
+
members = assert_queries(4) { Member.includes(:nested_member_type).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal founding, members.first.nested_member_type
end
end
-
+
# has_one through
# Source: belongs_to
# Through: has_one through
def test_has_one_through_has_one_through_with_belongs_to_source_reflection
general = categories(:general)
-
+
assert_equal general, members(:groucho).club_category
-
+
assert_includes_and_joins_equal(
Member.where('categories.id' => categories(:technology).id),
[members(:blarpy_winkup)], :club_category
)
-
+
members = assert_queries(4) { Member.includes(:club_category).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal general, members.first.club_category
@@ -320,34 +320,34 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
assert_equal [subscribers(:first), subscribers(:second)],
author.distinct_subscribers.order('subscribers.nick')
end
-
+
def test_nested_has_many_through_with_a_table_referenced_multiple_times
author = authors(:bob)
assert_equal [posts(:misc_by_bob), posts(:misc_by_mary), posts(:other_by_bob), posts(:other_by_mary)],
author.similar_posts.sort_by(&:id)
-
+
# Mary and Bob both have posts in misc, but they are the only ones.
authors = Author.joins(:similar_posts).where('posts.id' => posts(:misc_by_bob).id)
assert_equal [authors(:mary), authors(:bob)], authors.uniq.sort_by(&:id)
-
+
# Check the polymorphism of taggings is being observed correctly (in both joins)
authors = Author.joins(:similar_posts).where('taggings.taggable_type' => 'FakeModel')
assert authors.empty?
authors = Author.joins(:similar_posts).where('taggings_authors_join.taggable_type' => 'FakeModel')
assert authors.empty?
end
-
+
def test_has_many_through_with_foreign_key_option_on_through_reflection
assert_equal [posts(:welcome), posts(:authorless)], people(:david).agents_posts.order('posts.id')
assert_equal [authors(:david)], references(:david_unicyclist).agents_posts_authors
-
+
references = Reference.joins(:agents_posts_authors).where('authors.id' => authors(:david).id)
assert_equal [references(:david_unicyclist)], references
end
-
+
def test_has_many_through_with_foreign_key_option_on_source_reflection
assert_equal [people(:michael), people(:susan)], jobs(:unicyclist).agents.order('people.id')
-
+
jobs = Job.joins(:agents)
assert_equal [jobs(:unicyclist), jobs(:unicyclist)], jobs
end
@@ -355,7 +355,7 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
def test_has_many_through_with_sti_on_through_reflection
ratings = posts(:sti_comments).special_comments_ratings.sort_by(&:id)
assert_equal [ratings(:special_comment_rating), ratings(:sub_special_comment_rating)], ratings
-
+
# Ensure STI is respected in the join
scope = Post.joins(:special_comments_ratings).where(:id => posts(:sti_comments).id)
assert scope.where("comments.type" => "Comment").empty?
@@ -366,101 +366,101 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
def test_nested_has_many_through_writers_should_raise_error
david = authors(:david)
subscriber = subscribers(:first)
-
+
assert_raises(ActiveRecord::HasManyThroughNestedAssociationsAreReadonly) do
david.subscribers = [subscriber]
end
-
+
assert_raises(ActiveRecord::HasManyThroughNestedAssociationsAreReadonly) do
david.subscriber_ids = [subscriber.id]
end
-
+
assert_raises(ActiveRecord::HasManyThroughNestedAssociationsAreReadonly) do
david.subscribers << subscriber
end
-
+
assert_raises(ActiveRecord::HasManyThroughNestedAssociationsAreReadonly) do
david.subscribers.delete(subscriber)
end
-
+
assert_raises(ActiveRecord::HasManyThroughNestedAssociationsAreReadonly) do
david.subscribers.clear
end
-
+
assert_raises(ActiveRecord::HasManyThroughNestedAssociationsAreReadonly) do
david.subscribers.build
end
-
+
assert_raises(ActiveRecord::HasManyThroughNestedAssociationsAreReadonly) do
david.subscribers.create
end
end
-
+
def test_nested_has_one_through_writers_should_raise_error
groucho = members(:groucho)
founding = member_types(:founding)
-
+
assert_raises(ActiveRecord::HasManyThroughNestedAssociationsAreReadonly) do
groucho.nested_member_type = founding
end
end
-
+
def test_nested_has_many_through_with_conditions_on_through_associations
blue, bob = tags(:blue), authors(:bob)
-
+
assert_equal [blue], bob.misc_post_first_blue_tags
-
+
# Pointless condition to force single-query loading
assert_includes_and_joins_equal(
Author.where('tags.id = tags.id'),
[bob], :misc_post_first_blue_tags
)
-
+
assert Author.where('tags.id' => 100).joins(:misc_post_first_blue_tags).empty?
-
+
authors = assert_queries(3) { Author.includes(:misc_post_first_blue_tags).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal [blue], authors[2].misc_post_first_blue_tags
end
end
-
+
def test_nested_has_many_through_with_conditions_on_source_associations
blue, bob = tags(:blue), authors(:bob)
-
+
assert_equal [blue], bob.misc_post_first_blue_tags_2
-
+
# Pointless condition to force single-query loading
assert_includes_and_joins_equal(
Author.where('tags.id = tags.id'),
[bob], :misc_post_first_blue_tags_2
)
-
+
authors = assert_queries(4) { Author.includes(:misc_post_first_blue_tags_2).to_a.sort_by(&:id) }
assert_no_queries do
assert_equal [blue], authors[2].misc_post_first_blue_tags_2
end
end
-
+
def test_nested_has_many_through_with_foreign_key_option_on_the_source_reflection_through_reflection
assert_equal [categories(:general)], organizations(:nsa).author_essay_categories
-
+
organizations = Organization.joins(:author_essay_categories).
where('categories.id' => categories(:general).id)
assert_equal [organizations(:nsa)], organizations
-
+
assert_equal categories(:general), organizations(:nsa).author_owned_essay_category
-
+
organizations = Organization.joins(:author_owned_essay_category).
where('categories.id' => categories(:general).id)
assert_equal [organizations(:nsa)], organizations
end
-
+
private
-
+
def assert_includes_and_joins_equal(query, expected, association)
actual = assert_queries(1) { query.joins(association).to_a.uniq }
assert_equal expected, actual
-
+
actual = assert_queries(1) { query.includes(association).to_a.uniq }
assert_equal expected, actual
end
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index a85ba623e1..66fe754046 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -200,7 +200,7 @@ class ReflectionTest < ActiveRecord::TestCase
def test_has_many_through_reflection
assert_kind_of ThroughReflection, Subscriber.reflect_on_association(:books)
end
-
+
def test_through_reflection_chain
expected = [
Author.reflect_on_association(:essay_categories),
@@ -208,10 +208,10 @@ class ReflectionTest < ActiveRecord::TestCase
Organization.reflect_on_association(:authors)
]
actual = Organization.reflect_on_association(:author_essay_categories).through_reflection_chain
-
+
assert_equal expected, actual
end
-
+
def test_through_conditions
expected = [
["tags.name = 'Blue'"],
@@ -220,7 +220,7 @@ class ReflectionTest < ActiveRecord::TestCase
]
actual = Author.reflect_on_association(:misc_post_first_blue_tags).through_conditions
assert_equal expected, actual
-
+
expected = [
["tags.name = 'Blue'", "taggings.comment = 'first'", "posts.title LIKE 'misc post%'"],
[],
@@ -229,27 +229,27 @@ class ReflectionTest < ActiveRecord::TestCase
actual = Author.reflect_on_association(:misc_post_first_blue_tags_2).through_conditions
assert_equal expected, actual
end
-
+
def test_nested?
assert !Author.reflect_on_association(:comments).nested?
assert Author.reflect_on_association(:tags).nested?
-
+
# Only goes :through once, but the through_reflection is a has_and_belongs_to_many, so this is
# a nested through association
assert Category.reflect_on_association(:post_comments).nested?
end
-
+
def test_association_primary_key
# Normal association
assert_equal "id", Author.reflect_on_association(:posts).association_primary_key.to_s
assert_equal "name", Author.reflect_on_association(:essay).association_primary_key.to_s
-
+
# Through association (uses the :primary_key option from the source reflection)
assert_equal "nick", Author.reflect_on_association(:subscribers).association_primary_key.to_s
assert_equal "name", Author.reflect_on_association(:essay_category).association_primary_key.to_s
assert_equal "custom_primary_key", Author.reflect_on_association(:tags_with_primary_key).association_primary_key.to_s # nested
end
-
+
def test_active_record_primary_key
assert_equal "nick", Subscriber.reflect_on_association(:subscriptions).active_record_primary_key.to_s
assert_equal "name", Author.reflect_on_association(:essay).active_record_primary_key.to_s
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb
index 7dcfbd268b..43bfd93e60 100644
--- a/activerecord/test/models/author.rb
+++ b/activerecord/test/models/author.rb
@@ -96,7 +96,7 @@ class Author < ActiveRecord::Base
has_many :subscriptions, :through => :books
has_many :subscribers, :through => :subscriptions, :order => "subscribers.nick" # through has_many :through (on through reflection)
has_many :distinct_subscribers, :through => :subscriptions, :source => :subscriber, :select => "DISTINCT subscribers.*", :order => "subscribers.nick"
-
+
has_one :essay, :primary_key => :name, :as => :writer
has_one :essay_category, :through => :essay, :source => :category
has_one :essay_owner, :through => :essay, :source => :owner
@@ -107,7 +107,7 @@ class Author < ActiveRecord::Base
has_many :essays, :primary_key => :name, :as => :writer
has_many :essay_categories, :through => :essays, :source => :category
has_many :essay_owners, :through => :essays, :source => :owner
-
+
has_many :essays_2, :primary_key => :name, :class_name => 'Essay', :foreign_key => :author_id
has_many :essay_categories_2, :through => :essays_2, :source => :category
@@ -119,7 +119,7 @@ class Author < ActiveRecord::Base
has_many :post_categories, :through => :posts, :source => :categories
has_many :category_post_comments, :through => :categories, :source => :post_comments
-
+
has_many :misc_posts, :class_name => 'Post', :conditions => "posts.title LIKE 'misc post%'"
has_many :misc_post_first_blue_tags, :through => :misc_posts, :source => :first_blue_tags
diff --git a/activerecord/test/models/categorization.rb b/activerecord/test/models/categorization.rb
index bddc1e5f0c..8e2fa96498 100644
--- a/activerecord/test/models/categorization.rb
+++ b/activerecord/test/models/categorization.rb
@@ -2,6 +2,6 @@ class Categorization < ActiveRecord::Base
belongs_to :post
belongs_to :category
belongs_to :author
-
+
has_many :post_taggings, :through => :author, :source => :taggings
end
diff --git a/activerecord/test/models/category.rb b/activerecord/test/models/category.rb
index c933943813..95825c72ef 100644
--- a/activerecord/test/models/category.rb
+++ b/activerecord/test/models/category.rb
@@ -23,7 +23,7 @@ class Category < ActiveRecord::Base
has_many :categorizations
has_many :authors, :through => :categorizations, :select => 'authors.*, categorizations.post_id'
-
+
has_many :post_comments, :through => :posts, :source => :comments
end
diff --git a/activerecord/test/models/job.rb b/activerecord/test/models/job.rb
index 46b1d87aa1..f7b0e787b1 100644
--- a/activerecord/test/models/job.rb
+++ b/activerecord/test/models/job.rb
@@ -2,6 +2,6 @@ class Job < ActiveRecord::Base
has_many :references
has_many :people, :through => :references
belongs_to :ideal_reference, :class_name => 'Reference'
-
+
has_many :agents, :through => :people
end
diff --git a/activerecord/test/models/member.rb b/activerecord/test/models/member.rb
index bed62f8b7f..fbf0b80164 100644
--- a/activerecord/test/models/member.rb
+++ b/activerecord/test/models/member.rb
@@ -9,15 +9,15 @@ class Member < ActiveRecord::Base
has_one :member_detail
has_one :organization, :through => :member_detail
belongs_to :member_type
-
+
has_many :nested_member_types, :through => :member_detail, :source => :member_type
has_one :nested_member_type, :through => :member_detail, :source => :member_type
-
+
has_many :nested_sponsors, :through => :sponsor_club, :source => :sponsor
has_one :nested_sponsor, :through => :sponsor_club, :source => :sponsor
-
+
has_many :organization_member_details, :through => :member_detail
has_many :organization_member_details_2, :through => :organization, :source => :member_details
-
+
has_one :club_category, :through => :club, :source => :category
end
diff --git a/activerecord/test/models/member_detail.rb b/activerecord/test/models/member_detail.rb
index 0f53b69ced..fe619f8732 100644
--- a/activerecord/test/models/member_detail.rb
+++ b/activerecord/test/models/member_detail.rb
@@ -2,6 +2,6 @@ class MemberDetail < ActiveRecord::Base
belongs_to :member
belongs_to :organization
has_one :member_type, :through => :member
-
+
has_many :organization_member_details, :through => :organization, :source => :member_details
end
diff --git a/activerecord/test/models/organization.rb b/activerecord/test/models/organization.rb
index c18c28c696..4a4111833f 100644
--- a/activerecord/test/models/organization.rb
+++ b/activerecord/test/models/organization.rb
@@ -4,7 +4,7 @@ class Organization < ActiveRecord::Base
has_many :authors, :primary_key => :name
has_many :author_essay_categories, :through => :authors, :source => :essay_categories
-
+
has_one :author, :primary_key => :name
has_one :author_owned_essay_category, :through => :author, :source => :owned_essay_category
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index d35c51b660..5a5b6f9626 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -13,7 +13,7 @@ class Person < ActiveRecord::Base
belongs_to :primary_contact, :class_name => 'Person'
has_many :agents, :class_name => 'Person', :foreign_key => 'primary_contact_id'
belongs_to :number1_fan, :class_name => 'Person'
-
+
has_many :agents_posts, :through => :agents, :source => :posts
has_many :agents_posts_authors, :through => :agents_posts, :source => :author
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 68d2b79a3b..e9c8c02e45 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -46,7 +46,7 @@ class Post < ActiveRecord::Base
has_one :very_special_comment_with_post, :class_name => "VerySpecialComment", :include => :post
has_many :special_comments
has_many :nonexistant_comments, :class_name => 'Comment', :conditions => 'comments.id < 0'
-
+
has_many :special_comments_ratings, :through => :special_comments, :source => :ratings
has_and_belongs_to_many :categories
@@ -65,7 +65,7 @@ class Post < ActiveRecord::Base
has_many :super_tags, :through => :taggings
has_many :tags_with_primary_key, :through => :taggings, :source => :tag_with_primary_key
has_one :tagging, :as => :taggable
-
+
has_many :first_taggings, :as => :taggable, :class_name => 'Tagging', :conditions => "taggings.comment = 'first'"
has_many :first_blue_tags, :through => :first_taggings, :source => :tag, :conditions => "tags.name = 'Blue'"
diff --git a/activerecord/test/models/reference.rb b/activerecord/test/models/reference.rb
index 2feb15d706..87d4a71963 100644
--- a/activerecord/test/models/reference.rb
+++ b/activerecord/test/models/reference.rb
@@ -1,7 +1,7 @@
class Reference < ActiveRecord::Base
belongs_to :person
belongs_to :job
-
+
has_many :agents_posts_authors, :through => :person
end