MySQL adapter

.github/workflows/ci.yml

@@ -28,20 +28,52 @@ jobs:
 
   unit:
     runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: devcontainer
+          MYSQL_DATABASE: test
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping --silent"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
     steps:
       - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
         with:
           ruby-version: "3.4"
           bundler-cache: true
       - run: bin/test-unit
+        env:
+          MYSQL_HOST: 127.0.0.1
+          MYSQL_PORT: "3306"
 
   integration:
     runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: devcontainer
+          MYSQL_DATABASE: test
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping --silent"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
     steps:
       - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
         with:
           ruby-version: "3.4"
           bundler-cache: true
       - run: bin/test-integration
+        env:
+          MYSQL_HOST: 127.0.0.1
+          MYSQL_PORT: "3306"

Gemfile

@@ -9,6 +9,7 @@ group :development, :test do
   gem "sqlite3", "2.7.4"
   gem "debug", "1.11.0"
   gem "minitest-parallel_fork", "2.1.0", require: false
+  gem "mysql2", "~> 0.5", require: false
 end
 
 group :rubocop do

Gemfile.lock

@@ -177,6 +177,8 @@ GEM
     minitest (5.26.0)
     minitest-parallel_fork (2.1.0)
       minitest (>= 5.15.0)
+    mysql2 (0.5.7)
+      bigdecimal
     net-imap (0.5.12)
       date
       net-protocol
@@ -349,6 +351,7 @@ DEPENDENCIES
   importmap-rails
   jbuilder
   minitest-parallel_fork (= 2.1.0)
+  mysql2 (~> 0.5)
   propshaft
   puma (>= 5.0)
   rails!

bin/setup

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+set -e
+
+CONTAINER_NAME="${CONTAINER_NAME:-activerecord-tenanted-mysql}"
+MYSQL_IMAGE="mysql:latest"
+MYSQL_ROOT_PASSWORD="devcontainer"
+MYSQL_PORT="${MYSQL_PORT:-3307}"
+
+echo "==> Checking Docker installation..."
+if ! command -v docker &> /dev/null; then
+  echo "ERROR: Docker is not installed. Please install Docker and try again."
+  exit 1
+fi
+
+if ! docker info &> /dev/null; then
+  echo "ERROR: Docker daemon is not running. Please start Docker and try again."
+  exit 1
+fi
+
+echo "==> Setting up MySQL container..."
+if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+  echo "    Stopping and removing existing container..."
+  docker stop "$CONTAINER_NAME" > /dev/null 2>&1 || true
+  docker rm "$CONTAINER_NAME" > /dev/null 2>&1 || true
+fi
+
+echo "==> Creating and starting MySQL container..."
+docker run -d \
+  --name="$CONTAINER_NAME" \
+  --restart unless-stopped \
+  -p "127.0.0.1:${MYSQL_PORT}:3306" \
+  -e MYSQL_ROOT_PASSWORD="$MYSQL_ROOT_PASSWORD" \
+  "$MYSQL_IMAGE"
+
+echo "==> Waiting for MySQL to be ready..."
+MAX_TRIES=30
+TRIES=0
+while [ $TRIES -lt $MAX_TRIES ]; do
+  if docker exec "$CONTAINER_NAME" mysqladmin ping -h localhost --silent &> /dev/null; then
+    echo "    MySQL is ready!"
+    break
+  fi
+  TRIES=$((TRIES + 1))
+  if [ $TRIES -eq $MAX_TRIES ]; then
+    echo "ERROR: MySQL failed to start within expected time"
+    exit 1
+  fi
+  echo -n "."
+  sleep 2
+done
+
+echo "==> Verifying database connection..."
+docker exec "$CONTAINER_NAME" mysql -uroot -p"$MYSQL_ROOT_PASSWORD" -e "SELECT 1;" > /dev/null 2>&1
+echo "    Database ready!"
+
+echo "==> Running bundle install..."
+bundle check > /dev/null 2>&1 || bundle install
+
+echo ""
+echo "==> Setup complete!"
+echo ""
+echo "MySQL is running on 127.0.0.1:${MYSQL_PORT}"
+echo ""

bin/test-integration

@@ -17,12 +17,14 @@ require "fileutils"
 require "tmpdir"
 require "yaml"
 require "open3"
+require "erb"
+require "debug"
 require "active_support"
 require "active_support/core_ext/object" # deep_dup
 
-scenarios = Dir.glob("test/scenarios/*db/*record.rb").map do |path|
-  database, models = path.scan(%r{test/scenarios/(.+db)/(.+record).rb}).flatten
-  { database: database, models: models }
+scenarios = Dir.glob("test/scenarios/*/*db/*record.rb").map do |path|
+  adapter, database, models = path.scan(%r{test/scenarios/(.+)/(.+db)/(.+record).rb}).flatten
+  { adapter: adapter, database: database, models: models }
 end
 
 COLOR_FG_BLUE = "\e[0;34m"
@@ -49,28 +51,34 @@ def run_scenario(scenario)
   at_exit { FileUtils.remove_entry app_path } unless OPT_KEEP_DIR
   puts "Creating integration app for #{COLOR_FG_BLUE}#{scenario}#{COLOR_RESET} at #{app_path}"
 
