Raise ActiveJob::EnqueueError on ActiveRecordError on enqueuing

Author: rosa

app/models/solid_queue/job.rb

@@ -37,6 +37,11 @@ def enqueue(active_job, scheduled_at: Time.current)
 
         def create_from_active_job(active_job)
           create!(**attributes_from_active_job(active_job))
+        rescue ActiveRecord::ActiveRecordError => e
+          enqueue_error = ActiveJob::EnqueueError.new("#{e.class.name}: #{e.message}").tap do |error|
+            error.set_backtrace e.backtrace
+          end
+          raise enqueue_error
         end
 
         def create_all_from_active_jobs(active_jobs)

test/models/solid_queue/job_test.rb

@@ -241,6 +241,22 @@ class NonOverlappingGroupedJob2 < NonOverlappingJob
     end
   end
 
+  test "raise ActiveJob::EnqueueError when there's an ActiveRecordError" do
+    SolidQueue::Job.stubs(:create!).raises(ActiveRecord::Deadlocked)
+
+    active_job = AddToBufferJob.new(1).set(priority: 8, queue: "test")
+    assert_raises ActiveJob::EnqueueError do
+      SolidQueue::Job.enqueue(active_job)
+    end
+
+    enqueue_result = AddToBufferJob.perform_later(1) do |job|
+      assert job.enqueue_error.is_a? ActiveJob::EnqueueError
+      assert_not job.successfully_enqueued?
+    end
+
+    assert_not enqueue_result
+  end
+
   if ENV["SEPARATE_CONNECTION"] && ENV["TARGET_DB"] != "sqlite"
     test "uses a different connection and transaction than the one in use when connects_to is specified" do
       assert_difference -> { SolidQueue::Job.count } do