aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/fixtures
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-09-24 23:58:13 +0000
committerJamis Buck <jamis@37signals.com>2005-09-24 23:58:13 +0000
commit2a35baa0bb4312d95e1340074cce731afedecde0 (patch)
treee37ca3db4692f54fb728ad4f5fea7a797d2ed5be /activerecord/test/fixtures
parentcaaf40d5358ae8a2b31949c2af2d94be1be73976 (diff)
downloadrails-2a35baa0bb4312d95e1340074cce731afedecde0.tar.gz
rails-2a35baa0bb4312d95e1340074cce731afedecde0.tar.bz2
rails-2a35baa0bb4312d95e1340074cce731afedecde0.zip
Wrap :conditions in parentheses to prevent problems with OR's #1871
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2324 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/fixtures')
-rw-r--r--activerecord/test/fixtures/comments.yml6
-rw-r--r--activerecord/test/fixtures/posts.yml7
2 files changed, 13 insertions, 0 deletions
diff --git a/activerecord/test/fixtures/comments.yml b/activerecord/test/fixtures/comments.yml
index bfe61068e1..758eaf6dbf 100644
--- a/activerecord/test/fixtures/comments.yml
+++ b/activerecord/test/fixtures/comments.yml
@@ -57,3 +57,9 @@ check_eager_sti_on_associations2:
post_id: 5
body: Special Type
type: SpecialComment
+
+eager_other_comment1:
+ id: 11
+ post_id: 7
+ body: go crazy
+ type: SpecialComment
diff --git a/activerecord/test/fixtures/posts.yml b/activerecord/test/fixtures/posts.yml
index 190993dcdd..0f1445b638 100644
--- a/activerecord/test/fixtures/posts.yml
+++ b/activerecord/test/fixtures/posts.yml
@@ -39,3 +39,10 @@ sti_habtm:
title: habtm sti test
body: hello
type: Post
+
+eager_other:
+ id: 7
+ author_id: 2
+ title: eager loading with OR'd conditions
+ body: hello
+ type: Post