riverqueue-activerecord 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09139d53f5cb109997ed71a4d9a0353ee52760f950a5acedb27ac0c0f8b9e21e'
-  data.tar.gz: 768b524dbe9f4b959100dda627137862ec1c53c91709792f02105e63be428bcb
+  metadata.gz: 671bf59d2aaa2199d30f02a1e69466502501577dffec80055c6c2adaadd245b1
+  data.tar.gz: e21b1403bc41a42fd85bb0b38cd9e8df434e0e20bce395a4d67d99e612829d7c
 SHA512:
-  metadata.gz: d78a3de101d1942aa0adf46053072c5c9c93f9a0832b5469671a57530f4860cd95f967ed014e7399f6aa23bd787d715b491f95b9d618749a609b3223a9c693cf
-  data.tar.gz: c3e0b21846b883f82f8980bd8926744009f810670b1eceb038144500084184e2b5fee6147e1bdd849f4ba71e56f091f387d14e8404cc47c3d7fc6363c3fed730
+  metadata.gz: cba4e6c350a89ea5bcc4f524870fba3f49e99c79c7681f6578d2b69af3bd082b68d4668558987a61437150f71c410f5d6a31ee4486f18b9b3645276ad5caf9a2
+  data.tar.gz: 24832d891872a83a27a6871df9d604ab20531749f866a082656decbb5b6ff21a969ced6af7f08b0889ca36aade5474b1d08487885ca37ddf79c2064daacf918d

data/lib/driver.rb

@@ -3,7 +3,7 @@
 require "securerandom"
 
 module River::Driver
-  # Provides an ActiveRecord driver for River supporting PostgreSQL, YugabyteDB,
+  # Provides an ActiveRecord driver for River supporting Postgres, YugabyteDB,
   # and SQLite.
   #
   # Used in conjunction with a River client like:
@@ -17,7 +17,7 @@ module River::Driver
     # Connection class whose pool and transaction context this driver uses.
     attr_reader :connection_class
 
-    # Uses an established PostgreSQL or SQLite connection. The class must be
+    # Uses an established Postgres or SQLite connection. The class must be
     # ActiveRecord::Base or an abstract Active Record class. Routing follows its
     # current role/shard; configure consumers explicitly for each database.
     def initialize(connection_class: ::ActiveRecord::Base)
@@ -48,6 +48,16 @@ module River::Driver
       end
     end
 
+    # Runs the callback only after this connection's outer transaction commits.
+    def after_commit(&block)
+      @connection_class.current_transaction.after_commit(&block)
+    end
+
+    # Reports whether this thread has a transaction on the configured connection.
+    def in_transaction?
+      @connection_class.connection_pool.with_connection(&:transaction_open?)
+    end
+
     def job_get_by_id(id)
       if @is_sqlite
         row = sqlite_job_rows("WHERE id = ? LIMIT 1", [id]).first
@@ -100,10 +110,17 @@ module River::Driver
       end
     end
 
-    # Runs the block in a new Active Record transaction or savepoint and returns
-    # the block's result.
+    # Runs the block in an Active Record transaction and returns the block's
+    # result. Joins an open, joinable transaction instead of opening a
+    # savepoint.
     def transaction(&)
-      @connection_class.transaction(requires_new: true, &)
+      legacy = runtime_legacy_subtransactions?
+      # A joined Active Record block swallows ActiveRecord::Rollback without
+      # rolling anything back. Yield directly so that the transaction's owner
+      # receives it and rolls back, as Sequel does with Sequel::Rollback.
+      return yield if !legacy && @connection_class.connection.current_transaction.joinable?
+
+      @connection_class.transaction(requires_new: legacy, &)
     end
 
     SQLITE_CONFLICT_WHERE = <<~SQL.chomp.freeze
@@ -154,14 +171,21 @@ module River::Driver
     private_constant :SQLITE_CONFLICT_WHERE, :SQLITE_JOB_COLUMNS, :UNIQUE_INSERT_METADATA_KEY
 
     private def format_time(time)
-      time.getutc.round(3).strftime("%Y-%m-%d %H:%M:%S.%3N")
+      normalize_time(time).strftime("%Y-%m-%d %H:%M:%S.%3N")
+    end
+
+    private def notification_query(sql)
+      @connection_class.connection_pool.with_connection { runtime_query_rows(sql) }
     end
 
     private def postgres_insert_params_to_hash(insert_params, nonce)
       metadata = insert_params.metadata || {}
       metadata = metadata.merge(UNIQUE_INSERT_METADATA_KEY => nonce) if nonce
       {
-        args: JSON.parse(insert_params.encoded_args),
+        # Bypass the jsonb attribute type, which would decode and re-encode
+        # the args, losing number spellings like `1.10` and digits beyond
+        # Float precision. Postgres parses the encoded bytes itself instead.
+        args: Arel.sql("CAST(#{runtime_quote(insert_params.encoded_args)} AS jsonb)"),
         kind: insert_params.kind,
         max_attempts: insert_params.max_attempts,
         metadata: metadata,
@@ -236,6 +260,15 @@ module River::Driver
       end
     end
 
+    private def runtime_notification_connection
+      params, schema = @connection_class.connection_pool.with_connection do |connection|
+        [connection.raw_connection.conninfo_hash, connection.select_value("SELECT current_schema()")]
+      end
+      params.compact!
+      params[:connect_timeout] = "5" unless params[:connect_timeout].to_i.positive?
+      [::PG.connect(params), schema]
+    end
+
     private def runtime_postgres?
       !@is_sqlite
     end
@@ -252,17 +285,16 @@ module River::Driver
       @connection_class.connection.quote(value)
     end
 
-    private def runtime_unique_violation_class
-      ::ActiveRecord::RecordNotUnique
-    end
-
     private def runtime_value(row, key)
       row[key.to_s] || row[key]
     end
 
     private def sqlite_insert_params_to_hash(insert_params, nonce)
       {
-        args: JSON.parse(insert_params.encoded_args),
+        # Embed the encoded args as a JSON string so they reach SQLite
+        # byte-for-byte. `json_extract` unwraps the string back to the
+        # encoded JSON text before `jsonb` parses it.
+        args: insert_params.encoded_args,
         kind: insert_params.kind,
         max_attempts: insert_params.max_attempts,
         metadata: {UNIQUE_INSERT_METADATA_KEY => nonce},
@@ -281,7 +313,7 @@ module River::Driver
     # matching migration 007 and newer River databases.
     private def sqlite_job_insert_many(insert_params_many)
       nonces = sqlite_insert_nonces(insert_params_many)
-      @connection_class.transaction(requires_new: true) do
+      transaction do
         jobs = insert_params_many.zip(nonces).map { |param, nonce| sqlite_insert_params_to_hash(param, nonce) }
         inserted_nonces = nonces.to_h { |nonce| [nonce, true] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riverqueue-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Blake Gentry
@@ -14,9 +14,9 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '1000'
@@ -24,9 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '1000'
@@ -56,15 +56,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
-description: ActiveRecord PostgreSQL and SQLite driver for inserting and working River
+        version: 0.14.0
+description: ActiveRecord Postgres and SQLite driver for inserting and working River
   jobs in Ruby.
 email: brandur@brandur.org
 executables: []
@@ -93,5 +93,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 4.0.9
 specification_version: 4
-summary: ActiveRecord PostgreSQL and SQLite driver for the River Ruby gem.
+summary: ActiveRecord Postgres and SQLite driver for the River Ruby gem.
 test_files: []