From d469ad8a49779b3f3d6711989bb334534e94f099 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Fri, 7 Aug 2009 16:41:58 -0300
Subject: Removed useless OR.
---
activerecord/lib/active_record/associations.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 7c445f5618..46378edb93 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -2184,7 +2184,7 @@ module ActiveRecord
]
else
""
- end || ''
+ end
join << %(AND %s) % [
klass.send(:type_condition, aliased_table_name)] unless klass.descends_from_active_record?
--
cgit v1.2.3