+  # Generate a unique database prefix for this scenario to avoid conflicts
+  db_prefix = "test_#{scenario[:database]}_#{scenario[:models]}_#{Process.pid}".gsub(/[^a-zA-Z0-9_]/, "_")
+
   # make a copy of the smarty app
   FileUtils.copy_entry(SMARTY_PATH, app_path)
 
   # generate database file
-  database_file = File.join(GEM_PATH, "test/scenarios/#{scenario[:database]}/database.yml")
-  database_file_contents = sprintf(File.read(database_file), storage: "storage", db_path: "db")
-  database_file_hash = YAML.load(database_file_contents)
+  database_file = File.join(GEM_PATH, "test/scenarios/#{scenario[:adapter]}/#{scenario[:database]}/database.yml")
+  erb_content = ERB.new(File.read(database_file)).result
+  storage_path = File.join(app_path, "storage")
+  db_path = File.join(app_path, "db")
+  database_file_contents = sprintf(erb_content, storage: storage_path, db_path: db_path)
+  database_file_hash = YAML.unsafe_load(database_file_contents)
   database_file_hash["development"] = database_file_hash["test"].deep_dup
   database_file_hash["development"].each_value do |hash|
     hash["database"] = hash["database"].sub("/test/", "/development/")
   end
   File.write(File.join(app_path, "config/database.yml"), database_file_hash.to_yaml)
 
   # generate models using ApplicationRecord
-  models_file = File.join(GEM_PATH, "test/scenarios/#{scenario[:database]}/#{scenario[:models]}.rb")
+  models_file = File.join(GEM_PATH, "test/scenarios/#{scenario[:adapter]}/#{scenario[:database]}/#{scenario[:models]}.rb")
   models_file_contents = File.read(models_file)
                            .gsub("TenantedApplicationRecord", "ApplicationRecord")
   File.write(File.join(app_path, "app/models/application_record.rb"), models_file_contents)
 
   # copy migrations from scenario and smarty app
   FileUtils.mkdir_p(File.join(app_path, "db"))
-  FileUtils.cp_r(Dir.glob(File.join(GEM_PATH, "test/scenarios/#{scenario[:database]}/*migrations")),
+  FileUtils.cp_r(Dir.glob(File.join(GEM_PATH, "test/scenarios/#{scenario[:adapter]}/#{scenario[:database]}/*migrations")),
                  File.join(app_path, "db"))
   FileUtils.cp_r(Dir.glob(File.join(app_path, "db/migrate/*rb")),
                  File.join(app_path, "db/tenanted_migrations"))
@@ -82,20 +90,21 @@ def run_scenario(scenario)
     Bundler.with_original_env do
       run_cmd(scenario, "bundle check || bundle install")
 
-      # set up the database and schema files
-      run_cmd(scenario, "bin/rails db:prepare")
+     adapter_config = {"RAILS_ENV" => "test","ARTENANT_SCHEMA_DUMP" => "1"}
+     if scenario[:adapter] == "mysql"
+       adapter_config.merge!({ "MYSQL_UNIQUE_PREFIX" => db_prefix })
+     end
+
+      # Drop existing databases to ensure fresh setup
+      run_cmd(scenario, "bin/rails db:drop", env: { **adapter_config }) rescue nil
+
+      run_cmd(scenario, "bin/rails db:prepare", env: { **adapter_config })
 
       # validate-ish the setup
       prefix = scenario[:database].match?(/\Asecondary/) ? "tenanted_" : ""
       File.exist?("db/#{prefix}schema.rb") || abort("Schema dump not generated")
       File.exist?("db/#{prefix}schema_cache.yml") || abort("Schema cache dump not generated")
 
-      # create a fake tenant database to validate that it is deleted in the test suite
-      dev_db = Dir.glob("storage/development/*/development-tenant/main.sqlite3").first
-      test_db = dev_db.gsub("/development/", "/test/").gsub("development-tenant", "delete-me")
-      FileUtils.mkdir_p(File.dirname(test_db))
-      FileUtils.touch(test_db)
-
       # run in parallel half the time
       env = if rand(2).zero?
         { "PARALLEL_WORKERS" => "2" }

lib/active_record/tenanted.rb

@@ -6,6 +6,7 @@
 loader = Zeitwerk::Loader.for_gem_extension(ActiveRecord)
 loader.inflector.inflect(
   "sqlite" => "SQLite",
+  "mysql" => "MySQL",
 )
 loader.setup
 

lib/active_record/tenanted/cable_connection.rb

@@ -19,9 +19,10 @@ def connect
 
         private
           def set_current_tenant
-            return unless tenant = tenant_resolver.call(request)
+            tenant = tenant_resolver.call(request)
+            return if tenant.nil?
 
-            if connection_class.tenant_exist?(tenant)
+            if tenant.present? && connection_class.tenant_exist?(tenant)
               self.current_tenant = tenant
             else
               reject_unauthorized_connection

lib/active_record/tenanted/database_adapter.rb

@@ -25,6 +25,8 @@ def new(db_config)
       end
 
       register "sqlite3", "ActiveRecord::Tenanted::DatabaseAdapters::SQLite"
+      register "trilogy", "ActiveRecord::Tenanted::DatabaseAdapters::MySQL"
+      register "mysql2", "ActiveRecord::Tenanted::DatabaseAdapters::MySQL"
     end
   end
 end