with_advisory_lock 5.3.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65989d7502660ac5cbebd51a589fc49fb76bbeae5abb13814cb79a711fdaae8
-  data.tar.gz: 2eea1e741e2fdb100d3170ddce8c38b1d0fc59dc98f6340be51d6d5bde0591a4
+  metadata.gz: f594bf1ed9b20028febee227bd33eddf70f2c3deb42ae7e8a4d83d794125281d
+  data.tar.gz: 6882cea1e84d517bdf847b8f66b7dd6bb7b6c93de09c156b459019aab324ace0
 SHA512:
-  metadata.gz: 8358a8783df5bcf9bd49507fc6e59d56aeaec8febd3978a4f9178950c88b254ec76925e3caa9f9f2ee18d7bc15d186512b3790dd1ba602a38fa6d1a877570887
-  data.tar.gz: d179cc20743f15a671ad822fd21e04e808336382d2eed318439e7b9c5ae9283ff4abf0576e5b0c274946863033f403d27280dfec84b3e3e4ff20f832ca62bcb5
+  metadata.gz: a89eff2b9fccadd2f64ac7467c9daf19156fbac5196358b9ce7089c2d743c353e4fbb8b993d2c0440b0f253c78a56620a603cd9d41dd0e3f027e02b5f901f72c
+  data.tar.gz: 02b5903b081175e8f7ce07450738fd88d8f0f92dfc52fbb6901e9738aa90312313c3313c70ccfcdab998aa799399a173215edf913145b72d56958042681fb4e6

data/.github/workflows/ci.yml

@@ -0,0 +1,76 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - master
+
+concurrency:
+  group: ci-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  minitest:
+    runs-on: ubuntu-latest
+    name: CI Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
+    services:
+      postgres:
+        image: 'postgres:17-alpine'
+        ports:
+         - '5432'
+        env:
+          POSTGRES_USER: with_advisory
+          POSTGRES_PASSWORD: with_advisory_pass
+          POSTGRES_DB: with_advisory_lock_test
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      mysql:
+        image: mysql/mysql-server
+        ports:
+          - 3306
+        env:
+          MYSQL_USER: with_advisory
+          MYSQL_PASSWORD: with_advisory_pass
+          MYSQL_DATABASE: with_advisory_lock_test
+          MYSQL_ROOT_HOST: '%'
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '3.3'
+          - '3.4'
+          - 'truffleruby'
+        rails:
+          - 7.2
+          - "8.0"
+    env:
+      ACTIVERECORD_VERSION: ${{ matrix.rails }}
+      RAILS_ENV: test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          rubygems: latest
+
+      - name: Setup test databases
+        env:
+          DATABASE_URL_PG: postgres://with_advisory:with_advisory_pass@localhost:${{ job.services.postgres.ports[5432] }}/with_advisory_lock_test
+          DATABASE_URL_MYSQL: mysql2://with_advisory:with_advisory_pass@127.0.0.1:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test
+        run: |
+          cd test/dummy
+          bundle exec rake db:test:prepare
+
+      - name: Test
+        env:
+          DATABASE_URL_PG: postgres://with_advisory:with_advisory_pass@localhost:${{ job.services.postgres.ports[5432] }}/with_advisory_lock_test
+          DATABASE_URL_MYSQL: mysql2://with_advisory:with_advisory_pass@127.0.0.1:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test
+          WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
+        run: bin/rails test

data/.gitignore

@@ -18,5 +18,5 @@ test/tmp
 test/version_tmp
 tmp
 *.iml
-test/sqlite.db
-.env
+.env
+test/dummy/log/

data/.release-please-manifest.json

@@ -1 +1 @@
-{".":"5.3.0"}
+{".":"7.0.1"}

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 ## Changelog
 
