1 files changed, 6 insertions, 2 deletions
diff --git a/activejob/lib/active_job/queue_adapters/qu_adapter.rb b/activejob/lib/active_job/queue_adapters/qu_adapter.rb
index 94584ef9d8..0e198922fc 100644
--- a/activejob/lib/active_job/queue_adapters/qu_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/qu_adapter.rb
@@ -17,13 +17,17 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :qu
     class QuAdapter
       def enqueue(job, *args) #:nodoc:
-        Qu::Payload.new(klass: JobWrapper, args: [job.serialize]).tap do |payload|
+        qu_job = Qu::Payload.new(klass: JobWrapper, args: [job.serialize]).tap do |payload|
           payload.instance_variable_set(:@queue, job.queue_name)
         end.push
+        
+        # qu_job can be nil depending on the configured backend
+        job.provider_job_id = qu_job.id unless qu_job.nil?
+        qu_job
       end
 
       def enqueue_at(job, timestamp, *args) #:nodoc:
-        raise NotImplementedError
+        raise NotImplementedError, "This queueing backend does not support scheduling jobs. To see what features are supported go to http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters.html"
       end
 
       class JobWrapper < Qu::Job #:nodoc: