feat: add Trilogy adapter support for MariaDB

seuros · seuros · commit 0be7e31ad89f · 2026-01-16T18:13:07.000+01:00
- Add MariaDB service to CI with proper healthcheck - Fix GET_LOCK timeout for MariaDB (use large value instead of -1) - Add Trilogy models, tests, and schema for MariaDB database - Make Trilogy optional for TruffleRuby (trilogy gem not supported) - Configure Zeitwerk to ignore trilogy models when not configured - Add Rails edge to CI matrix (excluded for TruffleRuby) - Update docker-compose with MariaDB container Closes #129
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,21 @@ jobs:
           MYSQL_PASSWORD: with_advisory_pass
           MYSQL_DATABASE: with_advisory_lock_test
           MYSQL_ROOT_HOST: '%'
+      mariadb:
+        image: mariadb:12
+        ports:
+          - 3306
+        env:
+          MARIADB_ROOT_PASSWORD: root
+          MARIADB_DATABASE: with_advisory_lock_trilogy_test
+          MARIADB_USER: with_advisory
+          MARIADB_PASSWORD: with_advisory_pass
+          MARIADB_ROOT_HOST: '%'
+        options: >-
+          --health-cmd "healthcheck.sh --su-mysql --connect --innodb_initialized"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     strategy:
       fail-fast: false
       matrix:
@@ -48,6 +63,11 @@ jobs:
           - 7.2
           - "8.0"
           - "8.1"
+          - "edge"
+        exclude:
+          # TruffleRuby doesn't support Rails edge yet
+          - ruby: 'truffleruby'
+            rails: "edge"
     env:
       ACTIVERECORD_VERSION: ${{ matrix.rails }}
       RAILS_ENV: test
@@ -62,10 +82,14 @@ jobs:
           bundler-cache: true
           rubygems: latest
 
+
       - name: Setup test databases
+        timeout-minutes: 5
         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
+          # Trilogy doesn't support TruffleRuby
+          DATABASE_URL_TRILOGY: ${{ matrix.ruby != 'truffleruby' && format('trilogy://with_advisory:with_advisory_pass@127.0.0.1:{0}/with_advisory_lock_trilogy_test', job.services.mariadb.ports[3306]) || '' }}
         run: |
           cd test/dummy
           bundle exec rake db:test:prepare
@@ -74,5 +98,7 @@ jobs:
         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
+          # Trilogy doesn't support TruffleRuby
+          DATABASE_URL_TRILOGY: ${{ matrix.ruby != 'truffleruby' && format('trilogy://with_advisory:with_advisory_pass@127.0.0.1:{0}/with_advisory_lock_trilogy_test', job.services.mariadb.ports[3306]) || '' }}
           WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
         run: bin/rails test
diff --git a/Gemfile b/Gemfile
@@ -13,10 +13,14 @@ gem 'ostruct'
 
 activerecord_version = ENV.fetch('ACTIVERECORD_VERSION', '7.2')
 
-gem 'activerecord', "~> #{activerecord_version}.0"
+if activerecord_version == 'edge'
+  gem 'rails', github: 'rails/rails', branch: 'main'
+else
+  gem 'activerecord', "~> #{activerecord_version}.0"
+  gem 'railties'
+end
 
 gem 'dotenv'
-gem 'railties'
 
 platforms :ruby do
   gem 'mysql2'
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,18 +2,28 @@ services:
   pg:
     image: postgres:17-alpine
     environment:
-      POSTGRES_USER: ${DB_USER}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_USER: test
+      POSTGRES_PASSWORD: test
+      POSTGRES_DB: with_advisory_lock_test
     ports:
       - "5433:5432"
   mysql:
     image: mysql:8
     environment:
-      MYSQL_USER: ${DB_USER}
-      MYSQL_PASSWORD: ${DB_PASSWORD}
-      MYSQL_DATABASE: ${DB_NAME}
+      MYSQL_USER: test
+      MYSQL_PASSWORD: test
+      MYSQL_DATABASE: with_advisory_lock_test
       MYSQL_RANDOM_ROOT_PASSWORD: "yes"
       MYSQL_ROOT_HOST: '%'
     ports:
       - "3366:3306"
