aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/fixtures
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-05 18:43:56 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-05 18:43:56 +0000
commit4f00c70580e376691bd1d6c1f9d09efbaa7bf9c9 (patch)
tree23865027d66ca498ad6c63c5cbb997ee85dc41d0 /activerecord/test/fixtures
parent84b8920a11985a771e6dbddbf5ed4e3852a2e790 (diff)
downloadrails-4f00c70580e376691bd1d6c1f9d09efbaa7bf9c9.tar.gz
rails-4f00c70580e376691bd1d6c1f9d09efbaa7bf9c9.tar.bz2
rails-4f00c70580e376691bd1d6c1f9d09efbaa7bf9c9.zip
Fixed eager loading problems with single-table inheritance [Rick Olson] Added smarter table aliasing for eager associations for multiple self joins [Rick Olson] (closes #3580)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3776 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/fixtures')
-rwxr-xr-xactiverecord/test/fixtures/topic.rb2
-rw-r--r--activerecord/test/fixtures/topics.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/topic.rb b/activerecord/test/fixtures/topic.rb
index 4c46122450..1941080ec7 100755
--- a/activerecord/test/fixtures/topic.rb
+++ b/activerecord/test/fixtures/topic.rb
@@ -6,7 +6,7 @@ class Topic < ActiveRecord::Base
before_destroy :destroy_children
def parent
- self.class.find(parent_id)
+ Topic.find(parent_id)
end
protected
diff --git a/activerecord/test/fixtures/topics.yml b/activerecord/test/fixtures/topics.yml
index 6d4f5d800b..810bbcf4e8 100644
--- a/activerecord/test/fixtures/topics.yml
+++ b/activerecord/test/fixtures/topics.yml
@@ -19,3 +19,4 @@ second:
approved: true
replies_count: 2
parent_id: 1
+ type: Reply