lib/good_job/lockable.rb in good_job-1.2.1 vs lib/good_job/lockable.rb in good_job-1.2.2

@@ -53,23 +53,21 @@
         end
       end
     end
 
     def advisory_lock
-      query = <<~SQL
-        SELECT 1 AS one
-        WHERE pg_try_advisory_lock(('x'||substr(md5(:table_name || :id::text), 1, 16))::bit(64)::bigint)
+      where_sql = <<~SQL
+        pg_try_advisory_lock(('x'||substr(md5(:table_name || :id::text), 1, 16))::bit(64)::bigint)
       SQL
-      self.class.connection.execute(sanitize_sql_for_conditions([query, { table_name: self.class.table_name, id: send(self.class.primary_key) }])).ntuples.positive?
+      self.class.unscoped.where(where_sql, { table_name: self.class.table_name, id: send(self.class.primary_key) }).exists?
     end
 
     def advisory_unlock
-      query = <<~SQL
-        SELECT 1 AS one
-        WHERE pg_advisory_unlock(('x'||substr(md5(:table_name || :id::text), 1, 16))::bit(64)::bigint)
+      where_sql = <<~SQL
+        pg_advisory_unlock(('x'||substr(md5(:table_name || :id::text), 1, 16))::bit(64)::bigint)
       SQL
-      self.class.connection.execute(sanitize_sql_for_conditions([query, { table_name: self.class.table_name, id: send(self.class.primary_key) }])).ntuples.positive?
+      self.class.unscoped.where(where_sql, { table_name: self.class.table_name, id: send(self.class.primary_key) }).exists?
     end
 
     def advisory_lock!
       result = advisory_lock
       result || raise(RecordAlreadyAdvisoryLockedError)
@@ -83,14 +81,14 @@
     ensure
       advisory_unlock unless $ERROR_INFO.is_a? RecordAlreadyAdvisoryLockedError
     end
 
     def advisory_locked?
-      self.class.advisory_locked.where(id: send(self.class.primary_key)).any?
+      self.class.unscoped.advisory_locked.where(id: send(self.class.primary_key)).exists?
     end
 
     def owns_advisory_lock?
-      self.class.owns_advisory_locked.where(id: send(self.class.primary_key)).any?
+      self.class.unscoped.owns_advisory_locked.where(id: send(self.class.primary_key)).exists?
     end
 
     def advisory_unlock!
       advisory_unlock while advisory_locked?
     end