sorbet-rails 0.6.3 → 0.7.1

data/spec/test_data/v6.0/expected_spell_book/habtm_spells.rbi

@@ -8,8 +8,6 @@ module SpellBook::HABTM_Spells::ActiveRelation_WhereNot
 end
 
 module SpellBook::HABTM_Spells::GeneratedAttributeMethods
-  extend T::Sig
-
   sig { returns(Integer) }
   def spell_book_id; end
 
@@ -30,17 +28,33 @@ module SpellBook::HABTM_Spells::GeneratedAttributeMethods
 end
 
 module SpellBook::HABTM_Spells::GeneratedAssociationMethods
-  extend T::Sig
-
   sig { returns(T.nilable(::SpellBook)) }
   def left_side; end
 
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::SpellBook).void)).returns(::SpellBook) }
+  def build_left_side(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::SpellBook).void)).returns(::SpellBook) }
+  def create_left_side(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::SpellBook).void)).returns(::SpellBook) }
+  def create_left_side!(*args, &block); end
+
   sig { params(value: T.nilable(::SpellBook)).void }
   def left_side=(value); end
 
   sig { returns(::Spell) }
   def spell; end
 
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Spell).void)).returns(::Spell) }
+  def build_spell(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Spell).void)).returns(::Spell) }
+  def create_spell(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Spell).void)).returns(::Spell) }
+  def create_spell!(*args, &block); end
+
   sig { params(value: ::Spell).void }
   def spell=(value); end
 end
@@ -66,117 +80,11 @@ class SpellBook::HABTM_Spells < ActiveRecord::Base
   include SpellBook::HABTM_Spells::GeneratedAttributeMethods
   include SpellBook::HABTM_Spells::GeneratedAssociationMethods
   extend SpellBook::HABTM_Spells::CustomFinderMethods
