chore: refactor test to use multi database syntax. model.connection s…

Makefile

@@ -0,0 +1,17 @@
+.PHONY: test-sqlite test-pg test-mysql
+
+test-sqlite:
+	appraisal rake 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-mysql:
+	docker compose up -d mysql
+	sleep 10 # give some time for the service to start
+	DATABASE_URL=mysql2://with_advisory:[email protected]:3306/with_advisory_lock_test appraisal rake test
+
+
+test: test-sqlite test-pg test-mysql

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"

lib/with_advisory_lock/database_adapter_support.rb

@@ -3,9 +3,10 @@
 module WithAdvisoryLock
   class DatabaseAdapterSupport
     attr_reader :adapter_name
+
     def initialize(connection)
       @connection = connection
-      @adapter_name   = connection.adapter_name.downcase.to_sym
+      @adapter_name = connection.adapter_name.downcase.to_sym
     end
 
     def mysql?
@@ -17,7 +18,7 @@ def postgresql?
     end
 
     def sqlite?
-      [:sqlite3, :sqlite].include? adapter_name
+      %i[sqlite3 sqlite].include? adapter_name
     end
   end
 end

lib/with_advisory_lock/mysql.rb

@@ -5,7 +5,8 @@ class MySQL < Base
     # Caches nested lock support by MySQL reported version
     @@mysql_nl_cache       = {}
     @@mysql_nl_cache_mutex = Mutex.new
-    # See https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_get-lock
+    # See https://dev.mysql.com/doc/refman/5.7/en/locking-functions.html
+    # See https://dev.mysql.com/doc/refman/8.0/en/locking-functions.html
     def try_lock
       raise ArgumentError, 'shared locks are not supported on MySQL' if shared
       raise ArgumentError, 'transaction level locks are not supported on MySQL' if transaction
@@ -18,8 +19,8 @@ def release_lock
     end
 
     def execute_successful?(mysql_function)
-      sql = "SELECT #{mysql_function} AS #{unique_column_name}"
-      connection.select_value(sql).to_i.positive?
+      sql = "SELECT #{mysql_function}"
+      connection.query_value(sql) == 1
     end
 
     # MySQL wants a string as the lock key.

test/test_helper.rb

@@ -24,10 +24,8 @@
 
 ENV['WITH_ADVISORY_LOCK_PREFIX'] ||= SecureRandom.hex
 
-ActiveRecord::Base.establish_connection
-
 def env_db
-  @env_db ||= ActiveRecord::Base.connection_db_config.adapter.to_sym
+  @env_db ||= ActiveRecord::Base.configurations.find_db_config(:default_env).adapter
 end
 
 ActiveRecord::Migration.verbose = false

test/test_models.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+ActiveRecord::Base.establish_connection(:default_env)
+
 ActiveRecord::Schema.define(version: 1) do
   create_table 'tags', force: true do |t|
     t.string 'name'

test/with_advisory_lock/parallelism_test.rb

@@ -15,7 +15,7 @@ def initialize(name, use_advisory_lock)
 
   def work_later
     sleep
-    ApplicationRecord.connection_pool.with_connection do
+    Tag.connection_pool.with_connection do
       if @use_advisory_lock
         Tag.with_advisory_lock(@name) { work }
       else
@@ -46,16 +46,16 @@ def run_workers
       workers.each(&:join)
     end
     # Ensure we're still connected:
-    ApplicationRecord.connection_pool.connection
+    Tag.connection_pool.connection
   end
 
   setup do
-    ApplicationRecord.connection.reconnect!
+    Tag.connection.reconnect!
     @workers = 10
   end
 
   test 'creates multiple duplicate rows without advisory locks' do
-    skip if %i[sqlite3 jdbcsqlite3].include?(env_db)
+    skip if is_sqlite3_adapter?
     @use_advisory_lock = false
     @iterations = 1
     run_workers

test/with_advisory_lock/shared_test.rb

@@ -24,7 +24,7 @@ def cleanup!
   private
 
   def work
-    ApplicationRecord.connection_pool.with_connection do
+    Tag.connection_pool.with_connection do
       Tag.with_advisory_lock('test', timeout_seconds: 0, shared: @shared) do
         @locked = true
         sleep 0.01 until @cleanup
@@ -36,9 +36,6 @@ def work
 end
 
 class SharedLocksTest < GemTestCase
-  def supported?
-    %i[trilogy mysql2 jdbcmysql].exclude?(env_db)
-  end
 
   test 'does not allow two exclusive locks' do
     one = SharedTestWorker.new(false)
@@ -52,12 +49,14 @@ def supported?
   end
 end
 
-class NotSupportedEnvironmentTest < SharedLocksTest
-  setup do
-    skip if supported?
+class NotSupportedEnvironmentTest < GemTestCase
+  def supported?
+    !is_mysql_adapter?
   end
 
   test 'raises an error when attempting to use a shared lock' do
+    skip "Not supported" unless supported?
+
     one = SharedTestWorker.new(true)
     assert_nil(one.locked?)
 
@@ -69,7 +68,11 @@ class NotSupportedEnvironmentTest < SharedLocksTest
   end
 end
 
-class SupportedEnvironmentTest < SharedLocksTest
+class SupportedEnvironmentTest < GemTestCase
+  def supported?
+    !is_mysql_adapter?
+  end
+
   setup do
     skip unless supported?
   end
@@ -113,7 +116,7 @@ class SupportedEnvironmentTest < SharedLocksTest
 
   class PostgreSQLTest < SupportedEnvironmentTest
     setup do
-      skip unless env_db == :postgresql
+      skip unless is_postgresql_adapter?
     end
 
     def pg_lock_modes

test/with_advisory_lock/thread_test.rb

@@ -10,7 +10,7 @@ class SeparateThreadTest < GemTestCase
     @t1_return_value = nil
 
     @t1 = Thread.new do
-      ApplicationRecord.connection_pool.with_connection do
+      Label.connection_pool.with_connection do
         @t1_return_value = Label.with_advisory_lock(@lock_name) do
           @mutex.synchronize { @t1_acquired_lock = true }
           sleep
@@ -21,7 +21,7 @@ class SeparateThreadTest < GemTestCase
 
     # Wait for the thread to acquire the lock:
     sleep(0.1) until @mutex.synchronize { @t1_acquired_lock }
-    ApplicationRecord.connection.reconnect!
+    Label.connection.reconnect!
   end
 
   teardown do

test/with_advisory_lock/transaction_test.rb

@@ -4,7 +4,7 @@
 
 class TransactionScopingTest < GemTestCase
   def supported?
-    %i[postgresql jdbcpostgresql].include?(env_db)
+    is_postgresql_adapter?
   end
 
   test 'raises an error when attempting to use transaction level locks if not supported' do
@@ -23,7 +23,7 @@ def supported?
 
   class PostgresqlTest < TransactionScopingTest
     setup do
-      skip unless env_db == :postgresql
+      skip unless is_postgresql_adapter?
       @pg_lock_count = lambda do
         ApplicationRecord.connection.select_value("SELECT COUNT(*) FROM pg_locks WHERE locktype = 'advisory';").to_i
       end