diff options
| -rw-r--r-- | activerecord/lib/active_record/scoping/named.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/relations_test.rb | 4 | 
2 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb index 9c50baa647..d6b0265fb3 100644 --- a/activerecord/lib/active_record/scoping/named.rb +++ b/activerecord/lib/active_record/scoping/named.rb @@ -34,7 +34,7 @@ module ActiveRecord              if current_scope                current_scope.clone              else -              scope = relation.clone +              scope = relation                scope.default_scoped = true                scope              end @@ -48,7 +48,7 @@ module ActiveRecord            if current_scope              current_scope.scope_for_create            else -            scope = relation.clone +            scope = relation              scope.default_scoped = true              scope.scope_for_create            end diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index bf2807c384..4da9179bfb 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -1088,6 +1088,10 @@ class RelationTest < ActiveRecord::TestCase      assert_equal 'honda', FastCar.unscoped { FastCar.order_using_old_style.limit(1).first.name}    end +  def test_unscoped_relation_clones +    assert_not_equal CoolCar.unscoped.object_id, CoolCar.unscoped.object_id +  end +    def test_intersection_with_array      relation = Author.where(:name => "David")      rails_author = relation.first  | 
