with_advisory_lock 4.6.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4719c3f44e4cf1f219b582d21cf9757274ca1fcca6128c227798f32d4b589e
-  data.tar.gz: c63b8be1ee91b25a519b5a4d7d090ff98172d6d3a476899b55c6cd03bf77eda6
+  metadata.gz: d65989d7502660ac5cbebd51a589fc49fb76bbeae5abb13814cb79a711fdaae8
+  data.tar.gz: 2eea1e741e2fdb100d3170ddce8c38b1d0fc59dc98f6340be51d6d5bde0591a4
 SHA512:
-  metadata.gz: be5a906b9740506447bfcdb1928cd5473add67e0a48acd32f8a26ca4671be49b34ca5eca987df2f8e6f29a0a3dbb0bccc3321061d9f1e5827a0ca4ef44341124
-  data.tar.gz: 124358b251ffd9cc066d54aebfeeca97fb0db88ae18293fb7e0169ceb13960d298e72c66e9d5fbd79f0cbda5360d2fdb2e609866ac82eeb26b1eab6ead103daf
+  metadata.gz: 8358a8783df5bcf9bd49507fc6e59d56aeaec8febd3978a4f9178950c88b254ec76925e3caa9f9f2ee18d7bc15d186512b3790dd1ba602a38fa6d1a877570887
+  data.tar.gz: d179cc20743f15a671ad822fd21e04e808336382d2eed318439e7b9c5ae9283ff4abf0576e5b0c274946863033f403d27280dfec84b3e3e4ff20f832ca62bcb5

data/.github/workflows/ci-mysql5.yml

@@ -0,0 +1,61 @@
+name: CI Mysql 5.7
+on:
+  pull_request:
+    branches:
+      - master
+concurrency:
+  group: ci-mysql5-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  minitest:
+    runs-on: ubuntu-latest
+    name: CI Mysql 5.7 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
+    services:
+      mysql:
+        image: mysql/mysql-server:5.7
+        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.2'
+#          - '3.1'
+#          - '3.0'
+#          - '2.7'
+          - '3.3'
+          - 'truffleruby'
+        rails:
+          - 7.1
+          - "7.0"
+          - 6.1
+        adapter:
+          - mysql2
+          - trilogy
+        include:
+          - ruby: jruby
+            rails: 6.1
+            adapter: jdbcmysql
+    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
+        env:
+          BUNDLE_GEMFILE:  gemfiles/activerecord_${{ matrix.rails }}.gemfile
+      - name: Test
+        env:
+          BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
+          DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@0:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test
+          WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
+        run: bundle exec rake

data/.github/workflows/ci-mysql8.yml

@@ -0,0 +1,62 @@
+name: CI Mysql 8.0
+on:
+  pull_request:
+    branches:
+      - master
+
+concurrency:
+  group: ci-mysql8-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  minitest:
+    runs-on: ubuntu-latest
+    name: CI Mysql 8.0 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
+    services:
+      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.2'
+#          - '3.1'
+#          - '3.0'
+#          - '2.7'
+          - '3.3'
+          - 'truffleruby'
+        rails:
+          - 7.1
+          - "7.0"
+          - 6.1
+        adapter:
+          - mysql2
+#          - trilogy://with_advisory:with_advisory_pass@0/with_advisory_lock_test  Trilogy is not supported by mysql 8 with new encryption
+        include:
+          - ruby: jruby
+            rails: 6.1
+            adapter: jdbcmysql
+    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
+        env:
+          BUNDLE_GEMFILE:  gemfiles/activerecord_${{ matrix.rails }}.gemfile
+      - name: Test
+        env:
+          BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
+          DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@0:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test
+          WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
+        run: bundle exec rake

data/.github/workflows/ci-postgresql.yml

