riverqueue-sequel 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a3869013c8703e42675430a9ac21c77baf72994de9a8398c524ff080b09b374
-  data.tar.gz: 4282e30b7d4fe282f9600cf10b4ed86cb415930d861070d0bf4c80086e99827e
+  metadata.gz: 9722dd3b91092e1f94fa96e670da71802536f4d8c8dc4046d634ad0b7409ca4c
+  data.tar.gz: 0afa80638811c56462b40c1660b5dad2a8affdcbe60b872eddd6b40148fe5d85
 SHA512:
-  metadata.gz: '081f77c7894c5ca3418c0ebb47d8c233b6a58554b2bfcec04aa7c89e901be347c3e69accb212749fa0f46854051544a68104c6816af397c45cd3efe232d4d4c9'
-  data.tar.gz: 21a5b271f12cbdedc4bf93803db4bab136ea35777cd101eb4723fd39b333a2dd54b81389c891017404d2f7c5b0c6bee929bff011b3f75cbd53eae35c996ad979
+  metadata.gz: c83a4915de0f037bfa54a0224583b5f2f7e0381ad016382def5fe933c82a6426519267e7175b8c88a361b87a96ec1d53d82574a0c41bf4685192f5fd6166afd2
+  data.tar.gz: 6a72d66800b17083e7e20d4a0f06b69654a9b3e69166b80d2b1fde8c649505f6c8277dc284e8b5f1bd8921006ad7274806dddddd79b7b613901b1c6aff281b94

data/lib/driver.rb

@@ -58,12 +58,14 @@ module River::Driver
     def job_insert_many(insert_params_array)
       return [] if insert_params_array.empty?
 
-      return sqlite_job_insert_many(insert_params_array) if @is_sqlite
-
-      transaction do
-        results = postgres_job_insert_many(insert_params_array)
-        postgres_notify_insert(insert_params_array)
-        results
+      runtime_insert_transaction(insert_params_array) do
+        if @is_sqlite
+          sqlite_job_insert_many(insert_params_array)
+        else
+          results = postgres_job_insert_many(insert_params_array)
+          postgres_notify_insert(insert_params_array)
+          results
+        end
       end
     end
 
@@ -209,6 +211,10 @@ module River::Driver
       @db.run(sql)
     end
 
+    private def runtime_job_columns
+      @is_sqlite ? SQLITE_JOB_COLUMNS : "*"
+    end
+
     private def runtime_job_list_without_params
       job_list(:all)
     end
@@ -270,55 +276,53 @@ 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)
-      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] }
-
-        sql = <<~SQL
-          INSERT INTO river_job (
-            args,
-            created_at,
-            kind,
-            max_attempts,
-            metadata,
-            priority,
-            queue,
-            scheduled_at,
-            state,
-            tags,
-            unique_key,
-            unique_states
-          )
-          SELECT
-            jsonb(json_extract(value, '$.args')),
-            datetime('now', 'subsec'),
-            cast(json_extract(value, '$.kind') AS text),
-            cast(json_extract(value, '$.max_attempts') AS integer),
-            jsonb(json_extract(value, '$.metadata')),
-            cast(json_extract(value, '$.priority') AS integer),
-            cast(json_extract(value, '$.queue') AS text),
-            coalesce(cast(json_extract(value, '$.scheduled_at') AS text), datetime('now', 'subsec')),
-            cast(json_extract(value, '$.state') AS text),
-            jsonb(json_extract(value, '$.tags')),
-            CASE
-              WHEN length(cast(json_extract(value, '$.unique_key') AS text)) = 0 THEN NULL
-              ELSE unhex(cast(json_extract(value, '$.unique_key') AS text))
-            END,
-            nullif(cast(json_extract(value, '$.unique_states') AS integer), 0)
-          FROM json_each(cast(? AS blob))
-          WHERE true
-          ON CONFLICT (unique_key) WHERE #{SQLITE_CONFLICT_WHERE}
-          DO UPDATE SET kind = river_job.kind
-          RETURNING #{SQLITE_JOB_COLUMNS}
-        SQL
-
-        rows = @db.fetch(sql, JSON.generate(jobs)).all
-        sqlite_notify_insert(insert_params_array)
-
-        rows.map do |row|
-          metadata = JSON.parse(row[:metadata])
-          [sqlite_to_job_row_from_raw(row), !inserted_nonces.key?(metadata[UNIQUE_INSERT_METADATA_KEY])]
-        end
+      jobs = insert_params_array.zip(nonces).map { |param, nonce| sqlite_insert_params_to_hash(param, nonce) }
+      inserted_nonces = nonces.to_h { |nonce| [nonce, true] }
+
+      sql = <<~SQL
+        INSERT INTO river_job (
+          args,
+          created_at,
+          kind,
+          max_attempts,
+          metadata,
+          priority,
+          queue,
+          scheduled_at,
+          state,
+          tags,
+          unique_key,
+          unique_states
+        )
+        SELECT
+          jsonb(json_extract(value, '$.args')),
+          datetime('now', 'subsec'),
+          cast(json_extract(value, '$.kind') AS text),
+          cast(json_extract(value, '$.max_attempts') AS integer),
+          jsonb(json_extract(value, '$.metadata')),
+          cast(json_extract(value, '$.priority') AS integer),
+          cast(json_extract(value, '$.queue') AS text),
+          coalesce(cast(json_extract(value, '$.scheduled_at') AS text), datetime('now', 'subsec')),
+          cast(json_extract(value, '$.state') AS text),
+          jsonb(json_extract(value, '$.tags')),
+          CASE
+            WHEN length(cast(json_extract(value, '$.unique_key') AS text)) = 0 THEN NULL
+            ELSE unhex(cast(json_extract(value, '$.unique_key') AS text))
+          END,
+          nullif(cast(json_extract(value, '$.unique_states') AS integer), 0)
+        FROM json_each(cast(? AS blob))
+        WHERE true
+        ON CONFLICT (unique_key) WHERE #{SQLITE_CONFLICT_WHERE}
+        DO UPDATE SET kind = river_job.kind
+        RETURNING #{SQLITE_JOB_COLUMNS}
+      SQL
+
+      rows = @db.fetch(sql, JSON.generate(jobs)).all
+      sqlite_notify_insert(insert_params_array)
+
+      rows.map do |row|
+        job = sqlite_to_job_row_from_raw(row)
+        [job, !inserted_nonces.key?(job.metadata[UNIQUE_INSERT_METADATA_KEY])]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riverqueue-sequel
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Blake Gentry
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 description: Sequel Postgres and SQLite driver for inserting and working River jobs
   in Ruby.
 email: brandur@brandur.org