riverqueue-sequel 0.12.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8672d5a5d5c01059a17a307704e5512496aecc5e62f57afe2dfcd5ddd8569a34
-  data.tar.gz: abca68b736d841506449226a45e7b3d049884b40accdfb2c0e5fecf8cbbf896a
+  metadata.gz: 7118a23feeb5d7f021caf92736f9e2ae743abcb17b9271cca7cb028d2840b0b4
+  data.tar.gz: 4282e30b7d4fe282f9600cf10b4ed86cb415930d861070d0bf4c80086e99827e
 SHA512:
-  metadata.gz: 8af058f89ffef579beb2cc91f428a4e004a7d844c61fd2ae588c8214e6fd54e7dc3b22acf7a01feca0dd2474945c5a6ec408378b42918e4f7bd29359c861c8fe
-  data.tar.gz: 1d16f622b3df74b166ffccabee0c2374d810b43d026d344529df4f7d9eb2fd66a7f0bc2448a4e12619d00632c99e119a312f487635074dc14f35c47a44fbffd3
+  metadata.gz: 1c7688d17b1cf81710aaa87774cab9cec264f4692fb7af4819636625b3f77bc187c87a7f23322e71f492e29e8d5438d441ed323f23cf280d1a767be824ed5111
+  data.tar.gz: 21a5b271f12cbdedc4bf93803db4bab136ea35777cd101eb4723fd39b333a2dd54b81389c891017404d2f7c5b0c6bee929bff011b3f75cbd53eae35c996ad979

data/lib/driver.rb

@@ -3,7 +3,7 @@
 require "securerandom"
 
 module River::Driver
-  # Provides a Sequel driver for River supporting PostgreSQL, YugabyteDB, and SQLite.
+  # Provides a Sequel driver for River supporting Postgres, YugabyteDB, and SQLite.
   #
   # Used in conjunction with a River client like:
   #
@@ -18,7 +18,7 @@ module River::Driver
   class Sequel
     include River::Driver::Runtime
 
-    # Creates a driver backed by a connected Sequel::Database for PostgreSQL or
+    # Creates a driver backed by a connected Sequel::Database for Postgres or
     # SQLite.
     def initialize(db)
       @db = db
@@ -31,6 +31,16 @@ module River::Driver
       end
     end
 
+    # Runs the callback only if this transaction and its savepoints commit.
+    def after_commit(&block)
+      @db.after_commit(savepoint: true, &block)
+    end
+
+    # Reports whether this thread has a transaction on the configured database.
+    def in_transaction?
+      @db.in_transaction?
+    end
+
     def job_get_by_id(id)
       if @is_sqlite
         row = sqlite_job_rows("WHERE id = ? LIMIT 1", id).first
@@ -79,10 +89,24 @@ module River::Driver
       end
     end
 
-    # Runs the block in a Sequel transaction or savepoint and returns the
-    # block's result.
-    def transaction(&)
-      @db.transaction(savepoint: true, &)
+    # Runs the block in a Sequel transaction and returns the block's result.
+    # Joins an open transaction instead of opening a savepoint, unless that
+    # transaction uses Sequel's `auto_savepoint`.
+    def transaction
+      block_error = nil
+      options = runtime_legacy_subtransactions? ? {savepoint: true} : {}
+      @db.transaction(**options) do
+        yield
+      rescue ArgumentError => error
+        block_error = error
+        raise
+      end
+    rescue ::Sequel::DatabaseError => error
+      # SQLite treats ArgumentError as an adapter error, even when it came
+      # from an application callback. Preserve that error after rollback.
+      raise block_error if block_error && error.wrapped_exception.equal?(block_error)
+
+      raise
     end
 
     SQLITE_CONFLICT_WHERE = <<~SQL.chomp.freeze
@@ -133,7 +157,7 @@ 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 postgres_insert_params_to_hash(insert_params, nonce)
@@ -163,7 +187,7 @@ module River::Driver
             "unique_key IS NOT NULL AND unique_states IS NOT NULL AND river_job_state_in_bitmask(unique_states, state)"
           ),
           target: [:unique_key],
-          update: {kind: ::Sequel[:excluded][:kind]}
+          update: {kind: ::Sequel[:river_job][:kind]}
         )
         .returning(::Sequel.lit("*, #{capabilities.unique_insert_sql} AS unique_skipped_as_duplicate"))
         .multi_insert(insert_params_array.map { |p| postgres_insert_params_to_hash(p, nonce) })
@@ -197,6 +221,15 @@ module River::Driver
       end
     end
 
+    private def runtime_notification_connection
+      params, schema = @db.synchronize do |connection|
+        [connection.conninfo_hash, connection.exec("SELECT current_schema()").getvalue(0, 0)]
+      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
@@ -209,17 +242,16 @@ module River::Driver
       @db.literal(value)
     end
 
-    private def runtime_unique_violation_class
-      ::Sequel::UniqueConstraintViolation
-    end
-
     private def runtime_value(row, key)
       row[key] || row[key.to_s]
     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},
@@ -238,7 +270,7 @@ module River::Driver
     # matching migration 007 and newer River databases.
     private def sqlite_job_insert_many(insert_params_array)
       nonces = sqlite_insert_nonces(insert_params_array)
-      @db.transaction(savepoint: true) do
+      transaction do
         jobs = insert_params_array.zip(nonces).map { |param, nonce| sqlite_insert_params_to_hash(param, nonce) }
         inserted_nonces = nonces.to_h { |nonce| [nonce, true] }
 
@@ -276,7 +308,7 @@ module River::Driver
           FROM json_each(cast(? AS blob))
           WHERE true
           ON CONFLICT (unique_key) WHERE #{SQLITE_CONFLICT_WHERE}
-          DO UPDATE SET kind = EXCLUDED.kind
+          DO UPDATE SET kind = river_job.kind
           RETURNING #{SQLITE_JOB_COLUMNS}
         SQL
 

metadata

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