+  mariadb:
+    image: mariadb:12
+    environment:
+      MARIADB_USER: test
+      MARIADB_PASSWORD: test
+      MARIADB_DATABASE: with_advisory_lock_test_trilogy
+      MARIADB_RANDOM_ROOT_PASSWORD: "yes"
+      MARIADB_ROOT_HOST: '%'
+    ports:
+      - "3368:3306"
diff --git a/lib/with_advisory_lock/mysql_advisory.rb b/lib/with_advisory_lock/mysql_advisory.rb
@@ -16,12 +16,15 @@ def try_advisory_lock(lock_keys, lock_name:, shared:, transaction:, timeout_seco
       # MySQL's GET_LOCK already provides native timeout support, making the blocking
       # parameter redundant. MySQL doesn't have separate try/blocking functions like PostgreSQL.
 
-      # MySQL GET_LOCK supports native timeout:
-      # - timeout_seconds = nil: wait indefinitely (-1)
+      # MySQL/MariaDB GET_LOCK supports native timeout:
+      # - timeout_seconds = nil: wait indefinitely
       # - timeout_seconds = 0: try once, no wait (0)
       # - timeout_seconds > 0: wait up to timeout_seconds
+      #
+      # Note: MySQL accepts -1 for infinite wait, but MariaDB does not.
+      # Using a large value (1 year) for cross-compatibility.
       mysql_timeout = case timeout_seconds
-                      when nil then -1
+                      when nil then 31_536_000 # 1 year in seconds
                       when 0 then 0
                       else timeout_seconds.to_i
                       end
diff --git a/test/dummy/app/models/trilogy_label.rb b/test/dummy/app/models/trilogy_label.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class TrilogyLabel < TrilogyRecord
+  self.table_name = 'trilogy_labels'
+end
diff --git a/test/dummy/app/models/trilogy_record.rb b/test/dummy/app/models/trilogy_record.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class TrilogyRecord < ActiveRecord::Base
+  self.abstract_class = true
+  establish_connection :trilogy
+end
diff --git a/test/dummy/app/models/trilogy_tag.rb b/test/dummy/app/models/trilogy_tag.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class TrilogyTag < TrilogyRecord
+  self.table_name = 'trilogy_tags'
+
+  after_save do
+    TrilogyTagAudit.create(tag_name: name)
+    TrilogyLabel.create(name: name)
+  end
+end
diff --git a/test/dummy/app/models/trilogy_tag_audit.rb b/test/dummy/app/models/trilogy_tag_audit.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class TrilogyTagAudit < TrilogyRecord
+  self.table_name = 'trilogy_tag_audits'
+end
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
@@ -14,6 +14,17 @@ module TestSystemApp
   class Application < Rails::Application
     config.load_defaults [Rails::VERSION::MAJOR, Rails::VERSION::MINOR].join('.')
     config.eager_load = true
+
+    # Ignore trilogy models when DATABASE_URL_TRILOGY is not set (e.g., TruffleRuby)
+    unless ENV['DATABASE_URL_TRILOGY'] && !ENV['DATABASE_URL_TRILOGY'].empty?
+      config.autoload_lib(ignore: %w[])
+      initializer 'ignore_trilogy_models', before: :set_autoload_paths do |app|
+        trilogy_models = %w[trilogy_record trilogy_tag trilogy_tag_audit trilogy_label]
+        trilogy_models.each do |model|
+          Rails.autoloaders.main.ignore(Rails.root.join('app', 'models', "#{model}.rb"))
+        end
+      end
+    end
     config.serve_static_files = false
     config.public_file_server.enabled = false
     config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
@@ -11,3 +11,11 @@ test:
     url: "<%= ENV['DATABASE_URL_MYSQL'] %>"
     properties:
       allowPublicKeyRetrieval: true
+<% if ENV['DATABASE_URL_TRILOGY'] && !ENV['DATABASE_URL_TRILOGY'].empty? %>
+  trilogy:
+    <<: *default
+    url: "<%= ENV['DATABASE_URL_TRILOGY'] %>"
+    adapter: trilogy
+    properties:
+      allowPublicKeyRetrieval: true
+<% end %>
diff --git a/test/dummy/db/trilogy_schema.rb b/test/dummy/db/trilogy_schema.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+ActiveRecord::Schema.define(version: 1) do
+  create_table 'trilogy_tags', force: true do |t|
+    t.string 'name'
+  end
+
+  create_table 'trilogy_tag_audits', id: false, force: true do |t|
+    t.string 'tag_name'
+  end
+
+  create_table 'trilogy_labels', id: false, force: true do |t|
+    t.string 'name'
+  end
+end
diff --git a/test/dummy/lib/tasks/db.rake b/test/dummy/lib/tasks/db.rake
@@ -4,37 +4,29 @@ namespace :db do
   namespace :test do
     desc 'Load schema for all databases'
     task prepare: :environment do
-      # Load schema for primary database
+      # Setup PostgreSQL database
       ActiveRecord::Base.establish_connection(:primary)
-      ActiveRecord::Schema.define(version: 1) do
-        create_table 'tags', force: true do |t|
-          t.string 'name'
-        end
+      load Rails.root.join('db', 'schema.rb')
+      puts 'PostgreSQL database schema loaded'
 
-        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
-
-      # Load schema for secondary database
+      # Setup MySQL database
       ActiveRecord::Base.establish_connection(:secondary)
-      ActiveRecord::Schema.define(version: 1) do
-        create_table 'mysql_tags', force: true do |t|
-          t.string 'name'
-        end
+      load Rails.root.join('db', 'secondary_schema.rb')
+      puts 'MySQL database schema loaded'
 
-        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
+      # Setup Trilogy database (MariaDB) - optional, not supported on TruffleRuby
+      if ENV['DATABASE_URL_TRILOGY'] && !ENV['DATABASE_URL_TRILOGY'].empty?
+        ActiveRecord::Base.establish_connection(:trilogy)
+        load Rails.root.join('db', 'trilogy_schema.rb')
+        puts 'Trilogy database schema loaded'
+      else
+        puts 'Skipping Trilogy database (DATABASE_URL_TRILOGY not set)'
       end
+
+      puts 'All test databases prepared successfully'
+    rescue StandardError => e
+      puts "Error preparing test databases: #{e.message}"
+      raise e
     end
   end
 end
diff --git a/test/sanity_check_test.rb b/test/sanity_check_test.rb
@@ -43,7 +43,7 @@ class SanityCheckTest < GemTestCase
     assert_equal 'Mysql2', MysqlLabel.connection.adapter_name
   end
 
-  test 'can write to both databases in same test' do
+  test 'can write to PostgreSQL and MySQL databases in same test' do
     # Create records in both databases
     pg_tag = Tag.create!(name: 'test-pg')
     mysql_tag = MysqlTag.create!(name: 'test-mysql')
@@ -61,3 +61,50 @@ class SanityCheckTest < GemTestCase
     mysql_tag.destroy
   end
 end
+
+if GemTestCase.trilogy_available?
+  class TrilogySanityCheckTest < GemTestCase
+    test 'Trilogy database is isolated from PostgreSQL and MySQL' do
+      # Create tags in all databases
+      pg_tag = Tag.create!(name: 'pg-isolation-test')
+      mysql_tag = MysqlTag.create!(name: 'mysql-isolation-test')
+      trilogy_tag = TrilogyTag.create!(name: 'trilogy-isolation-test')
+
+      # Verify Trilogy tag exists only in Trilogy
+      assert TrilogyTag.exists?(name: 'trilogy-isolation-test')
+      assert_not Tag.exists?(name: 'trilogy-isolation-test')
+      assert_not MysqlTag.exists?(name: 'trilogy-isolation-test')
+
+      # Verify PostgreSQL tag doesn't exist in Trilogy
+      assert_not TrilogyTag.exists?(name: 'pg-isolation-test')
+
+      # Verify MySQL tag doesn't exist in Trilogy
+      assert_not TrilogyTag.exists?(name: 'mysql-isolation-test')
+
+      # Clean up
+      pg_tag.destroy
+      mysql_tag.destroy
+      trilogy_tag.destroy
+    end
+
+    test 'Trilogy models use Trilogy adapter' do
+      assert_equal 'Trilogy', TrilogyTag.connection.adapter_name
+      assert_equal 'Trilogy', TrilogyTagAudit.connection.adapter_name
+      assert_equal 'Trilogy', TrilogyLabel.connection.adapter_name
+    end
+
+    test 'can write to all three databases in same test' do
+      pg_tag = Tag.create!(name: 'test-pg')
+      mysql_tag = MysqlTag.create!(name: 'test-mysql')
+      trilogy_tag = TrilogyTag.create!(name: 'test-trilogy')
+
+      assert pg_tag.persisted?
+      assert mysql_tag.persisted?
+      assert trilogy_tag.persisted?
+
+      pg_tag.destroy
+      mysql_tag.destroy
+      trilogy_tag.destroy
+    end
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -19,10 +19,19 @@ class GemTestCase < ActiveSupport::TestCase
   parallelize(workers: 1)
 
   def self.startup
-    # Validate environment variables when tests actually start running
+    # Validate required environment variables
     %w[DATABASE_URL_PG DATABASE_URL_MYSQL].each do |var|
       abort "Missing required environment variable: #{var}" if ENV[var].nil? || ENV[var].empty?
     end
+
+    # Trilogy is optional (not supported on TruffleRuby)
+    if ENV['DATABASE_URL_TRILOGY'].nil? || ENV['DATABASE_URL_TRILOGY'].empty?
+      puts 'DATABASE_URL_TRILOGY not set, skipping Trilogy tests'
+    end
+  end
+
+  def self.trilogy_available?
+    ENV['DATABASE_URL_TRILOGY'] && !ENV['DATABASE_URL_TRILOGY'].empty?
   end
 
   # Override in test classes to clean only the tables you need
diff --git a/test/with_advisory_lock/blocking_test.rb b/test/with_advisory_lock/blocking_test.rb
@@ -113,6 +113,21 @@ def setup
   end
 end
 
+if GemTestCase.trilogy_available?
+  class TrilogyBlockingTest < GemTestCase
+    include BlockingTestCases
+
+    def model_class
+      TrilogyTag
+    end
+
+    def setup
+      super
+      TrilogyTag.delete_all
+    end
+  end
+end
+
 # Deadlock test requires non-transactional mode to work properly
 class PostgreSQLDeadlockTest < GemTestCase
   self.use_transactional_tests = false
diff --git a/test/with_advisory_lock/concern_test.rb b/test/with_advisory_lock/concern_test.rb
@@ -40,6 +40,16 @@ def model_class
   end
 end
 
+if GemTestCase.trilogy_available?
+  class TrilogyConcernTest < GemTestCase
+    include ConcernTestCases
+
+    def model_class
+      TrilogyTag
+    end
+  end
+end
+
 # This test is adapter-agnostic, so we only need to test it once
 class ActiveRecordQueryCacheTest < GemTestCase
   self.use_transactional_tests = false
diff --git a/test/with_advisory_lock/lock_test.rb b/test/with_advisory_lock/lock_test.rb
diff --git a/test/with_advisory_lock/multi_adapter_test.rb b/test/with_advisory_lock/multi_adapter_test.rb
diff --git a/test/with_advisory_lock/parallelism_test.rb b/test/with_advisory_lock/parallelism_test.rb
diff --git a/test/with_advisory_lock/shared_test.rb b/test/with_advisory_lock/shared_test.rb
diff --git a/test/with_advisory_lock/thread_test.rb b/test/with_advisory_lock/thread_test.rb
diff --git a/test/with_advisory_lock/transaction_test.rb b/test/with_advisory_lock/transaction_test.rb