+## [7.0.1](https://github.com/ClosureTree/with_advisory_lock/compare/with_advisory_lock/v7.0.0...with_advisory_lock/v7.0.1) (2025-07-21)
+
+
+### Bug Fixes
+
+* handle ActiveRecord's release_advisory_lock signature for Rails 7.2+ ([#127](https://github.com/ClosureTree/with_advisory_lock/issues/127)) ([94253ca](https://github.com/ClosureTree/with_advisory_lock/commit/94253ca2af7f684a3c99645765853546c3da8e02)), closes [#126](https://github.com/ClosureTree/with_advisory_lock/issues/126)
+
+## [7.0.0](https://github.com/ClosureTree/with_advisory_lock/compare/with_advisory_lock/v6.0.0...with_advisory_lock/v7.0.0) (2025-07-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* require Rails 7.2+ as minimum version
+
+### Features
+
+* fire Ruby from its second job checking locks and let PostgreSQL do what it's paid for ([#124](https://github.com/ClosureTree/with_advisory_lock/issues/124)) ([f7f8dbc](https://github.com/ClosureTree/with_advisory_lock/commit/f7f8dbcd69842a358d0d70227bcc52ba3183c098))
+* handle connection disconnection gracefully ([1944e98](https://github.com/ClosureTree/with_advisory_lock/commit/1944e98877917e234bfe597f9358c0b74643a045))
+* handle connection disconnection gracefully ([77046a9](https://github.com/ClosureTree/with_advisory_lock/commit/77046a94c7504f77a59fae6fbcd75e73ed41bf23))
+* implement MySQL native timeout support ([#123](https://github.com/ClosureTree/with_advisory_lock/issues/123)) ([387dedd](https://github.com/ClosureTree/with_advisory_lock/commit/387dedd133c897f7a3da13ed2ebbd9223b81317d))
+* require Rails 7.2+ as minimum version ([d4e7826](https://github.com/ClosureTree/with_advisory_lock/commit/d4e7826ddc216c103cd666674068cb7f512fc32d))
+* validate transaction-level locks require active transaction ([#122](https://github.com/ClosureTree/with_advisory_lock/issues/122)) ([e4bc6c1](https://github.com/ClosureTree/with_advisory_lock/commit/e4bc6c10666e02c560f18629df0106c39bb85e19))
+
+## [6.0.0](https://github.com/ClosureTree/with_advisory_lock/compare/with_advisory_lock/v5.3.0...with_advisory_lock/v6.0.0) (2025-05-28)
+
+
+### ⚠ BREAKING CHANGES
+
+* Remove private APIs (Base, DatabaseAdapterSupport). Add full mixed adapter support for PostgreSQL/MySQL in same app. Add JRuby compatibility.
+* drop support for sqlite3
+* drop legacy version of ruby/rails ([#113](https://github.com/ClosureTree/with_advisory_lock/issues/113))
+
+### Features
+
+* drop legacy version of ruby/rails ([#113](https://github.com/ClosureTree/with_advisory_lock/issues/113)) ([26fd427](https://github.com/ClosureTree/with_advisory_lock/commit/26fd4278f9fa155974e6f86df7cd92dd2b7d9154))
+* drop support for sqlite3 ([26fd427](https://github.com/ClosureTree/with_advisory_lock/commit/26fd4278f9fa155974e6f86df7cd92dd2b7d9154))
+* move to rails dummy app to test multidb setup ([#115](https://github.com/ClosureTree/with_advisory_lock/issues/115)) ([71a3431](https://github.com/ClosureTree/with_advisory_lock/commit/71a34316b365a0f3be0e8a046db14289e69efc9c))
+* support of multidb  ([#116](https://github.com/ClosureTree/with_advisory_lock/issues/116)) ([935e7e5](https://github.com/ClosureTree/with_advisory_lock/commit/935e7e5fb05dad2eba034745d2ef49e11c163f7d))
+
 ## [5.3.0](https://github.com/ClosureTree/with_advisory_lock/compare/with_advisory_lock/v5.2.0...with_advisory_lock/v5.3.0) (2025-04-25)
 
 

data/Gemfile

@@ -1,3 +1,34 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'rake'
+
+# Gems that will be removed from default gems in Ruby 3.5.0
+gem 'benchmark'
+gem 'logger'
+gem 'ostruct'
+
+activerecord_version = ENV.fetch('ACTIVERECORD_VERSION', '7.2')
+
+gem 'activerecord', "~> #{activerecord_version}.0"
+
+gem 'dotenv'
+gem 'railties'
+
+platforms :ruby do
+  gem 'mysql2'
+  gem 'pg'
+  gem 'sqlite3'
+  gem 'trilogy'
+end
+
+platforms :jruby do
+  # JRuby JDBC adapters support Rails 7.2+
+  if activerecord_version >= '7.2'
+    gem 'activerecord-jdbcmysql-adapter', '~> 72.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 72.0'
+  end
+end

data/Makefile

@@ -1,14 +1,10 @@
-.PHONY: test-pg test-mysql
+.PHONY: test
 
-test-pg:
-	docker compose up -d pg
-	sleep 10 # give some time for the service to start
-	DATABASE_URL=postgres://with_advisory:with_advisory_pass@localhost/with_advisory_lock_test appraisal rake test
+test: setup-db
+	bin/rails test
 
-test-mysql:
-	docker compose up -d mysql
-	sleep 10 # give some time for the service to start
-	DATABASE_URL=mysql2://with_advisory:with_advisory_pass@0.0.0.0:3306/with_advisory_lock_test appraisal rake test
-
-
-test: test-pg test-mysql
+setup-db:
+	docker compose up -d
+	sleep 2
+	bundle
+	bin/setup_test_db

data/README.md

@@ -1,10 +1,13 @@
 # with_advisory_lock
 
-Adds advisory locking (mutexes) to ActiveRecord  6.0+, with ruby 2.7+, jruby or truffleruby, when used with
+Adds advisory locking (mutexes) to ActiveRecord 7.2+, with ruby 3.3+, jruby or truffleruby, when used with
 [MySQL](https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html#function_get-lock)
 or
 [PostgreSQL](https://www.postgresql.org/docs/current/static/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS).
-SQLite resorts to file locking.
+
+**Note:** SQLite support has been removed. For single-node SQLite deployments,
+consider using a Ruby mutex instead. Support for MySQL 5.7 has also been
+dropped; please use MySQL 8 or PostgreSQL.
 
 [![Gem Version](https://badge.fury.io/rb/with_advisory_lock.svg)](https://badge.fury.io/rb/with_advisory_lock)
 [![CI](https://github.com/ClosureTree/with_advisory_lock/actions/workflows/ci.yml/badge.svg)](https://github.com/ClosureTree/with_advisory_lock/actions/workflows/ci.yml)
@@ -13,7 +16,7 @@ SQLite resorts to file locking.
 
 An advisory lock is a [mutex](https://en.wikipedia.org/wiki/Mutual_exclusion)
 used to ensure no two processes run some process at the same time. When the
-advisory lock is powered by your database server, as long as it isn't SQLite,
+advisory lock is powered by your database server,
 your mutex spans hosts.
 
 ## Usage
@@ -134,7 +137,7 @@ row-level locks prevent concurrent modification to a given model.
 
 **If you're building a
 [CRUD](http://en.wikipedia.org/wiki/Create,_read,_update_and_delete)
-application, this will be 2.4, 2.5 and  your most commonly used lock.**
+application, this will be 2.4, 2.5 and your most commonly used lock.**
 
 ### Table-level locks
 
@@ -152,38 +155,7 @@ Advisory locks with MySQL and PostgreSQL ignore database transaction boundaries.
 
 You will want to wrap your block within a transaction to ensure consistency.
 
-### MySQL < 5.7.5 doesn't support nesting
-
-With MySQL < 5.7.5, if you ask for a _different_ advisory lock within
-a `with_advisory_lock` block, you will be releasing the parent lock (!!!). A
-`NestedAdvisoryLockError`will be raised in this case. If you ask for the same
-lock name, `with_advisory_lock` won't ask for the lock again, and the block
-given will be yielded to.
-
-This is not an issue in MySQL >= 5.7.5, and no error will be raised for nested
-lock usage. You can override this by passing `force_nested_lock_support: true`
-or `force_nested_lock_support: false` to the `with_advisory_lock` options.
-
 ### Is clustered MySQL supported?
 
 [No.](https://github.com/ClosureTree/with_advisory_lock/issues/16)
 
-### There are many `lock-*` files in my project directory after test runs
-
-This is expected if you aren't using MySQL or Postgresql for your tests.
-See [issue 3](https://github.com/ClosureTree/with_advisory_lock/issues/3).
-
-SQLite doesn't have advisory locks, so we resort to file locking, which will
-only work if the `FLOCK_DIR` is set consistently for all ruby processes.
-
-In your `spec_helper.rb` or `minitest_helper.rb`, add a `before` and `after` block:
-
-```ruby
-before do
-  ENV['FLOCK_DIR'] = Dir.mktmpdir
-end
-
-after do
-  FileUtils.remove_entry_secure ENV['FLOCK_DIR']
-end
-```

data/Rakefile

@@ -1,4 +1,6 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 
 require 'yard'
 YARD::Rake::YardocTask.new do |t|
@@ -14,4 +16,5 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :default => :test
+
+task default: :test

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'no_fly_list'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+require 'irb'
+IRB.start(__FILE__)

data/bin/rails

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+APP_PATH = File.expand_path('../test/dummy/config/application', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/bin/sanity

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+check_port() {
+  local port="$1"
+  local name="$2"
+  if nc -z localhost "$port" >/dev/null 2>&1; then
+    echo "$name running on port $port"
+  else
+    echo "ERROR: $name is not running on port $port" >&2
+    return 1
+  fi
+}
+
+main() {
+  check_port 5433 "Postgresql"
+  check_port 3366 "Mysql"
+}
+
+main "$@"

data/bin/sanity_check

@@ -0,0 +1,86 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+ENV['RAILS_ENV'] = 'test'
+ENV['DATABASE_URL_PG'] ||= 'postgres://with_advisory:with_advisory_pass@localhost:5433/with_advisory_lock_test'
+ENV['DATABASE_URL_MYSQL'] ||= 'mysql2://with_advisory:with_advisory_pass@0.0.0.0:3366/with_advisory_lock_test'
+
+require_relative '../test/dummy/config/environment'
+
+puts '=' * 80
+puts 'WITH_ADVISORY_LOCK SANITY CHECK'
+puts '=' * 80
+puts
+
+# Check Rails environment
+puts "Rails Environment: #{Rails.env}"
+puts "Rails Root: #{Rails.root}"
+puts
+
+# Check PostgreSQL connection
+puts 'PostgreSQL Connection (ApplicationRecord):'
+begin
+  ApplicationRecord.connection.execute('SELECT 1')
+  puts '  ✓ Connected to PostgreSQL'
+  puts "  Database: #{ApplicationRecord.connection.current_database}"
+  puts "  Adapter: #{ApplicationRecord.connection.adapter_name}"
+  puts "  Tables: #{ApplicationRecord.connection.tables.sort.join(', ')}"
+
+  # Test creating a record
+  tag = Tag.create!(name: "test-pg-#{Time.now.to_i}")
+  puts "  ✓ Created Tag record with id: #{tag.id}"
+  tag.destroy
+  puts '  ✓ Deleted Tag record'
+rescue StandardError => e
+  puts "  ✗ ERROR: #{e.message}"
+  puts "  #{e.backtrace.first}"
+end
+puts
+
+# Check MySQL connection
+puts 'MySQL Connection (MysqlRecord):'
+begin
+  MysqlRecord.connection.execute('SELECT 1')
+  puts '  ✓ Connected to MySQL'
+  puts "  Database: #{MysqlRecord.connection.current_database}"
+  puts "  Adapter: #{MysqlRecord.connection.adapter_name}"
+  puts "  Tables: #{MysqlRecord.connection.tables.sort.join(', ')}"
+
+  # Test creating a record
+  mysql_tag = MysqlTag.create!(name: "test-mysql-#{Time.now.to_i}")
+  puts "  ✓ Created MysqlTag record with id: #{mysql_tag.id}"
+  mysql_tag.destroy
+  puts '  ✓ Deleted MysqlTag record'
+rescue StandardError => e
+  puts "  ✗ ERROR: #{e.message}"
+  puts "  #{e.backtrace.first}"
+end
+puts
+
+# Check model associations
+puts 'Model Configuration:'
+puts '  PostgreSQL Models:'
+puts "    - Tag -> #{Tag.connection.adapter_name}"
+puts "    - TagAudit -> #{TagAudit.connection.adapter_name}"
+puts "    - Label -> #{Label.connection.adapter_name}"
+puts '  MySQL Models:'
+puts "    - MysqlTag -> #{MysqlTag.connection.adapter_name}"
+puts "    - MysqlTagAudit -> #{MysqlTagAudit.connection.adapter_name}"
+puts "    - MysqlLabel -> #{MysqlLabel.connection.adapter_name}"
+puts
+
+# Check if WithAdvisoryLock is loaded
+puts 'WithAdvisoryLock Status:'
+puts "  Module loaded: #{defined?(WithAdvisoryLock) ? 'Yes' : 'No'}"
+puts "  Concern loaded: #{defined?(WithAdvisoryLock::Concern) ? 'Yes' : 'No'}"
+puts "  PostgreSQL adapter loaded: #{defined?(WithAdvisoryLock::PostgreSQL) ? 'Yes' : 'No'}"
+puts "  MySQL adapter loaded: #{defined?(WithAdvisoryLock::MySQL) ? 'Yes' : 'No'}"
+
+# Check if models have advisory lock methods
+puts "\nModel Methods:"
+puts "  Tag.with_advisory_lock available: #{Tag.respond_to?(:with_advisory_lock)}"
+puts "  MysqlTag.with_advisory_lock available: #{MysqlTag.respond_to?(:with_advisory_lock)}"
+
+puts "\n#{'=' * 80}"
+puts 'SANITY CHECK COMPLETE'
+puts '=' * 80

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+bin/rails db:setup
+bin/rails db:migrate

data/bin/setup_test_db

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'active_record'
+
+# Setup PostgreSQL database
+puts 'Setting up PostgreSQL test database...'
+ActiveRecord::Base.establish_connection(
+  adapter: 'postgresql',
+  host: 'localhost',
+  port: 5433,
+  database: 'with_advisory_lock_test',
+  username: 'with_advisory',
+  password: 'with_advisory_pass'
+)
+
+ActiveRecord::Schema.define(version: 1) do
+  create_table 'tags', force: true do |t|
+    t.string 'name'
+  end
+
+  create_table 'tag_audits', id: false, force: true do |t|
+    t.string 'tag_name'
+  end
+
+  create_table 'labels', id: false, force: true do |t|
+    t.string 'name'
+  end
+end
+puts 'PostgreSQL tables created!'
+
+# Setup MySQL database
+puts "\nSetting up MySQL test database..."
+ActiveRecord::Base.establish_connection(
+  adapter: 'mysql2',
+  host: '127.0.0.1',
+  port: 3366,
+  database: 'with_advisory_lock_test',
+  username: 'with_advisory',
+  password: 'with_advisory_pass'
+)
+
+ActiveRecord::Schema.define(version: 1) do
+  create_table 'mysql_tags', force: true do |t|
+    t.string 'name'
+  end
+
+  create_table 'mysql_tag_audits', id: false, force: true do |t|
+    t.string 'tag_name'
+  end
+
+  create_table 'mysql_labels', id: false, force: true do |t|
+    t.string 'name'
+  end
+end
+puts 'MySQL tables created!'
+
+puts "\nTest databases setup complete!"

data/bin/test_connections

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+ENV['RAILS_ENV'] = 'test'
+ENV['DATABASE_URL_PG'] ||= 'postgres://with_advisory:with_advisory_pass@localhost:5433/with_advisory_lock_test'
+ENV['DATABASE_URL_MYSQL'] ||= 'mysql2://with_advisory:with_advisory_pass@0.0.0.0:3366/with_advisory_lock_test'
+
+require_relative '../test/dummy/config/environment'
+
+puts 'Testing database connections...'
+
+puts "\nPostgreSQL (ApplicationRecord):"
+puts "  Connected: #{ApplicationRecord.connected?}"
+puts "  Tables: #{ApplicationRecord.connection.tables.sort.join(', ')}"
+
+puts "\nMySQL (MysqlRecord):"
+puts "  Connected: #{MysqlRecord.connected?}"
+puts "  Tables: #{MysqlRecord.connection.tables.sort.join(', ')}"
+
+puts "\nModel connections:"
+puts "  Tag uses: #{Tag.connection.adapter_name}"
+puts "  MysqlTag uses: #{MysqlTag.connection.adapter_name}"

data/docker-compose.yml

@@ -1,13 +1,12 @@
-version: "3.9"
 services:
   pg:
-    image: postgres:16
+    image: postgres:17-alpine
     environment:
       POSTGRES_USER: with_advisory
       POSTGRES_PASSWORD: with_advisory_pass
       POSTGRES_DB: with_advisory_lock_test
     ports:
-      - "5432:5432"
+      - "5433:5432"
   mysql:
     image: mysql:8
     environment:
@@ -17,4 +16,4 @@ services:
       MYSQL_RANDOM_ROOT_PASSWORD: "yes"
       MYSQL_ROOT_HOST: '%'
     ports:
-      - "3306:3306"
+      - "3366:3306"

data/lib/with_advisory_lock/concern.rb

@@ -19,34 +19,41 @@ module WithAdvisoryLock
       end
 
       def with_advisory_lock_result(lock_name, options = {}, &block)
-        impl = impl_class.new(connection, lock_name, options)
-        impl.with_advisory_lock_if_needed(&block)
+        with_connection do |conn|
+          conn.with_advisory_lock_if_needed(lock_name, options, &block)
+        end
       end
 
       def advisory_lock_exists?(lock_name)
-        impl = impl_class.new(connection, lock_name, 0)
-        impl.already_locked? || !impl.yield_with_lock.lock_was_acquired?
+        with_connection do |conn|
+          lock_str = "#{ENV.fetch(CoreAdvisory::LOCK_PREFIX_ENV, nil)}#{lock_name}"
+          lock_stack_item = LockStackItem.new(lock_str, false)
+
+          if conn.advisory_lock_stack.include?(lock_stack_item)
+            true
+          else
+            # For PostgreSQL, try non-blocking query first to avoid race conditions
+            if conn.respond_to?(:advisory_lock_exists_for?)
+              query_result = conn.advisory_lock_exists_for?(lock_name)
+              return query_result unless query_result.nil?
+            end
+
+            # Fall back to the original implementation
+            result = conn.with_advisory_lock_if_needed(lock_name, { timeout_seconds: 0 })
+            !result.lock_was_acquired?
+          end
+        end
       end
 
       def current_advisory_lock
-        lock_stack_key = WithAdvisoryLock::Base.lock_stack.first
-        lock_stack_key && lock_stack_key[0]
+        with_connection do |conn|
+          conn.advisory_lock_stack.first&.name
+        end
       end
 
       def current_advisory_locks
-        WithAdvisoryLock::Base.lock_stack.map(&:name)
-      end
-
-      private
-
-      def impl_class
-        adapter = WithAdvisoryLock::DatabaseAdapterSupport.new(connection)
-        if adapter.postgresql?
-          WithAdvisoryLock::PostgreSQL
-        elsif adapter.mysql?
-          WithAdvisoryLock::MySQL
-        else
-          WithAdvisoryLock::Flock
+        with_connection do |conn|
+          conn.advisory_lock_stack.map(&:name)
         end
       end
     end