Merge pull request #524 from tk0miya/activerecord_or

activerecord: Fix AR::Relation#or can take other kinds of relation
ruby · Mar 8, 2024 · 372c833 · 372c833
2 parents 02198f7 + 7efc6e2
commit 372c833
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/gems/activerecord/6.0/activerecord.rbs b/gems/activerecord/6.0/activerecord.rbs
@@ -305,7 +305,7 @@ module ActiveRecord
       def group: (*Symbol | String) -> untyped
       def in_order_of: (Symbol, Array[untyped]) -> self
       def distinct: () -> self
-      def or: (self) -> self
+      def or: (::ActiveRecord::Relation) -> self
       def merge: (Array[untyped] | Hash[untyped, untyped] | ActiveRecord::Relation | Proc) -> self
       def joins: (*String | Symbol | Hash[untyped, untyped]) -> self
       def left_joins: (*String | Symbol | Hash[untyped, untyped]) -> self
@@ -391,7 +391,7 @@ module ActiveRecord
       def group: (*Symbol | String) -> untyped
       def in_order_of: (Symbol, Array[untyped]) -> Relation
       def distinct: () -> Relation
-      def or: (Relation) -> Relation
+      def or: (::ActiveRecord::Relation) -> Relation
       def merge: (Array[untyped] | Hash[untyped, untyped] | ActiveRecord::Relation | Proc) -> Relation
       def joins: (*String | Symbol | Hash[untyped, untyped]) -> Relation
       def left_joins: (*String | Symbol | Hash[untyped, untyped]) -> Relation
@@ -468,7 +468,7 @@ interface _ActiveRecord_Relation[Model, PrimaryKey]
   def group: (*Symbol | String) -> untyped
   def in_order_of: (Symbol, Array[untyped]) -> self
   def distinct: () -> self
-  def or: (self) -> self
+  def or: (::ActiveRecord::Relation) -> self
   def merge: (Array[untyped] | Hash[untyped, untyped] | ActiveRecord::Relation | Proc) -> self
   def joins: (*String | Symbol | Hash[untyped, untyped]) -> self
   def left_joins: (*String | Symbol | Hash[untyped, untyped]) -> self
@@ -553,7 +553,7 @@ interface _ActiveRecord_Relation_ClassMethods[Model, Relation, PrimaryKey]
   def group: (*Symbol | String) -> untyped
   def in_order_of: (Symbol, Array[untyped]) -> Relation
   def distinct: () -> Relation
-  def or: (Relation) -> Relation
+  def or: (::ActiveRecord::Relation) -> Relation
   def merge: (Array[untyped] | Hash[untyped, untyped] | ActiveRecord::Relation | Proc) -> Relation
   def joins: (*String | Symbol | Hash[untyped, untyped]) -> Relation
   def left_joins: (*String | Symbol | Hash[untyped, untyped]) -> Relation