From 24f902b1bcfa5dca4bfc7f2b978a4b0dece73894 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sat, 13 Aug 2011 16:37:44 +0100
Subject: Fix default scope thread safety. Thanks @thedarkone for reporting.

---
 activerecord/test/cases/relation_scoping_test.rb | 18 ++++++++++++++++++
 activerecord/test/models/developer.rb            |  9 +++++++++
 2 files changed, 27 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 673aff403f..1e2093273e 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -524,4 +524,22 @@ class DefaultScopingTest < ActiveRecord::TestCase
 
     assert_equal 1, DeveloperWithIncludes.where(:audit_logs => { :message => 'foo' }).count
   end
+
+  def test_default_scope_is_threadsafe
+    if in_memory_db?
+      skip "in memory db can't share a db between threads"
+    end
+
+    threads = []
+    assert_not_equal 1, ThreadsafeDeveloper.unscoped.count
+
+    threads << Thread.new do
+      Thread.current[:long_default_scope] = true
+      assert_equal 1, ThreadsafeDeveloper.all.count
+    end
+    threads << Thread.new do
+      assert_equal 1, ThreadsafeDeveloper.all.count
+    end
+    threads.each(&:join)
+  end
 end
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index f182a7fa97..4dc9fff9fd 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -227,3 +227,12 @@ class EagerDeveloperWithCallableDefaultScope < ActiveRecord::Base
 
   default_scope OpenStruct.new(:call => includes(:projects))
 end
+
+class ThreadsafeDeveloper < ActiveRecord::Base
+  self.table_name = 'developers'
+
+  def self.default_scope
+    sleep 0.05 if Thread.current[:long_default_scope]
+    limit(1)
+  end
+end
-- 
cgit v1.2.3