-  extend T::Sig
-  extend T::Generic
+  extend SpellBook::HABTM_Spells::QueryMethodsReturningRelation
   RelationType = T.type_alias { T.any(SpellBook::HABTM_Spells::ActiveRecord_Relation, SpellBook::HABTM_Spells::ActiveRecord_Associations_CollectionProxy, SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-
-  sig { returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.all; end
-
-  sig { params(block: T.nilable(T.proc.void)).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.unscoped(&block); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.select(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.reselect(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.order(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.reorder(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.group(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.limit(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.offset(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.joins(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.left_joins(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.left_outer_joins(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.where(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.rewhere(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.preload(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.extract_associated(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.eager_load(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.includes(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.from(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.lock(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.readonly(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.or(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.having(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.create_with(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.distinct(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.references(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.none(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.unscope(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.optimizer_hints(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.merge(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.except(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.only(*args); end
-
-  sig { params(args: T.untyped, block: T.nilable(T.proc.void)).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
-  def self.extending(*args, &block); end
 end
 
-class SpellBook::HABTM_Spells::ActiveRecord_Relation < ActiveRecord::Relation
-  include SpellBook::HABTM_Spells::ActiveRelation_WhereNot
-  include SpellBook::HABTM_Spells::CustomFinderMethods
-  extend T::Sig
-  extend T::Generic
-  Elem = type_member(fixed: SpellBook::HABTM_Spells)
-
+module SpellBook::HABTM_Spells::QueryMethodsReturningRelation
   sig { returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
   def all; end
 
@@ -275,19 +183,25 @@ class SpellBook::HABTM_Spells::ActiveRecord_Relation < ActiveRecord::Relation
 
   sig { params(args: T.untyped, block: T.nilable(T.proc.void)).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
   def extending(*args, &block); end
-end
 
-class SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation < ActiveRecord::AssociationRelation
-  include SpellBook::HABTM_Spells::ActiveRelation_WhereNot
-  include SpellBook::HABTM_Spells::CustomFinderMethods
-  extend T::Sig
-  extend T::Generic
-  Elem = type_member(fixed: SpellBook::HABTM_Spells)
+  sig do
+    params(
+      of: T.nilable(Integer),
+      start: T.nilable(Integer),
+      finish: T.nilable(Integer),
+      load: T.nilable(T::Boolean),
+      error_on_ignore: T.nilable(T::Boolean),
+      block: T.nilable(T.proc.params(e: SpellBook::HABTM_Spells::ActiveRecord_Relation).void)
+    ).returns(ActiveRecord::Batches::BatchEnumerator)
+  end
+  def in_batches(of: 1000, start: nil, finish: nil, load: false, error_on_ignore: nil, &block); end
+end
 
+module SpellBook::HABTM_Spells::QueryMethodsReturningAssociationRelation
   sig { returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
   def all; end
 
-  sig { params(block: T.nilable(T.proc.void)).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
+  sig { params(block: T.nilable(T.proc.void)).returns(SpellBook::HABTM_Spells::ActiveRecord_Relation) }
   def unscoped(&block); end
 
   sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
@@ -382,112 +296,38 @@ class SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation < ActiveRecord::
 
   sig { params(args: T.untyped, block: T.nilable(T.proc.void)).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
   def extending(*args, &block); end
+
+  sig do
+    params(
+      of: T.nilable(Integer),
+      start: T.nilable(Integer),
+      finish: T.nilable(Integer),
+      load: T.nilable(T::Boolean),
+      error_on_ignore: T.nilable(T::Boolean),
+      block: T.nilable(T.proc.params(e: SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation).void)
+    ).returns(ActiveRecord::Batches::BatchEnumerator)
+  end
+  def in_batches(of: 1000, start: nil, finish: nil, load: false, error_on_ignore: nil, &block); end
 end
 
-class SpellBook::HABTM_Spells::ActiveRecord_Associations_CollectionProxy < ActiveRecord::Associations::CollectionProxy
+class SpellBook::HABTM_Spells::ActiveRecord_Relation < ActiveRecord::Relation
+  include SpellBook::HABTM_Spells::ActiveRelation_WhereNot
   include SpellBook::HABTM_Spells::CustomFinderMethods
-  extend T::Sig
-  extend T::Generic
+  include SpellBook::HABTM_Spells::QueryMethodsReturningRelation
   Elem = type_member(fixed: SpellBook::HABTM_Spells)
+end
 
-  sig { returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def all; end
-
-  sig { params(block: T.nilable(T.proc.void)).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def unscoped(&block); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def select(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def reselect(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def order(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def reorder(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def group(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def limit(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def offset(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def joins(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def left_joins(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def left_outer_joins(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def where(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def rewhere(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def preload(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def extract_associated(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def eager_load(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def includes(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def from(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def lock(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def readonly(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def or(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def having(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def create_with(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def distinct(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def references(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def none(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def unscope(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def optimizer_hints(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def merge(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def except(*args); end
-
-  sig { params(args: T.untyped).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def only(*args); end
+class SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation < ActiveRecord::AssociationRelation
+  include SpellBook::HABTM_Spells::ActiveRelation_WhereNot
+  include SpellBook::HABTM_Spells::CustomFinderMethods
+  include SpellBook::HABTM_Spells::QueryMethodsReturningAssociationRelation
+  Elem = type_member(fixed: SpellBook::HABTM_Spells)
+end
 
-  sig { params(args: T.untyped, block: T.nilable(T.proc.void)).returns(SpellBook::HABTM_Spells::ActiveRecord_AssociationRelation) }
-  def extending(*args, &block); end
+class SpellBook::HABTM_Spells::ActiveRecord_Associations_CollectionProxy < ActiveRecord::Associations::CollectionProxy
+  include SpellBook::HABTM_Spells::CustomFinderMethods
+  include SpellBook::HABTM_Spells::QueryMethodsReturningAssociationRelation
+  Elem = type_member(fixed: SpellBook::HABTM_Spells)
 
   sig { params(records: T.any(SpellBook::HABTM_Spells, T::Array[SpellBook::HABTM_Spells])).returns(T.self_type) }
   def <<(*records); end

data/spec/test_data/v6.0/expected_squib.rbi

@@ -3,8 +3,6 @@
 
 # typed: strong
 module Squib::EnumInstanceMethods
-  extend T::Sig
-
   sig { returns(T::Boolean) }
   def broom_nimbus?; end
 
@@ -114,8 +112,6 @@ module Squib::ActiveRelation_WhereNot
 end
 
 module Squib::GeneratedAttributeMethods
-  extend T::Sig
-
   sig { returns(T.nilable(String)) }
   def broom; end
 
@@ -274,8 +270,7 @@ class Squib < Wizard
   include Squib::GeneratedAttributeMethods
   include Squib::GeneratedAssociationMethods
   extend Squib::CustomFinderMethods
-  extend T::Sig
-  extend T::Generic
+  extend Squib::QueryMethodsReturningRelation
   RelationType = T.type_alias { T.any(Squib::ActiveRecord_Relation, Squib::ActiveRecord_Associations_CollectionProxy, Squib::ActiveRecord_AssociationRelation) }
 
   sig { returns(T::Hash[T.any(String, Symbol), String]) }
@@ -406,112 +401,12 @@ class Squib < Wizard
 
   sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
   def self.with_attached_school_photo(*args); end
-
-  sig { returns(Squib::ActiveRecord_Relation) }
-  def self.all; end
-
-  sig { params(block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_Relation) }
-  def self.unscoped(&block); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.select(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.reselect(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.order(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.reorder(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.group(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.limit(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.offset(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.joins(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.left_joins(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.left_outer_joins(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.where(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.rewhere(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.preload(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.extract_associated(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.eager_load(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.includes(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.from(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.lock(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.readonly(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.or(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.having(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.create_with(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.distinct(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.references(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.none(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.unscope(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.optimizer_hints(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.merge(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.except(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def self.only(*args); end
-
-  sig { params(args: T.untyped, block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_Relation) }
-  def self.extending(*args, &block); end
 end
 
 class Squib::ActiveRecord_Relation < ActiveRecord::Relation
   include Squib::ActiveRelation_WhereNot
   include Squib::CustomFinderMethods
-  extend T::Sig
-  extend T::Generic
+  include Squib::QueryMethodsReturningRelation
   Elem = type_member(fixed: Squib)
 
   sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
@@ -624,112 +519,12 @@ class Squib::ActiveRecord_Relation < ActiveRecord::Relation
 
   sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
   def with_attached_school_photo(*args); end
-
-  sig { returns(Squib::ActiveRecord_Relation) }
-  def all; end
-
-  sig { params(block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_Relation) }
-  def unscoped(&block); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def select(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def reselect(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def order(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def reorder(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def group(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def limit(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def offset(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def joins(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def left_joins(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def left_outer_joins(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def where(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def rewhere(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def preload(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def extract_associated(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def eager_load(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def includes(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def from(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def lock(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def readonly(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def or(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def having(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def create_with(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def distinct(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def references(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def none(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def unscope(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def optimizer_hints(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def merge(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def except(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
-  def only(*args); end
-
-  sig { params(args: T.untyped, block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_Relation) }
-  def extending(*args, &block); end
 end
 
 class Squib::ActiveRecord_AssociationRelation < ActiveRecord::AssociationRelation
   include Squib::ActiveRelation_WhereNot
   include Squib::CustomFinderMethods
-  extend T::Sig
-  extend T::Generic
+  include Squib::QueryMethodsReturningAssociationRelation
   Elem = type_member(fixed: Squib)
 
   sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
@@ -842,111 +637,11 @@ class Squib::ActiveRecord_AssociationRelation < ActiveRecord::AssociationRelatio
 
   sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
   def with_attached_school_photo(*args); end
-
-  sig { returns(Squib::ActiveRecord_AssociationRelation) }
-  def all; end
-
-  sig { params(block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_AssociationRelation) }
-  def unscoped(&block); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def select(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def reselect(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def order(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def reorder(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def group(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def limit(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def offset(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def joins(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def left_joins(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def left_outer_joins(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def where(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def rewhere(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def preload(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def extract_associated(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def eager_load(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def includes(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def from(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def lock(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def readonly(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def or(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def having(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def create_with(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def distinct(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def references(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def none(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def unscope(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def optimizer_hints(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def merge(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def except(*args); end
-
-  sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
-  def only(*args); end
-
-  sig { params(args: T.untyped, block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_AssociationRelation) }
-  def extending(*args, &block); end
 end
 
 class Squib::ActiveRecord_Associations_CollectionProxy < ActiveRecord::Associations::CollectionProxy
   include Squib::CustomFinderMethods
-  extend T::Sig
-  extend T::Generic
+  include Squib::QueryMethodsReturningAssociationRelation
   Elem = type_member(fixed: Squib)
 
   sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
@@ -1060,10 +755,137 @@ class Squib::ActiveRecord_Associations_CollectionProxy < ActiveRecord::Associati
   sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
   def with_attached_school_photo(*args); end
 
+  sig { params(records: T.any(Squib, T::Array[Squib])).returns(T.self_type) }
+  def <<(*records); end
+
+  sig { params(records: T.any(Squib, T::Array[Squib])).returns(T.self_type) }
+  def append(*records); end
+
+  sig { params(records: T.any(Squib, T::Array[Squib])).returns(T.self_type) }
+  def push(*records); end
+
+  sig { params(records: T.any(Squib, T::Array[Squib])).returns(T.self_type) }
+  def concat(*records); end
+end
+
+module Squib::QueryMethodsReturningRelation
+  sig { returns(Squib::ActiveRecord_Relation) }
+  def all; end
+
+  sig { params(block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_Relation) }
+  def unscoped(&block); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def select(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def reselect(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def order(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def reorder(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def group(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def limit(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def offset(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def joins(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def left_joins(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def left_outer_joins(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def where(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def rewhere(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def preload(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def extract_associated(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def eager_load(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def includes(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def from(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def lock(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def readonly(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def or(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def having(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def create_with(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def distinct(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def references(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def none(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def unscope(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def optimizer_hints(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def merge(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def except(*args); end
+
+  sig { params(args: T.untyped).returns(Squib::ActiveRecord_Relation) }
+  def only(*args); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_Relation) }
+  def extending(*args, &block); end
+
+  sig do
+    params(
+      of: T.nilable(Integer),
+      start: T.nilable(Integer),
+      finish: T.nilable(Integer),
+      load: T.nilable(T::Boolean),
+      error_on_ignore: T.nilable(T::Boolean),
+      block: T.nilable(T.proc.params(e: Squib::ActiveRecord_Relation).void)
+    ).returns(ActiveRecord::Batches::BatchEnumerator)
+  end
+  def in_batches(of: 1000, start: nil, finish: nil, load: false, error_on_ignore: nil, &block); end
+end
+
+module Squib::QueryMethodsReturningAssociationRelation
   sig { returns(Squib::ActiveRecord_AssociationRelation) }
   def all; end
 
-  sig { params(block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_AssociationRelation) }
+  sig { params(block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_Relation) }
   def unscoped(&block); end
 
   sig { params(args: T.untyped).returns(Squib::ActiveRecord_AssociationRelation) }
@@ -1159,26 +981,24 @@ class Squib::ActiveRecord_Associations_CollectionProxy < ActiveRecord::Associati
   sig { params(args: T.untyped, block: T.nilable(T.proc.void)).returns(Squib::ActiveRecord_AssociationRelation) }
   def extending(*args, &block); end
 
-  sig { params(records: T.any(Squib, T::Array[Squib])).returns(T.self_type) }
-  def <<(*records); end
-
-  sig { params(records: T.any(Squib, T::Array[Squib])).returns(T.self_type) }
-  def append(*records); end
-
-  sig { params(records: T.any(Squib, T::Array[Squib])).returns(T.self_type) }
-  def push(*records); end
-
-  sig { params(records: T.any(Squib, T::Array[Squib])).returns(T.self_type) }
-  def concat(*records); end
+  sig do
+    params(
+      of: T.nilable(Integer),
+      start: T.nilable(Integer),
+      finish: T.nilable(Integer),
+      load: T.nilable(T::Boolean),
+      error_on_ignore: T.nilable(T::Boolean),
+      block: T.nilable(T.proc.params(e: Squib::ActiveRecord_AssociationRelation).void)
+    ).returns(ActiveRecord::Batches::BatchEnumerator)
+  end
+  def in_batches(of: 1000, start: nil, finish: nil, load: false, error_on_ignore: nil, &block); end
 end
 
 module Squib::GeneratedAssociationMethods
-  extend T::Sig
-
   sig { returns(::ActiveStorage::Attachment::ActiveRecord_Associations_CollectionProxy) }
   def hats_attachments; end
 
-  sig { returns(T::Array[Integer]) }
+  sig { returns(T::Array[T.untyped]) }
   def hats_attachment_ids; end
 
   sig { params(value: T::Enumerable[::ActiveStorage::Attachment]).void }
@@ -1187,7 +1007,7 @@ module Squib::GeneratedAssociationMethods
   sig { returns(::ActiveStorage::Blob::ActiveRecord_Associations_CollectionProxy) }
   def hats_blobs; end
 
-  sig { returns(T::Array[Integer]) }
+  sig { returns(T::Array[T.untyped]) }
   def hats_blob_ids; end
 
   sig { params(value: T::Enumerable[::ActiveStorage::Blob]).void }
@@ -1196,18 +1016,45 @@ module Squib::GeneratedAssociationMethods
   sig { returns(T.nilable(::School)) }
   def school; end
 
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::School).void)).returns(::School) }
+  def build_school(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::School).void)).returns(::School) }
+  def create_school(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::School).void)).returns(::School) }
+  def create_school!(*args, &block); end
+
   sig { params(value: T.nilable(::School)).void }
   def school=(value); end
 
   sig { returns(T.nilable(::ActiveStorage::Attachment)) }
   def school_photo_attachment; end
 
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::ActiveStorage::Attachment).void)).returns(::ActiveStorage::Attachment) }
+  def build_school_photo_attachment(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::ActiveStorage::Attachment).void)).returns(::ActiveStorage::Attachment) }
+  def create_school_photo_attachment(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::ActiveStorage::Attachment).void)).returns(::ActiveStorage::Attachment) }
+  def create_school_photo_attachment!(*args, &block); end
+
   sig { params(value: T.nilable(::ActiveStorage::Attachment)).void }
   def school_photo_attachment=(value); end
 
   sig { returns(T.nilable(::ActiveStorage::Blob)) }
   def school_photo_blob; end
 
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::ActiveStorage::Blob).void)).returns(::ActiveStorage::Blob) }
+  def build_school_photo_blob(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::ActiveStorage::Blob).void)).returns(::ActiveStorage::Blob) }
+  def create_school_photo_blob(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::ActiveStorage::Blob).void)).returns(::ActiveStorage::Blob) }
+  def create_school_photo_blob!(*args, &block); end
+
   sig { params(value: T.nilable(::ActiveStorage::Blob)).void }
   def school_photo_blob=(value); end
 
@@ -1232,6 +1079,15 @@ module Squib::GeneratedAssociationMethods
   sig { returns(T.nilable(::Wand)) }
   def wand; end
 
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Wand).void)).returns(::Wand) }
+  def build_wand(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Wand).void)).returns(::Wand) }
+  def create_wand(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Wand).void)).returns(::Wand) }
+  def create_wand!(*args, &block); end
+
   sig { params(value: T.nilable(::Wand)).void }
   def wand=(value); end
 
@@ -1245,5 +1101,5 @@ module Squib::GeneratedAssociationMethods
   def hats; end
 
   sig { params(attachables: T.untyped).returns(T.untyped) }
-  def hats=(*attachables); end
+  def hats=(attachables); end
 end