Do not call Model.name while holding a mutex when setting temporary n…

…ames for anonymous modules (Fixes #2273)

CHANGELOG

@@ -1,3 +1,7 @@
+=== master
+
+* Do not call Model.name while holding a mutex when setting temporary names for anonymous modules (jeremyevans) (#2273)
+
 === 5.89.0 (2025-02-01)
 
 * Make connection_validator extension handle case where Database#valid_connection? raises an exception (jeremyevans)

lib/sequel/model/base.rb

@@ -768,7 +768,8 @@ def def_column_accessor(*columns)
       # default behavior.
       def dataset_methods_module
         return @dataset_methods_module if defined?(@dataset_methods_module)
-        Sequel.synchronize{@dataset_methods_module ||= Sequel.set_temp_name(Module.new){"#{name}::@dataset_methods_module"}}
+        mod_name = "#{name}::@dataset_methods_module"
+        Sequel.synchronize{@dataset_methods_module ||= Sequel.set_temp_name(Module.new){mod_name}}
         extend(@dataset_methods_module)
         @dataset_methods_module
       end
@@ -956,7 +957,10 @@ def method_added(meth)
       # Module that the class includes that holds methods the class adds for column accessors and
       # associations so that the methods can be overridden with +super+.
       def overridable_methods_module
-        include(@overridable_methods_module = Sequel.set_temp_name(Module.new){"#{name}::@overridable_methods_module"}) unless @overridable_methods_module
+        return @overridable_methods_module if defined?(@overridable_methods_module)
+        mod_name = "#{name}::@overridable_methods_module"
+        Sequel.synchronize{@overridable_methods_module ||= Sequel.set_temp_name(Module.new){mod_name}}
+        include(@overridable_methods_module)
         @overridable_methods_module
       end
 

lib/sequel/plugins/subset_static_cache.rb

@@ -99,7 +99,8 @@ def subset_static_cache_module
           # it before calling creating this module.
           dataset_methods_module
 
-          Sequel.synchronize{@subset_static_cache_module ||= Sequel.set_temp_name(Module.new){"#{name}::@subset_static_cache_module"}}
+          mod_name = "#{name}::@subset_static_cache_module"
+          Sequel.synchronize{@subset_static_cache_module ||= Sequel.set_temp_name(Module.new){mod_name}}
           extend(@subset_static_cache_module)
           @subset_static_cache_module
         end

spec/extensions/subset_static_cache_spec.rb

@@ -34,6 +34,16 @@
     c.singleton_class.ancestors[1].name.must_equal "Sequel::_Model(:items)::@subset_static_cache_module"
   end if RUBY_VERSION >= '3.3'
 
+  it "should give temporary name to name model-specific module" do
+    c = Sequel::Model(:items)
+    c.class_eval do
+      dataset_module{where :foo, :bar}
+      plugin :subset_static_cache
+      cache_subset :foo
+    end
+    c.singleton_class.ancestors[1].name.must_equal "Sequel::_Model(:items)::@subset_static_cache_module"
+  end if RUBY_VERSION >= '3.3'
+
   it "should have .with_pk use the cache without a query" do
     @ds.with_pk(1)
     @ds.with_pk(1).must_equal @c1

spec/model/model_spec.rb

@@ -12,6 +12,16 @@
     m.send(:overridable_methods_module).name.must_equal "Sequel::_Model(:blah)::@overridable_methods_module"
   end if RUBY_VERSION >= '3.3'
 
+  it "should provide correct temporary names when Model.name calls Sequel.synchronize" do
+    m = Sequel::Model(:blah)
+    m.name.must_equal "Sequel::_Model(:blah)"
+    def m.name
+      Sequel.synchronize{super}
+    end
+    m.send(:dataset_methods_module).name.must_equal "Sequel::_Model(:blah)::@dataset_methods_module"
+    m.send(:overridable_methods_module).name.must_equal "Sequel::_Model(:blah)::@overridable_methods_module"
+  end if RUBY_VERSION >= '3.3'
+
   it "should return a model subclass with the given dataset if given a dataset" do
     ds = @db[:blah]
     c = Sequel::Model(ds)