Merge branch 'main' into activerecord/with

gems/activerecord/6.0/activerecord-6.0.rbs

@@ -52,3 +52,9 @@ module ActiveRecord
     def initialize: (untyped model, untyped inserts, on_duplicate: untyped, ?unique_by: untyped?, ?returning: untyped?) -> untyped
   end
 end
+
+module Arel
+  class Table
+    def initialize: (untyped name, ?type_caster: untyped? type_caster, ?as: untyped? as) -> untyped
+  end
+end

gems/activerecord/6.0/activerecord-generated.rbs

@@ -23508,8 +23508,6 @@ module Arel
     # TableAlias and Table both have a #table_name which is the name of the underlying table
     alias table_name name
 
-    def initialize: (untyped name, ?type_caster: untyped? type_caster, ?as: untyped? as) -> untyped
-
     def alias: (?::String name) -> Nodes::TableAlias
 
     def from: () -> SelectManager

gems/activerecord/6.0/activerecord.rbs

@@ -371,6 +371,7 @@ module ActiveRecord
       def find_each: (?batch_size: Integer, ?start: Integer, ?finish: Integer, ?error_on_ignore: bool) { (Model) -> void } -> nil
       def find_in_batches: (?batch_size: Integer, ?start: Integer, ?finish: Integer, ?error_on_ignore: bool) { (Array[Model]) -> void } -> nil
       def in_batches: (?of: Integer, ?start: Integer, ?finish: Integer, ?load: bool, ?error_on_ignore: bool, ?order: untyped) { (self) -> void } -> nil
+      def sum: (?untyped? column_name) -> Integer
       def destroy_all: () -> untyped
       def delete_all: () -> untyped
       def update_all: (*untyped) -> untyped
@@ -457,6 +458,7 @@ module ActiveRecord
       def find_each: (?batch_size: Integer, ?start: Integer, ?finish: Integer, ?error_on_ignore: bool) { (Model) -> void } -> nil
       def find_in_batches: (?batch_size: Integer, ?start: Integer, ?finish: Integer, ?error_on_ignore: bool) { (Array[Model]) -> void } -> nil
       def in_batches: (?of: Integer, ?start: Integer, ?finish: Integer, ?load: bool, ?error_on_ignore: bool, ?order: untyped) { (Relation) -> void } -> nil
+      def sum: (?untyped? column_name) -> Integer
       def destroy_all: () -> untyped
       def delete_all: () -> untyped
       def update_all: (*untyped) -> untyped
@@ -466,6 +468,7 @@ module ActiveRecord
       def select: (*Symbol | String) -> Relation
                 | () { (Model) -> boolish } -> Array[Model]
       def reselect: (*Symbol | String) -> Relation
+      def scope: (Symbol, ^(*untyped, **untyped) [self: Relation] -> void) ?{ (Module extention) [self: Relation] -> void } -> void
     end
   end
 end

gems/activerecord/6.1/activerecord-6.1.rbs

@@ -60,3 +60,9 @@ module ActiveRecord
     def initialize: (untyped model, untyped inserts, on_duplicate: untyped, ?unique_by: untyped?, ?returning: untyped?) -> untyped
   end
 end
+
+module Arel
+  class Table
+    def initialize: (untyped name, ?type_caster: untyped type_caster, ?as: untyped? as, ?klass: untyped?) -> void
+  end
+end

gems/activerecord/7.0/activerecord-7.0.rbs

@@ -89,11 +89,17 @@ module ActiveRecord
     @record_timestamps: bool
 
     def initialize: (untyped model, untyped inserts, on_duplicate: untyped, ?unique_by: untyped?, ?returning: untyped?, ?record_timestamps: bool?) -> untyped
-                  
+
     def record_timestamps?: () -> bool
 
     def keys_including_timestamps: () -> Set[String]
 
     def timestamps_for_create: () -> Hash[String, String]
   end
 end
+
+module Arel
+  class Table
+    def initialize: (untyped name, ?type_caster: untyped type_caster, ?as: untyped? as, ?klass: untyped?) -> void
+  end
+end

gems/activerecord/7.1/activerecord-7.1.rbs

@@ -87,8 +87,8 @@ module ActiveRecord
 
   class MismatchedForeignKey < StatementInvalid
     def initialize: (?message: untyped?, ?sql: untyped?, ?binds: untyped?, ?table: untyped?,
-                     ?foreign_key: untyped?, ?target_table: untyped?, ?primary_key: untyped?, 
-                     ?primary_key_column: untyped?, ?query_parser: untyped?, 
+                     ?foreign_key: untyped?, ?target_table: untyped?, ?primary_key: untyped?,
+                     ?primary_key_column: untyped?, ?query_parser: untyped?,
                      ?connection_pool: ConnectionAdapters::ConnectionPool?) -> void
   end
 
@@ -114,7 +114,7 @@ module ActiveRecord
     @record_timestamps: bool
 
     def initialize: (untyped model, untyped inserts, on_duplicate: untyped, ?unique_by: untyped?, ?returning: untyped?, ?record_timestamps: bool?) -> untyped
-                  
+
     def record_timestamps?: () -> bool
 
     def keys_including_timestamps: () -> Set[String]
@@ -123,6 +123,12 @@ module ActiveRecord
   end
 end
 
+module Arel
+  class Table
+    def initialize: (untyped name, ?type_caster: untyped type_caster, ?as: untyped? as, ?klass: untyped?) -> void
+  end
+end
+
 module ActiveRecord
   class Relation
     module Methods[Model, PrimaryKey]