Merge pull request #1985 from Shopify/ba-fix-ar-new

Fix ActiveRecordRelation new defined out of class
Shopify · Aug 12, 2024 · df6e272 · df6e272
2 parents 2634126 + cd51cbb
commit df6e272
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/tapioca/dsl/compilers/active_record_relations.rb b/lib/tapioca/dsl/compilers/active_record_relations.rb
@@ -1029,7 +1029,7 @@ def create_common_methods
           # it doesn't allow for an array to be passed. If we kept it as a blanket it
           # would mean the passing any `T.untyped` value to the method would assume
           # the result is `T::Array` which is not the case majority of the time.
-          model.create_method("new") do |method|
+          model.create_method("new", class_method: true) do |method|
             method.add_opt_param("attributes", "nil")
             method.add_block_param("block")
 

diff --git a/spec/tapioca/dsl/compilers/active_record_relations_spec.rb b/spec/tapioca/dsl/compilers/active_record_relations_spec.rb
@@ -85,14 +85,16 @@ class Post
                   extend CommonRelationMethods
                   extend GeneratedRelationMethods
 
-                  sig { params(attributes: T.untyped, block: T.nilable(T.proc.params(object: ::Post).void)).returns(::Post) }
-                  def new(attributes = nil, &block); end
-
                   private
 
                   sig { returns(NilClass) }
                   def to_ary; end
 
+                  class << self
+                    sig { params(attributes: T.untyped, block: T.nilable(T.proc.params(object: ::Post).void)).returns(::Post) }
+                    def new(attributes = nil, &block); end
+                  end
+
                   module CommonRelationMethods
                     sig { params(block: T.nilable(T.proc.params(record: ::Post).returns(T.untyped))).returns(T::Boolean) }
                     def any?(&block); end
@@ -794,14 +796,16 @@ class Post
                   extend CommonRelationMethods
                   extend GeneratedRelationMethods
 
-                  sig { params(attributes: T.untyped, block: T.nilable(T.proc.params(object: ::Post).void)).returns(::Post) }
-                  def new(attributes = nil, &block); end
-
                   private
 
                   sig { returns(NilClass) }
                   def to_ary; end
 
+                  class << self
+                    sig { params(attributes: T.untyped, block: T.nilable(T.proc.params(object: ::Post).void)).returns(::Post) }
+                    def new(attributes = nil, &block); end
+                  end
+
                   module CommonRelationMethods
                     sig { params(block: T.nilable(T.proc.params(record: ::Post).returns(T.untyped))).returns(T::Boolean) }
                     def any?(&block); end