que 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a18d2e13eaf6870dbd5e912bf072b54d4f45e79d
-  data.tar.gz: 74a6bef98e5c1911dcf944c05392941445f71da5
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjYzZDkwOTBkNmUxYjIxZjVkZGEzOTRiZjBmOWQ1OWZiNjUxOTRkYw==
+  data.tar.gz: !binary |-
+    MzIyOTk0ZTE1NGIzMTIwOGEzM2ZkZTAyMzM1NDE5ZDM0YjcwZTUxMQ==
 SHA512:
-  metadata.gz: 22d13ee07b45cab14849d810ffa714d9f773b13a3509f9e5c20e10b1e192c760c4903eed5d8d1721614a29d85b4542d51c3aa440d491047b5cb540e0c497122b
-  data.tar.gz: 8c8cab41047a14bf177e8394439213f4aef0e4688e53f9d99d765ce12d0bd5489db8bd36f335e2e76bf72a19fba4e0f6f3c22670650d3786ff8a6f939ba849dc
+  metadata.gz: !binary |-
+    OGVmMTc2MzNlYjkyNTQwYzhiNDZmMDJlOTdhMDViOGFhYzYzMzgzMGQ0MzY5
+    YzY1OTIzYjg5YmZjZDcyNjJkOWM2ZmY4MWFjNjQ0YmYzODQ4NmM5Y2I0Yjhi
+    Y2Q0YTkwYTk4NDlmNDM1Y2E5OWJlYWE1OWE2MDY5YzIxYTQ0ZWE=
+  data.tar.gz: !binary |-
+    NzlmZWZmY2RjZjc0OGJkNzJhODA5NWY5ZmZkYzY0M2VlMTk5M2NkODQyMmQ1
+    OWYzNjExYmMxMTdmYzQ5NGQ1NTBlNzY3NTA2MjQ5ZDQwZDM3M2FmMTY2ODUz
+    OTVjZjA0ZGVhM2VmZTFkMTViMmI2M2ZmYWM3M2U0N2Y4N2QyNmU=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.7.1 (2014-04-29)
+
+*   Fix errors with prepared statements when ActiveRecord reconnects to the database. (dvrensk)
+
+*   Don't use prepared statements when inside a transaction. This negates the risk of a prepared statement error harming the entire transaction. The query that benefits the most from preparation is the job-lock CTE, which is never run in a transaction, so the performance impact should be negligible.
+
 ### 0.7.0 (2014-04-09)
 
 *   `JobClass.queue(*args)` has been deprecated and will be removed in version 1.0.0. Please use `JobClass.enqueue(*args)` instead.

data/lib/que/adapters/base.rb

@@ -58,14 +58,31 @@ module Que
 
       def execute_prepared(name, params)
         checkout do |conn|
+          # Prepared statement errors have the potential to foul up the entire
+          # transaction, so if we're in one, err on the side of safety.
+          return execute_sql(SQL[name], params) if in_transaction?
+
           statements = @prepared_statements[conn] ||= {}
 
-          unless statements[name]
-            conn.prepare("que_#{name}", SQL[name])
-            statements[name] = true
-          end
+          begin
+            unless statements[name]
+              conn.prepare("que_#{name}", SQL[name])
+              prepared_just_now = statements[name] = true
+            end
+
+            conn.exec_prepared("que_#{name}", params)
+          rescue ::PG::InvalidSqlStatementName => error
+            # Reconnections on ActiveRecord can cause the same connection
+            # objects to refer to new backends, so recover as well as we can.
 
-          conn.exec_prepared("que_#{name}", params)
+            unless prepared_just_now
+              Que.log :level => 'warn', :event => "reprepare_statement", :name => name
+              statements[name] = false
+              retry
+            end
+
+            raise error
+          end
         end
       end
 

data/lib/que/version.rb

@@ -1,3 +1,3 @@
 module Que
-  Version = '0.7.0'
+  Version = '0.7.1'
 end

data/spec/adapters/active_record_spec.rb

@@ -31,6 +31,35 @@ unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
       end
     end
 
+    context "if the connection goes down and is reconnected" do
+      before do
+        Que::Job.enqueue
+        ActiveRecord::Base.connection.reconnect!
+      end
+
+      it "should recreate the prepared statements" do
+        expect { Que::Job.enqueue }.not_to raise_error
+      end
+
+      it "should work properly even in a transaction" do
+        ActiveRecord::Base.transaction do
+          expect { Que::Job.enqueue }.not_to raise_error
+        end
+
+        DB[:que_jobs].count.should == 2
+      end
+
+      it "should log this extraordinary event" do
+        $logger.messages.clear
+        Que::Job.enqueue
+        $logger.messages.count.should == 1
+        message = JSON.load($logger.messages.first)
+        message['lib'].should == 'que'
+        message['event'].should == 'reprepare_statement'
+        message['name'].should == 'insert_job'
+      end
+    end
+
     it "should instantiate args as ActiveSupport::HashWithIndifferentAccess" do
       ArgsJob.enqueue :param => 2
       Que::Job.work

data/spec/spec_helper.rb

@@ -63,6 +63,11 @@ def $logger.method_missing(m, message)
   $logger_mutex.synchronize { messages << message }
 end
 
+# Object includes Kernel#warn which is not what we expect, so remove:
+def $logger.warn(message)
+  method_missing(:warn, message)
+end
+
 
 
 # Helper to display spec descriptions.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A PostgreSQL-based Job Queue