@@ -0,0 +1,64 @@
+name: CI Postgresql
+on:
+  pull_request:
+    branches:
+      - master
+concurrency:
+    group: ci-postgresql-${{ github.head_ref }}
+    cancel-in-progress: true
+
+jobs:
+  minitest:
+    runs-on: ubuntu-latest
+    name: CI Postgresql Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
+    services:
+      postgres:
+        image: 'postgres:16-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
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+#          - '3.2'
+#          - '3.1'
+#          - '3.0'
+#          - '2.7'
+          - '3.3'
+          - 'truffleruby'
+        rails:
+          - 7.1
+          - "7.0"
+          - 6.1
+        adapter:
+          - postgres
+        include:
+          - ruby: jruby
+            rails: 6.1
+            adapter: jdbcpostgresql
+    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
+        env:
+          BUNDLE_GEMFILE:  gemfiles/activerecord_${{ matrix.rails }}.gemfile
+      - name: Test
+        env:
+          BUNDLE_GEMFILE:  gemfiles/activerecord_${{ matrix.rails }}.gemfile
+          DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@localhost:${{ job.services.postgres.ports[5432] }}/with_advisory_lock_test
+          WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
+        run: bundle exec rake

data/.github/workflows/ci-sqlite3.yml

@@ -0,0 +1,54 @@
+name: CI Sqlite3
+
+on:
+  pull_request:
+    branches:
+      - master
+
+concurrency:
+  group: ci-sqlite3-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  minitest:
+    runs-on: ubuntu-latest
+    name: CI Sqlite3 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+#          - '3.2'
+#          - '3.1'
+#          - '3.0'
+#          - '2.7'
+          - '3.3'
+          - 'truffleruby'
+        rails:
+          - 7.1
+          - "7.0"
+          - 6.1
+        adapter:
+          - sqlite3
+        include:
+          - ruby: jruby
+            rails: 6.1
+            adapter: jdbcsqlite3
+    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
+        env:
+          BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
+
+      - name: Test
+        env:
+          BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
+          DATABASE_URL: ${{ matrix.adapter }}:///tmp/test.sqlite3
+          WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
+        run: bundle exec rake

data/.github/workflows/release.yml

@@ -0,0 +1,17 @@
+name: release-please
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: googleapis/release-please-action@v4

data/.gitignore

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

data/.release-please-manifest.json

@@ -0,0 +1 @@
+{".":"5.3.0"}

data/.ruby-version

@@ -0,0 +1,2 @@
+3.4.4
+

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.4
+ruby 3.4.4

data/Appraisals

@@ -1,29 +1,45 @@
-appraise "activerecord-4.2" do
-  gem "activerecord", "~> 4.2.0"
+# frozen_string_literal: true
+
+appraise 'activerecord-7.1' do
+  gem 'activerecord', '~> 7.1.0'
   platforms :ruby do
-      gem "pg", "~> 0.21"
-      gem "mysql2", "< 0.5"
-      gem "sqlite3", "~> 1.3.6"
+    gem 'sqlite3'
+    gem 'mysql2'
+    gem 'trilogy'
+    gem 'pg'
   end
 end
 
-appraise "activerecord-5.0" do
-  gem "activerecord", "~> 5.0.0"
+appraise 'activerecord-7.0' do
+  gem 'activerecord', '~> 7.0.0'
   platforms :ruby do
-    gem "sqlite3", "~> 1.3.6"
+    gem 'sqlite3'
+    gem 'mysql2'
+    gem 'trilogy'
+    gem "activerecord-trilogy-adapter"
+    gem 'pg'
+  end
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter"
+    gem "activerecord-jdbcpostgresql-adapter"
+    gem "activerecord-jdbcsqlite3-adapter"
   end
 end
 
-appraise "activerecord-5.1" do
-  gem "activerecord", "~> 5.1.0"
-  gem "sqlite3", "~> 1.3.6"
-end
+appraise 'activerecord-6.1' do
+  gem 'activerecord', '~> 6.1.0'
 
