diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-10-05 14:39:20 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-10-05 14:39:20 -0300 |
| commit | 3747f896a1b727d67e6022001007e5f58b24a267 (patch) | |
| tree | 1e72baf5128b9138be87089a4b88c3bab09e5f2c /activerecord/lib | |
| parent | c01c21b31d590f7e8d12e3ae083fcdf0f0c6fd54 (diff) | |
| download | rails-3747f896a1b727d67e6022001007e5f58b24a267.tar.gz rails-3747f896a1b727d67e6022001007e5f58b24a267.tar.bz2 rails-3747f896a1b727d67e6022001007e5f58b24a267.zip | |
Moved relation's test to relation_test.
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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)) |