good_job 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c0b45fcd80fbd536af0f6fed44ef53f446ee6574f7e90d41a38585ec8b3ba63
-  data.tar.gz: 8b45f77d94bd809b25fb725f57622f1966f188157f235e03c56442817e31afd4
+  metadata.gz: 91a09f77d3cb46eb91c4673732e1c52ea752f8d94f95c23c81d3457dc63aa051
+  data.tar.gz: ef21168d4aa96f3dfbf50ebed2339132bea52542209d5732d84ac23028227537
 SHA512:
-  metadata.gz: 820a1847c2dfce6456d925fe73e8373d5b2f19ff9bc2dd143dbf942acfb0c3872b4fdd1dc888741ae7f3974c7f6869ef82ef8c54bd238ceea03bb63ff8829593
-  data.tar.gz: 4faa2442654f37475c22ce7c3e3b440351a5f91a53ac2ada273cba764c409e7f7f108c26b463a736b9880d4097ef9096775905c092bf5860805e3cf7bffede86
+  metadata.gz: 8140a558ee43eeb2e3673462b7279f25cbed256bac385b131aa48c2f0ff59106d2038a39c65f3f1fd11f65cbcf7d3fb232bbfd20c790e7de629047a8eaed742b
+  data.tar.gz: 9daf8d432f5a013fbe5af10176b788c6c2e8c89e0f9b5e12568cbef7a7ecddda2b9296968e1076f71e5f26ed35a2f37d987227e7ad260030807f95404c7dbdeb

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v1.11.1](https://github.com/bensheldon/good_job/tree/v1.11.1) (2021-07-07)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v1.11.0...v1.11.1)
+
+**Closed issues:**
+
+- Database connection required while loading the code on 1.10.x [\#291](https://github.com/bensheldon/good_job/issues/291)
+
+**Merged pull requests:**
+
+- Defer accessing ActiveRecord `primary_key` in Lockable [\#293](https://github.com/bensheldon/good_job/pull/293) ([bensheldon](https://github.com/bensheldon))
+
 ## [v1.11.0](https://github.com/bensheldon/good_job/tree/v1.11.0) (2021-07-07)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v1.10.1...v1.11.0)

data/lib/good_job/lockable.rb

@@ -23,20 +23,20 @@ module GoodJob
 
     included do
       # Default column to be used when creating Advisory Locks
-      cattr_accessor(:advisory_lockable_column, instance_accessor: false) { primary_key }
+      class_attribute :advisory_lockable_column, instance_accessor: false, default: Concurrent::Delay.new { primary_key }
 
       # Default Postgres function to be used for Advisory Locks
-      cattr_accessor(:advisory_lockable_function) { "pg_try_advisory_lock" }
+      class_attribute :advisory_lockable_function, default: "pg_try_advisory_lock"
 
       # Attempt to acquire an advisory lock on the selected records and
       # return only those records for which a lock could be acquired.
-      # @!method advisory_lock(column: advisory_lockable_column, function: advisory_lockable_function)
+      # @!method advisory_lock(column: _advisory_lockable_column, function: advisory_lockable_function)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @param function [String, Symbol]  Postgres Advisory Lock function name to use
       # @return [ActiveRecord::Relation]
       #   A relation selecting only the records that were locked.
-      scope :advisory_lock, (lambda do |column: advisory_lockable_column, function: advisory_lockable_function|
+      scope :advisory_lock, (lambda do |column: _advisory_lockable_column, function: advisory_lockable_function|
         original_query = self
 
         cte_table = Arel::Table.new(:rows)
@@ -64,13 +64,13 @@ module GoodJob
       #
       # For details on +pg_locks+, see
       # {https://www.postgresql.org/docs/current/view-pg-locks.html}.
-      # @!method joins_advisory_locks(column: advisory_lockable_column)
+      # @!method joins_advisory_locks(column: _advisory_lockable_column)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @return [ActiveRecord::Relation]
       # @example Get the records that have a session awaiting a lock:
       #   MyLockableRecord.joins_advisory_locks.where("pg_locks.granted = ?", false)
-      scope :joins_advisory_locks, (lambda do |column: advisory_lockable_column|
+      scope :joins_advisory_locks, (lambda do |column: _advisory_lockable_column|
         join_sql = <<~SQL.squish
           LEFT JOIN pg_locks ON pg_locks.locktype = 'advisory'
             AND pg_locks.objsubid = 1
@@ -82,26 +82,26 @@ module GoodJob
       end)
 
       # Find records that do not have an advisory lock on them.
-      # @!method advisory_unlocked(column: advisory_lockable_column)
+      # @!method advisory_unlocked(column: _advisory_lockable_column)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @return [ActiveRecord::Relation]
-      scope :advisory_unlocked, ->(column: advisory_lockable_column) { joins_advisory_locks(column: column).where(pg_locks: { locktype: nil }) }
+      scope :advisory_unlocked, ->(column: _advisory_lockable_column) { joins_advisory_locks(column: column).where(pg_locks: { locktype: nil }) }
 
       # Find records that have an advisory lock on them.
-      # @!method advisory_locked(column: advisory_lockable_column)
+      # @!method advisory_locked(column: _advisory_lockable_column)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @return [ActiveRecord::Relation]
-      scope :advisory_locked, ->(column: advisory_lockable_column) { joins_advisory_locks(column: column).where.not(pg_locks: { locktype: nil }) }
+      scope :advisory_locked, ->(column: _advisory_lockable_column) { joins_advisory_locks(column: column).where.not(pg_locks: { locktype: nil }) }
 
       # Find records with advisory locks owned by the current Postgres
       # session/connection.
-      # @!method advisory_locked(column: advisory_lockable_column)
+      # @!method advisory_locked(column: _advisory_lockable_column)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @return [ActiveRecord::Relation]
-      scope :owns_advisory_locked, ->(column: advisory_lockable_column) { joins_advisory_locks(column: column).where('"pg_locks"."pid" = pg_backend_pid()') }
+      scope :owns_advisory_locked, ->(column: _advisory_lockable_column) { joins_advisory_locks(column: column).where('"pg_locks"."pid" = pg_backend_pid()') }
 
       # Whether an advisory lock should be acquired in the same transaction
       # that created the record.
@@ -143,7 +143,7 @@ module GoodJob
       #   MyLockableRecord.order(created_at: :asc).limit(2).with_advisory_lock do |record|
       #     do_something_with record
       #   end
-      def with_advisory_lock(column: advisory_lockable_column, function: advisory_lockable_function, unlock_session: false)
+      def with_advisory_lock(column: _advisory_lockable_column, function: advisory_lockable_function, unlock_session: false)
         raise ArgumentError, "Must provide a block" unless block_given?
 
         records = advisory_lock(column: column, function: function).to_a
@@ -154,13 +154,19 @@ module GoodJob
             advisory_unlock_session
           else
             records.each do |record|
-              key = [table_name, record[advisory_lockable_column]].join
+              key = [table_name, record[_advisory_lockable_column]].join
               record.advisory_unlock(key: key, function: advisory_unlockable_function(function))
             end
           end
         end
       end
 
+      # Allow advisory_lockable_column to be a `Concurrent::Delay`
+      def _advisory_lockable_column
+        column = advisory_lockable_column
+        column.respond_to?(:value) ? column.value : column
+      end
+
       def supports_cte_materialization_specifiers?
         return @_supports_cte_materialization_specifiers if defined?(@_supports_cte_materialization_specifiers)
 
@@ -308,7 +314,7 @@ module GoodJob
     # Default Advisory Lock key
     # @return [String]
     def lockable_key
-      [self.class.table_name, self[self.class.advisory_lockable_column]].join
+      [self.class.table_name, self[self.class._advisory_lockable_column]].join
     end
 
     delegate :pg_or_jdbc_query, to: :class

data/lib/good_job/version.rb

@@ -1,4 +1,4 @@
 module GoodJob
   # GoodJob gem version.
-  VERSION = '1.11.0'.freeze
+  VERSION = '1.11.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ben Sheldon