Remove parent/child batch relationship, which simplifies the logic

Author: jpcamara

app/models/solid_queue/batch.rb

@@ -4,18 +4,15 @@ module SolidQueue
   class Batch < Record
     include Trackable
 
-    belongs_to :parent_batch, foreign_key: :parent_batch_id, primary_key: :batch_id, class_name: "SolidQueue::Batch", optional: true
     has_many :jobs, foreign_key: :batch_id, primary_key: :batch_id
     has_many :batch_executions, foreign_key: :batch_id, primary_key: :batch_id, class_name: "SolidQueue::BatchExecution"
-    has_many :child_batches, foreign_key: :parent_batch_id, primary_key: :batch_id, class_name: "SolidQueue::Batch"
 
     serialize :on_finish, coder: JSON
     serialize :on_success, coder: JSON
     serialize :on_failure, coder: JSON
     serialize :metadata, coder: JSON
 
     after_initialize :set_batch_id
-    before_create :set_parent_batch_id
     after_commit :start_batch, on: :create, unless: -> { ActiveRecord.respond_to?(:after_all_transactions_commit) }
 
     mattr_accessor :maintenance_queue_name
@@ -68,10 +65,6 @@ def check_completion!
 
     private
 
-      def set_parent_batch_id
-        self.parent_batch_id ||= Batch.current_batch_id if Batch.current_batch_id.present?
-      end
-
       def set_batch_id
         self.batch_id ||= SecureRandom.uuid
       end
@@ -132,8 +125,7 @@ def enqueue(on_success: nil, on_failure: nil, on_finish: nil, metadata: nil, &bl
             on_success: on_success,
             on_failure: on_failure,
             on_finish: on_finish,
-            metadata: metadata,
-            parent_batch_id: current_batch_id
+            metadata: metadata
           )
 
           batch.enqueue(&block)

lib/generators/solid_queue/install/templates/db/queue_schema.rb

@@ -124,7 +124,6 @@
 
   create_table "solid_queue_batches", force: :cascade do |t|
     t.string "batch_id"
-    t.string "parent_batch_id"
     t.text "on_finish"
     t.text "on_success"
     t.text "on_failure"
@@ -139,14 +138,14 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["batch_id"], name: "index_solid_queue_batches_on_batch_id", unique: true
-    t.index ["parent_batch_id"], name: "index_solid_queue_batches_on_parent_batch_id"
   end
 
   create_table "solid_queue_batch_executions", force: :cascade do |t|
     t.bigint "job_id", null: false
     t.string "batch_id", null: false
     t.datetime "created_at", null: false
     t.index [ "job_id" ], name: "index_solid_queue_batch_executions_on_job_id", unique: true
+    t.index ["batch_id"], name: "index_solid_queue_batch_executions_on_batch_id"
   end
 
   add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade

test/dummy/db/queue_schema.rb

@@ -136,7 +136,6 @@
 
   create_table "solid_queue_batches", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "batch_id"
-    t.string "parent_batch_id"
     t.text "on_finish"
     t.text "on_success"
     t.text "on_failure"
@@ -151,14 +150,14 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["batch_id"], name: "index_solid_queue_batches_on_batch_id", unique: true
-    t.index ["parent_batch_id"], name: "index_solid_queue_batches_on_parent_batch_id"
   end
 
   create_table "solid_queue_batch_executions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "job_id", null: false
     t.string "batch_id", null: false
     t.datetime "created_at", null: false
     t.index ["job_id"], name: "index_solid_queue_batch_executions_on_job_id", unique: true
+    t.index ["batch_id"], name: "index_solid_queue_batch_executions_on_batch_id"
   end
 
   add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade