From 3747f896a1b727d67e6022001007e5f58b24a267 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Mon, 5 Oct 2009 14:39:20 -0300
Subject: Moved relation's test to relation_test.
---
activerecord/lib/active_record/base.rb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'activerecord/lib')
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 1c12189e15..2fd3384877 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -667,7 +667,7 @@ module ActiveRecord #:nodoc:
options = args.extract_options!
- if options.empty? #&& !scoped?(:find)
+ if options.empty? && !scoped?(:find)
relation = arel_table
else
include_associations = merge_includes(scope(:find, :include), options[:include])
@@ -1751,7 +1751,6 @@ module ActiveRecord #:nodoc:
relation = relation.readonly if options[:readonly]
relation
-
end
def construct_finder_sql(options, scope = scope(:find))
--
cgit v1.2.3