Merge pull request #1882 from bdewater/ar-distinct

Improve ActiveRecord::QueryMethods#distinct
Shopify · Apr 23, 2024 · 2df42eb · 2df42eb
2 parents 7533e71 + 8b08af1
commit 2df42eb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/lib/tapioca/dsl/compilers/active_record_relations.rb b/lib/tapioca/dsl/compilers/active_record_relations.rb
@@ -561,6 +561,11 @@ def create_relation_methods
 
           QUERY_METHODS.each do |method_name|
             case method_name
+            when :distinct
+              create_relation_method(
+                method_name.to_s,
+                parameters: [create_opt_param("value", type: "T::Boolean", default: "true")],
+              )
             when :extract_associated
               parameters = [create_param("association", type: "Symbol")]
               return_type = "T::Array[T.untyped]"

diff --git a/spec/tapioca/dsl/compilers/active_record_relations_spec.rb b/spec/tapioca/dsl/compilers/active_record_relations_spec.rb
@@ -268,8 +268,8 @@ def annotate(*args, &blk); end
                     sig { params(args: T.untyped, blk: T.untyped).returns(PrivateAssociationRelation) }
                     def create_with(*args, &blk); end
 
-                    sig { params(args: T.untyped, blk: T.untyped).returns(PrivateAssociationRelation) }
-                    def distinct(*args, &blk); end
+                    sig { params(value: T::Boolean).returns(PrivateAssociationRelation) }
+                    def distinct(value = true); end
 
                     sig { params(args: T.untyped, blk: T.untyped).returns(PrivateAssociationRelation) }
                     def eager_load(*args, &blk); end
@@ -439,8 +439,8 @@ def annotate(*args, &blk); end
                     sig { params(args: T.untyped, blk: T.untyped).returns(PrivateRelation) }
                     def create_with(*args, &blk); end
 
-                    sig { params(args: T.untyped, blk: T.untyped).returns(PrivateRelation) }
-                    def distinct(*args, &blk); end
+                    sig { params(value: T::Boolean).returns(PrivateRelation) }
+                    def distinct(value = true); end
 
                     sig { params(args: T.untyped, blk: T.untyped).returns(PrivateRelation) }
                     def eager_load(*args, &blk); end
@@ -965,8 +965,8 @@ def annotate(*args, &blk); end
                     sig { params(args: T.untyped, blk: T.untyped).returns(PrivateAssociationRelation) }
                     def create_with(*args, &blk); end
 
-                    sig { params(args: T.untyped, blk: T.untyped).returns(PrivateAssociationRelation) }
-                    def distinct(*args, &blk); end
+                    sig { params(value: T::Boolean).returns(PrivateAssociationRelation) }
+                    def distinct(value = true); end
 
                     sig { params(args: T.untyped, blk: T.untyped).returns(PrivateAssociationRelation) }
                     def eager_load(*args, &blk); end
@@ -1136,8 +1136,8 @@ def annotate(*args, &blk); end
                     sig { params(args: T.untyped, blk: T.untyped).returns(PrivateRelation) }
                     def create_with(*args, &blk); end
 
-                    sig { params(args: T.untyped, blk: T.untyped).returns(PrivateRelation) }
-                    def distinct(*args, &blk); end
+                    sig { params(value: T::Boolean).returns(PrivateRelation) }
+                    def distinct(value = true); end
 
                     sig { params(args: T.untyped, blk: T.untyped).returns(PrivateRelation) }
                     def eager_load(*args, &blk); end