-appraise "activerecord-5.2" do
-  gem "activerecord", "~> 5.1.0"
-  gem "sqlite3", "~> 1.3.6"
+  platforms :ruby do
+    gem 'sqlite3'
+    gem 'mysql2'
+    gem 'trilogy'
+    gem "activerecord-trilogy-adapter"
+    gem 'pg'
+  end
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter"
+    gem "activerecord-jdbcpostgresql-adapter"
+    gem "activerecord-jdbcsqlite3-adapter"
+  end
 end
 
-appraise "activerecord-6.0" do
-  gem "activerecord", "~> 6.0.0"
-end

data/CHANGELOG.md

@@ -1,5 +1,55 @@
 ## Changelog
 
+## [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)
+
+
+### Features
+
+* add #current_advisory_locks method ([#111](https://github.com/ClosureTree/with_advisory_lock/issues/111)) ([ccbd3b2](https://github.com/ClosureTree/with_advisory_lock/commit/ccbd3b23465f7fa1fc3800334159986c31d5c351))
+
+## [5.2.0](https://github.com/ClosureTree/with_advisory_lock/compare/with_advisory_lock/v5.1.0...with_advisory_lock/v5.2.0) (2025-04-24)
+
+
+### Features
+
+* use current connnection instead of the one in ActiveRecord::Base ([#90](https://github.com/ClosureTree/with_advisory_lock/issues/90)) ([c28a172](https://github.com/ClosureTree/with_advisory_lock/commit/c28a172a5a64594448b6090501fc0b8cbace06f6))
+
+
+### Bug Fixes
+
+* Removed MySQL unused lock variable and broaden SQLite detection. ([#94](https://github.com/ClosureTree/with_advisory_lock/issues/94)) ([f818a18](https://github.com/ClosureTree/with_advisory_lock/commit/f818a181dde6711c8439c4cbf67c4525a09d346e))
+
+## [5.1.0](https://github.com/ClosureTree/with_advisory_lock/compare/with_advisory_lock/v5.0.1...with_advisory_lock/v5.1.0) (2024-01-21)
+
+
+### Features
+
+* use zeitwerk loader instead of ActiveSupport::Autoload ([b5082fd](https://github.com/ClosureTree/with_advisory_lock/commit/b5082fddacacacff48139f5bf509601a37945a0e))
+
+## 5.0.1 (2024-01-21)
+
+
+### Features
+
+* add release workflow ([5d32520](https://github.com/ClosureTree/with_advisory_lock/commit/5d325201c82974991381a9fbc4d1714c9739dc4f))
+* add ruby 3.1 test/support ([#60](https://github.com/ClosureTree/with_advisory_lock/issues/60)) ([514f042](https://github.com/ClosureTree/with_advisory_lock/commit/514f0420d957ef30911a00d54685385bec5867c3))
+* Add testing for activerecord 7.1 and support for trilogy adapter ([#77](https://github.com/ClosureTree/with_advisory_lock/issues/77)) ([69c23fe](https://github.com/ClosureTree/with_advisory_lock/commit/69c23fe09887fc5d97ac7b0194825c21efe244a5))
+* add truffleruby support ([#62](https://github.com/ClosureTree/with_advisory_lock/issues/62)) ([ec34bd4](https://github.com/ClosureTree/with_advisory_lock/commit/ec34bd448e3505e5df631daaf47bb83f2f5316dc))
+
+
+### Bug Fixes
+
+* User may sometimes pass in non-strings, such as integers ([#55](https://github.com/ClosureTree/with_advisory_lock/issues/55)) ([9885597](https://github.com/ClosureTree/with_advisory_lock/commit/988559747363ef00958fcf782317e76c40ffa2a3))
+
+### 5.0.0
+- Drop support for EOL rubies and activerecord (ruby below 2.7 and activerecord below 6.1).
+- Allow lock name to be integer
+- Jruby support
+- Truffleruby support
+- Add `with_advisory_lock!`, which raises an error if the lock acquisition fails
+- Add `disable_query_cache` option to `with_advisory_lock`
+- Drop support for mysql < 5.7.5
+
 ### 4.6.0
 
 - Support for ActiveRecord 6

data/Gemfile

@@ -1,15 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-platforms :ruby do
-  gem 'mysql2'
-  gem 'pg'
-  gem 'sqlite3'
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-  gem 'activerecord-jdbcsqlite3-adapter'
-end

data/LICENSE.txt

@@ -1,6 +1,6 @@
-Copyright (c) 2013 Matthew McEachen
-
-MIT License
+SPDX-License-Identifier: MIT
+SPDX-FileCopyrightText: 2013 Matthew McEachen 
+SPDX-FileCopyrightText: 2013-2025 Abdelkader Boudih
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Makefile

@@ -0,0 +1,14 @@
+.PHONY: test-pg test-mysql
+
+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-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

data/README.md

@@ -1,14 +1,13 @@
 # with_advisory_lock
 
-Adds advisory locking (mutexes) to ActiveRecord 4.2, 5.x and 6.0, with ruby
-2.4, 2.5 and 2.6, when used with
+Adds advisory locking (mutexes) to ActiveRecord  6.0+, with ruby 2.7+, 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.
 
-[![Build Status](https://api.travis-ci.org/ClosureTree/with_advisory_lock.svg?branch=master)](https://travis-ci.org/ClosureTree/with_advisory_lock)
 [![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)
 
 ## What's an "Advisory Lock"?
 
@@ -45,8 +44,10 @@ A value of zero will try the lock only once. If the lock is acquired, the block
 will be yielded to. If the lock is currently being held, the block will not be
 called.
 
-Note that if a non-nil value is provided for `timeout_seconds`, the block will
-not be invoked if the lock cannot be acquired within that time-frame.
+> **Note**
+> 
+> If a non-nil value is provided for `timeout_seconds`, the block will
+*not* be invoked if the lock cannot be acquired within that time-frame. In this case, `with_advisory_lock` will return `false`, while `with_advisory_lock!` will raise a `WithAdvisoryLock::FailedToAcquireLock` error.
 
 For backwards compatability, the timeout value can be specified directly as the
 second parameter.
@@ -80,6 +81,8 @@ block, if the lock was able to be acquired and the block yielded, or `false`, if
 you provided a timeout_seconds value and the lock was not able to be acquired in
 time.
 
+`with_advisory_lock!` is similar to `with_advisory_lock`, but raises a `WithAdvisoryLock::FailedToAcquireLock` error if the lock was not able to be acquired in time. 
+
 ### Testing for the current lock status
 
 If you needed to check if the advisory lock is currently being held, you can
@@ -91,6 +94,14 @@ If you want to see if the current Thread is holding a lock, you can call
 `Tag.current_advisory_lock` which will return the name of the current lock. If
 no lock is currently held, `.current_advisory_lock` returns `nil`.
 
+### ActiveRecord Query Cache
+
+You can optionally pass `disable_query_cache: true` to the options hash of
+`with_advisory_lock` in order to disable ActiveRecord's query cache. This can
+prevent problems when you query the database from within the lock and it returns
+stale results. More info on why this can be a problem can be
+[found here](https://github.com/ClosureTree/with_advisory_lock/issues/52)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -123,7 +134,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 your most commonly used lock.**
+application, this will be 2.4, 2.5 and  your most commonly used lock.**
 
 ### Table-level locks
 

data/docker-compose.yml

@@ -0,0 +1,20 @@
+version: "3.9"
+services:
+  pg:
+    image: postgres:16
+    environment:
+      POSTGRES_USER: with_advisory
+      POSTGRES_PASSWORD: with_advisory_pass
+      POSTGRES_DB: with_advisory_lock_test
+    ports:
+      - "5432:5432"
+  mysql:
+    image: mysql:8
+    environment:
+      MYSQL_USER: with_advisory
+      MYSQL_PASSWORD: with_advisory_pass
+      MYSQL_DATABASE: with_advisory_lock_test
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_ROOT_HOST: '%'
+    ports:
+      - "3306:3306"

data/gemfiles/{activerecord_6.0.gemfile → activerecord_6.1.gemfile}

@@ -2,12 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.0"
+gem "activerecord", "~> 6.1.0"
 
 platforms :ruby do
+  gem "sqlite3"
   gem "mysql2"
+  gem "trilogy"
+  gem "activerecord-trilogy-adapter"
   gem "pg"
-  gem "sqlite3"
 end
 
 platforms :jruby do

data/gemfiles/{activerecord_5.2.gemfile → activerecord_7.0.gemfile}

@@ -2,12 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.1.0"
+gem "activerecord", "~> 7.0.0"
 
 platforms :ruby do
+  gem "sqlite3"
   gem "mysql2"
+  gem "trilogy"
+  gem "activerecord-trilogy-adapter"
   gem "pg"
-  gem "sqlite3", "~> 1.3.6"
 end
 
 platforms :jruby do

data/gemfiles/activerecord_7.1.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.1.0"
+
+platforms :ruby do
+  gem "sqlite3"
+  gem "mysql2"
+  gem "trilogy"
+  gem "pg"
+end
+
+gemspec path: "../"

data/lib/with_advisory_lock/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zlib'
 
 module WithAdvisoryLock
@@ -19,21 +21,22 @@ module WithAdvisoryLock
   LockStackItem = Struct.new(:name, :shared)
 
   class Base
-    attr_reader :connection, :lock_name, :timeout_seconds, :shared, :transaction
+    attr_reader :connection, :lock_name, :timeout_seconds, :shared, :transaction, :disable_query_cache
 
     def initialize(connection, lock_name, options)
       options = { timeout_seconds: options } unless options.respond_to?(:fetch)
-      options.assert_valid_keys :timeout_seconds, :shared, :transaction
+      options.assert_valid_keys :timeout_seconds, :shared, :transaction, :disable_query_cache
 
       @connection = connection
       @lock_name = lock_name
       @timeout_seconds = options.fetch(:timeout_seconds, nil)
       @shared = options.fetch(:shared, false)
       @transaction = options.fetch(:transaction, false)
+      @disable_query_cache = options.fetch(:disable_query_cache, false)
     end
 
     def lock_str
-      @lock_str ||= "#{ENV['WITH_ADVISORY_LOCK_PREFIX']}#{lock_name}"
+      @lock_str ||= "#{ENV[LOCK_PREFIX_ENV]}#{lock_name}"
     end
 
     def lock_stack_item
@@ -51,6 +54,16 @@ module WithAdvisoryLock
     end
 
     def with_advisory_lock_if_needed(&block)
+      if disable_query_cache
+        return lock_and_yield do
+          connection.uncached(&block)
+        end
+      end
+
+      lock_and_yield(&block)
+    end
+
+    def lock_and_yield(&block)
       if already_locked?
         Result.new(true, yield)
       elsif timeout_seconds == 0
@@ -66,7 +79,7 @@ module WithAdvisoryLock
       else
         # Ruby MRI's String#hash is randomly seeded as of Ruby 1.9 so
         # make sure we use a deterministic hash.
-        Zlib.crc32(input.to_s)
+        Zlib.crc32(input.to_s, 0)
       end
     end
 
@@ -75,6 +88,7 @@ module WithAdvisoryLock
       while @timeout_seconds.nil? || Time.now < give_up_at
         r = yield_with_lock(&block)
         return r if r.lock_was_acquired?
+
         # Randomizing sleep time may help reduce contention.
         sleep(rand(0.05..0.15))
       end