queue_classic_plus 4.0.0.alpha14 → 4.0.0.alpha15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02d3b91c1e5eb2b3cd87c4431123bcdcd83546352a101a70d88663914cae8b75
-  data.tar.gz: 2bae8d97dc7e05144fb5d398fafefb870aa0f476ea0d82cd595a26378ca16f75
+  metadata.gz: 634ceaedff254e0c5382a484d574d6971101362a88b9d2185303d95298de06c8
+  data.tar.gz: '03509124366e931f02d928226da3b05ec3e625c5888eaba88f5669ee090566b6'
 SHA512:
-  metadata.gz: b536eafcf6c8a7fd0698a09a9f56b3bd944612df546c857f69784269472cba64a555c639cf856c6811bffdb0037b851d8fb73a3e661785ab295b8b2143408dd7
-  data.tar.gz: f9cc374b667dfdb79f9adba615aab35bd49e2f90fda74eec04681d4f6288547235baba2b676abd118f51d227a436a6a571a8fd758f3828db15cf7436fff93073
+  metadata.gz: 4c8b6ff9e377c59b579c7309ee1f75e3fb583b00450ef09548f46d5d6e921c2553cf64037b259a1267b2781276f2e06ccceb3c8e5d6bc76373dc9e64e7a61522
+  data.tar.gz: d3852486ebdf22d4c59d142a8f00257f2fa7b0847d09704001644e56cb5ab91845ba154807bc2699491f379b62c98656da7b70735c9b3d3ba13638efaddfefb6

data/lib/queue_classic_plus/base.rb

@@ -79,13 +79,19 @@ module QueueClassicPlus
     end
 
     def self.enqueue(method, *args)
-      conn = QC.default_conn_adapter.connection
-      conn.transaction do
-        conn.exec("SELECT pg_advisory_xact_lock(#{queue_name_digest})")
-        if can_enqueue?(method, *args)
-          queue.enqueue(method, *serialized(args))
-        end
-      end
+       conn = QC.default_conn_adapter.connection
+       check_and_enqueue = proc do
+         conn.exec("SELECT pg_advisory_xact_lock(#{queue_name_digest})")
+         if can_enqueue?(method, *args)
+           queue.enqueue(method, *serialized(args))
+         end
+       end
+
+       if [PG::PQTRANS_ACTIVE, PG::PQTRANS_INTRANS].include?(conn.transaction_status)
+         check_and_enqueue.call
+       else
+         conn.transaction &check_and_enqueue
+       end
     end
 
     def self.enqueue_perform(*args)

data/lib/queue_classic_plus/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = '4.0.0.alpha14'.freeze
+  VERSION = '4.0.0.alpha15'.freeze
 end

data/spec/base_spec.rb

@@ -44,6 +44,23 @@ describe QueueClassicPlus::Base do
       end
     end
 
+    context "when in a transaction" do
+      subject do
+        Class.new(QueueClassicPlus::Base) do
+          @queue = :test
+          lock!
+        end
+      end
+
+      it "does not create another transaction when enqueueing" do
+        conn = QC.default_conn_adapter.connection
+        expect(conn).to receive(:transaction).exactly(1).times.and_call_original
+        conn.transaction do
+          subject.do
+        end
+      end
+    end
+
     context "with default settings" do
       subject do
         Class.new(QueueClassicPlus::Base) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_plus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha14
+  version: 4.0.0.alpha15
 platform: ruby
 authors:
 - Simon Mathieu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue_classic