From 2a35baa0bb4312d95e1340074cce731afedecde0 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Sat, 24 Sep 2005 23:58:13 +0000
Subject: 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
---
 activerecord/test/fixtures/comments.yml | 6 ++++++
 activerecord/test/fixtures/posts.yml    | 7 +++++++
 2 files changed, 13 insertions(+)

(limited to 'activerecord/test/fixtures')

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
-- 
cgit v1.2.3