que 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd0f74eb9d94a2f949174b802fdd70f898cfe2e3
-  data.tar.gz: 60c5ea6a16dd1080bc16fcea19250c01e94937f6
+  metadata.gz: ec4ff01c0a08ebea8aef1fd75f2948ddabd49794
+  data.tar.gz: b5a5ab2a2276606a5b9b2252690aa97bbaacaf9e
 SHA512:
-  metadata.gz: fdc55d830dccfb0eaed7b7220b2bb65a239b0abda3b7cbd749cd87f7835fc6e521db375ef749e0a3f216f82620b6e76fc6dd6edf3b44c5d80f35feb8a43324ea
-  data.tar.gz: cecc9a9a728cf2445ffc4fed02c050972e8903cd4639594b069252e10f130c8dc96ea7bf2305c81f7a2b3e045e416d13198c3009cc08074d4545ebd232ef1f18
+  metadata.gz: 443ffec355bf4e0ff62734ee6ebf6c5e7665396f98e426696efedeb7b32c556aa7b8976893f799f05ba974c3cdf3509f7f1cf3dea19ddec72ee956879d96ad5c
+  data.tar.gz: 0bdafbc30cb5b538290d9cf1387fbceebd00d2e62d6e89546228f59b7c81e450d825ebb21856142ba11a348b147e3a8be9e751af50b262c64844496d4e3cedde

data/.travis.yml

@@ -5,8 +5,11 @@ rvm:
   - "2.1"
   - "2.2"
   - "2.3"
+  - "2.4"
   - "rbx-2"
-  - "jruby-1.7.5"
+  - "rbx"
+  - "jruby-1.7"
+  - "jruby"
 before_script:
   - psql -c 'create database "que-test"' -U postgres
   - bundle exec ruby -r sequel -r ./lib/que -e 'Que.connection=Sequel.connect("postgres://localhost/que-test"); Que.migrate!'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.12.1 (2017-01-22)
+
+* Fix incompatibility with Rails 5.0. (#166) (nbibler, thedarkone)
+
 ### 0.12.0 (2016-09-09)
 
 *   The error_handler configuration option has been renamed to error_notifier, which is more descriptive of what it's actually supposed to do. You can still use error_handler for configuration, but you'll get a warning.

data/lib/que.rb

@@ -84,7 +84,13 @@ module Que
     end
 
     def worker_states
-      execute :worker_states
+      adapter.checkout do |conn|
+        if conn.server_version >= 90600
+          execute :worker_states_96
+        else
+          execute :worker_states_95
+        end
+      end
     end
 
     # Give us a cleaner interface when specifying a job_class as a string.

data/lib/que/adapters/active_record.rb

@@ -59,7 +59,16 @@ module Que
       private
 
       def checkout_activerecord_adapter(&block)
-        ::ActiveRecord::Base.connection_pool.with_connection(&block)
+        # Use Rails' executor (if present) to make sure that the connection
+        # we're using isn't taken from us while the block runs. See
+        # https://github.com/chanks/que/issues/166#issuecomment-274218910
+        if defined?(Rails.application.executor)
+          Rails.application.executor.wrap do
+            ::ActiveRecord::Base.connection_pool.with_connection(&block)
+          end
+        else
+          ::ActiveRecord::Base.connection_pool.with_connection(&block)
+        end
       end
     end
   end

data/lib/que/sql.rb

@@ -131,7 +131,7 @@ module Que
       ORDER BY count(*) DESC
     }.freeze,
 
-    :worker_states => %{
+    :worker_states_95 => %{
       SELECT que_jobs.*,
              pg.pid          AS pg_backend_pid,
              pg.state        AS pg_state,
@@ -147,6 +147,24 @@ module Que
         JOIN pg_stat_activity USING (pid)
         WHERE locktype = 'advisory'
       ) pg USING (job_id)
-    }.freeze
+    }.freeze,
+
+    :worker_states_96 => %{
+      SELECT que_jobs.*,
+             pg.pid                         AS pg_backend_pid,
+             pg.state                       AS pg_state,
+             pg.state_change                AS pg_state_changed_at,
+             pg.query                       AS pg_last_query,
+             pg.query_start                 AS pg_last_query_started_at,
+             pg.xact_start                  AS pg_transaction_started_at,
+             pg.wait_event_type IS NOT NULL AS pg_waiting_on_lock
+      FROM que_jobs
+      JOIN (
+        SELECT (classid::bigint << 32) + objid::bigint AS job_id, pg_stat_activity.*
+        FROM pg_locks
+        JOIN pg_stat_activity USING (pid)
+        WHERE locktype = 'advisory'
+      ) pg USING (job_id)
+    }.freeze,
   }.freeze
 end

data/lib/que/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Que
-  Version = '0.12.0'
+  Version = '0.12.1'
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'uri'
 require 'pg'
 require 'logger'
 require 'json'
+require 'pry'
 
 Dir['./spec/support/**/*.rb'].sort.each &method(:require)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler