janus-ar 8.0.1 → 8.1.1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: janus-ar
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.1.1
 platform: ruby
 authors:
 - Lloyd Watkin
 bindir: bin
 cert_chain: []
-date: 2026-06-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,6 +57,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trilogy
   requirement: !ruby/object:Gem::Requirement
@@ -119,28 +133,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.88.0
+        version: 1.90.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.88.0
+        version: 1.90.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.35.2
+        version: 2.37.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.35.2
+        version: 2.37.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -186,32 +200,20 @@ dependencies:
 description: Read/Write proxy for ActiveRecord using primary/replica databases
 email:
 - lloyd@olioex.com
-executables:
-- release.sh
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".bundle/config"
-- ".github/dependabot.yml"
-- ".github/workflows/ci.yml"
-- ".github/workflows/publish.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- assets/.gitkeep
-- assets/janus-logo.png
-- bin/release.sh
-- gemfiles/activerecord_8_0.gemfile
-- gemfiles/activerecord_8_1.gemfile
 - janus-ar.gemspec
 - lib/janus-ar.rb
 - lib/janus-ar/active_record/connection_adapters/janus_mysql2_adapter.rb
+- lib/janus-ar/active_record/connection_adapters/janus_postgresql_adapter.rb
 - lib/janus-ar/active_record/connection_adapters/janus_trilogy_adapter.rb
 - lib/janus-ar/adapter_extensions.rb
 - lib/janus-ar/client.rb
@@ -222,16 +224,6 @@ files:
 - lib/janus-ar/query_director.rb
 - lib/janus-ar/railtie.rb
 - lib/janus-ar/version.rb
-- spec/lib/janus-ar/active_record/connection_adapters/janus_mysql_adapter_spec.rb
-- spec/lib/janus-ar/active_record/connection_adapters/janus_trilogy_adapter_spec.rb
-- spec/lib/janus-ar/client_spec.rb
-- spec/lib/janus-ar/context_spec.rb
-- spec/lib/janus-ar/db_console_config_spec.rb
-- spec/lib/janus-ar/logging/logger_spec.rb
-- spec/lib/janus-ar/logging/subscriber_spec.rb
-- spec/lib/janus-ar/query_director_spec.rb
-- spec/shared_examples/a_mysql_like_server.rb
-- spec/spec_helper.rb
 homepage: https://github.com/olioex/janus-ar
 licenses:
 - MIT
@@ -251,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Read/Write proxy for ActiveRecord using primary/replica databases
 test_files: []

data/.bundle/config

@@ -1,5 +0,0 @@
----
-BUNDLE_JOBS: "4"
-BUNDLE_BUILD__UNICODE: "--with-cflags=-Wno-incompatible-function-pointer-types"
-BUNDLE_BUILD__MYSQL2: "--with-ldflags=-L/opt/homebrew/opt/zstd/lib"
-BUNDLE_FROZEN: "false"

data/.github/dependabot.yml

@@ -1,7 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "bundler"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      

data/.github/workflows/ci.yml

@@ -1,68 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby:
-          - '3.2'
-          - '3.3'
-          - '3.4'
-          - '4.0'
-        gemfile:
-          - gemfiles/activerecord_8_0.gemfile
-          - gemfiles/activerecord_8_1.gemfile
-    name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }}
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-    services:
-      mysql:
-        image: mysql:8.0
-        env:
-          MYSQL_DATABASE: test
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_USER: test
-          MYSQL_PASSWORD: test_password
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd "mysqladmin ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - run: |
-          mysql -e "CREATE USER 'replica'@'%' IDENTIFIED BY 'replica_password';" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
-          mysql -e "GRANT SELECT ON test.* TO 'replica'@'%'" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
-
-          mysql -e "CREATE USER 'primary'@'%' IDENTIFIED BY 'primary_password';" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
-          mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'primary'@'%';" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
-          mysql -e "FLUSH PRIVILEGES;" -u root -p${{ env.MYSQL_PASSWORD || 'password' }} -h 127.0.0.1
-      - run: |
-          bundle exec rspec
-        env:
-          MYSQL_HOST: 127.0.0.1
-          RAILS_ENV: test
-  RuboCop:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2'
-          bundler-cache: true
-      - run: |
-          bundle exec rubocop --parallel --color

data/.github/workflows/publish.yml

@@ -1,25 +0,0 @@
-name: Publish GEM
-
-on:
-  push:
-    tags:
-      - v*
-jobs:
-  push:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-      id-token: write
-
-    steps:
-      # Set up
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-          ruby-version: ruby
-
-      # Release
-      - uses: rubygems/release-gem@v1

data/.gitignore

@@ -1,3 +0,0 @@
-janus-ar-*.gem
-.rubocop-*
-gemfiles/*.gemfile.lock

data/.rspec

@@ -1,3 +0,0 @@
---force-color
---format documentation
---require ./spec/spec_helper.rb

data/.rubocop.yml

@@ -1,29 +0,0 @@
-inherit_from:
-  - https://tech.olioex.com/.support/rubocop-styling-v1.0
-
-require:
-  - rubocop-rails
-
-AllCops:
-  SuggestExtensions: false
-
-Style/Documentation:
-  Enabled: false
-
-Rails/Delegate:
-  Enabled: false
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*
-
-Style/GlobalVars:
-  Exclude:
-    - 'spec/**/*'
-
-Naming/FileName:
-  Exclude:
-    - lib/janus-ar.rb
-
-Metrics/AbcSize:
-  Max: 25

data/assets/.gitkeep

@@ -1 +0,0 @@
-

data/bin/release.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-rm janus-ar-*.gem
-gem build janus-ar.gemspec
-gem push janus-ar-*.gem

data/gemfiles/activerecord_8_0.gemfile

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord', '~> 8.0.0'

data/gemfiles/activerecord_8_1.gemfile

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord', '~> 8.1.0'

data/spec/lib/janus-ar/active_record/connection_adapters/janus_mysql_adapter_spec.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ActiveRecord::ConnectionAdapters::JanusMysql2Adapter do
-  subject { described_class.new(config) }
-
-  let(:database) { 'test' }
-  let(:primary_config) do
-    {
-      'username' => 'primary',
-      'password' => 'primary_password',
-      'host' => '127.0.0.1',
-      'ssl' => true,
-      'ssl_mode' => 'REQUIRED',
-      'tls_min_version' => 3,
-    }
-  end
-  let(:replica_config) do
-    {
-      'username' => 'replica',
-      'password' => 'replica_password',
-      'host' => '127.0.0.1',
-      'pool' => 500,
-      'ssl' => true,
-      'ssl_mode' => 'REQUIRED',
-      'tls_min_version' => 3,
-    }
-  end
-  let(:config) do
-    {
-      database:,
-      adapter: 'janus_mysql2',
-      janus: {
-        'primary' => primary_config,
-        'replica' => replica_config,
-      },
-    }
-  end
-
-  describe 'Configuration' do
-    it 'creates primary connection as expected' do
-      config = primary_config.dup.freeze
-      expect(subject.config).to eq config.merge('database' => database,
-                                                'flags' => ::Janus::Client::FOUND_ROWS).symbolize_keys
-    end
-
-    it 'creates replica connection as expected' do
-      config = replica_config.dup.freeze
-      expect(
-        subject.replica_connection.instance_variable_get(:@config)
-      ).to eq config.merge('database' => database, 'flags' => ::Janus::Client::FOUND_ROWS).symbolize_keys
-    end
-
-    context 'Rails sets empty database for server connection' do
-      let(:database) { nil }
-
-      it 'creates primary connection as expected' do
-        config = primary_config.dup.freeze
-        expect(subject.config).to eq config.merge(
-          'database' => nil,
-          'flags' => ::Janus::Client::FOUND_ROWS
-        ).symbolize_keys
-      end
-
-      it 'creates replica connection as expected' do
-        config = replica_config.dup.freeze
-        expect(
-          subject.replica_connection.instance_variable_get(:@config)
-        ).to eq config.merge('database' => nil, 'flags' => ::Janus::Client::FOUND_ROWS).symbolize_keys
-      end
-    end
-  end
-
-  describe 'Integration tests' do
-    let(:table_name) { 'table_name_mysql2' }
-
-    it_behaves_like 'a mysql like server'
-  end
-end

data/spec/lib/janus-ar/active_record/connection_adapters/janus_trilogy_adapter_spec.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter do
-  subject { described_class.new(config) }
-
-  let(:database) { 'test' }
-  let(:primary_config) do
-    {
-      'username' => 'primary',
-      'password' => 'primary_password',
-      'host' => '127.0.0.1',
-      'ssl' => true,
-      'ssl_mode' => 'REQUIRED',
-      'tls_min_version' => Trilogy::TLS_VERSION_12,
-    }
-  end
-  let(:replica_config) do
-    {
-      'username' => 'replica',
-      'password' => 'replica_password',
-      'host' => '127.0.0.1',
-      'pool' => 500,
-      'ssl' => true,
-      'ssl_mode' => 'REQUIRED',
-      'tls_min_version' => Trilogy::TLS_VERSION_12,
-    }
-  end
-  let(:config) do
-    {
-      database:,
-      adapter: 'janus_trilogy',
-      janus: {
-        'primary' => primary_config,
-        'replica' => replica_config,
-      },
-    }
-  end
-
-  describe 'Configuration' do
-    # Trilogy enables FOUND_ROWS via the `found_rows` option (not mysql2-style
-    # flags), and ActiveRecord's TrilogyAdapter forces it on. We assert it is
-    # present even though the supplied config omits it.
-    it 'creates primary connection as expected' do
-      config = primary_config.dup.freeze
-      expect(subject.config).to eq config.merge('database' => database, 'found_rows' => true).symbolize_keys
-    end
-
-    it 'creates replica connection as expected' do
-      config = replica_config.dup.freeze
-      expect(
-        subject.replica_connection.instance_variable_get(:@config)
-      ).to eq config.merge('database' => database, 'found_rows' => true).symbolize_keys
-    end
-
-    context 'Rails sets empty database for server connection' do
-      let(:database) { nil }
-
-      it 'creates primary connection as expected' do
-        config = primary_config.dup.freeze
-        expect(subject.config).to eq config.merge('database' => nil, 'found_rows' => true).symbolize_keys
-      end
-
-      it 'creates replica connection as expected' do
-        config = replica_config.dup.freeze
-        expect(
-          subject.replica_connection.instance_variable_get(:@config)
-        ).to eq config.merge('database' => nil, 'found_rows' => true).symbolize_keys
-      end
-    end
-  end
-
-  describe 'Integration tests' do
-    let(:table_name) { 'table_name_trilogy' }
-
-    it_behaves_like 'a mysql like server'
-  end
-end

data/spec/lib/janus-ar/client_spec.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'janus-ar/client'
-
-RSpec.describe Janus::Client do
-  it { expect(described_class::FOUND_ROWS).to eq 2 }
-end

data/spec/lib/janus-ar/context_spec.rb

@@ -1,118 +0,0 @@
-# frozen_string_literal: true
-
-require 'janus-ar/context'
-require 'active_support/executor'
-
-RSpec.describe Janus::Context do
-  after(:each) { described_class.release_all }
-
-  describe '#initialize' do
-    it 'defaults to the replica and a primary last-used connection' do
-      context = described_class.new
-      expect(context.use_primary?).to be false
-      expect(context.last_used_connection).to eq(:primary)
-    end
-
-    it 'can be created pinned to the primary' do
-      expect(described_class.new(primary: true).use_primary?).to be true
-    end
-  end
-
-  describe '#stick_to_primary' do
-    it 'sets the primary flag to true' do
-      context = described_class.new
-      context.stick_to_primary
-      expect(context.use_primary?).to be true
-    end
-  end
-
-  describe '#release_all' do
-    it 'resets the primary flag and the last used connection' do
-      context = described_class.new(primary: true)
-      context.used_connection(:primary)
-      context.release_all
-      expect(context.use_primary?).to be false
-      expect(context.last_used_connection).to be_nil
-    end
-  end
-
-  describe '#used_connection' do
-    it 'sets the last used connection' do
-      context = described_class.new
-      context.used_connection(:replica)
-      expect(context.last_used_connection).to eq(:replica)
-    end
-  end
-
-  describe 'class-level access' do
-    it 'sticks and releases the current execution state' do
-      described_class.stick_to_primary
-      expect(described_class.use_primary?).to be true
-      described_class.release_all
-      expect(described_class.use_primary?).to be false
-    end
-
-    it 'isolates state between threads' do
-      described_class.stick_to_primary
-      other = Thread.new { described_class.use_primary? }.value
-      expect(other).to be false
-      expect(described_class.use_primary?).to be true
-    end
-
-    it 'isolates the last used connection between threads' do
-      described_class.used_connection(:replica)
-      other = Thread.new do
-        described_class.used_connection(:primary)
-        described_class.last_used_connection
-      end.value
-      expect(other).to eq(:primary)
-      expect(described_class.last_used_connection).to eq(:replica)
-    end
-
-    it 'is safe to release a context that was never touched' do
-      Thread.new do
-        expect { described_class.release_all }.not_to raise_error
-        expect(described_class.use_primary?).to be false
-      end.join
-    end
-  end
-
-  describe '.install_reset_hook' do
-    let(:executor) { Class.new(ActiveSupport::Executor) }
-
-    it 'releases the context at the start of every executor run' do
-      described_class.install_reset_hook(executor)
-      described_class.stick_to_primary
-
-      stuck_inside = nil
-      executor.wrap { stuck_inside = described_class.use_primary? }
-
-      expect(stuck_inside).to be false
-    end
-
-    it 'stops stickiness leaking from a previous run into the next' do
-      described_class.install_reset_hook(executor)
-
-      executor.wrap { described_class.stick_to_primary }
-
-      leaked = nil
-      executor.wrap { leaked = described_class.use_primary? }
-      expect(leaked).to be false
-    end
-
-    it 'still starts the next run clean after the previous run raised' do
-      described_class.install_reset_hook(executor)
-
-      expect do
-        executor.wrap do
-          described_class.stick_to_primary
-          raise 'boom'
-        end
-      end.to raise_error('boom')
-
-      leaked = nil
-      executor.wrap { leaked = described_class.use_primary? }
-      expect(leaked).to be false
-    end
-  end
-end

data/spec/lib/janus-ar/db_console_config_spec.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'janus-ar/db_console_config'
-
-RSpec.describe Janus::DbConsoleConfig do
-  subject(:console_config) { described_class.new(db_config) }
-
-  let(:db_config) do
-    instance_double(
-      ActiveRecord::DatabaseConfigurations::HashConfig,
-      configuration_hash: {
-        database: 'my_database',
-        janus: {
-          'primary' => { 'host' => 'primary.local', 'username' => 'primary' },
-          'replica' => { 'host' => 'replica.local', 'username' => 'replica' },
-        },
-      }
-    )
-  end
-
-  it 'exposes the replica configuration with symbol keys so dbconsole connects to a replica' do
-    expect(console_config.configuration_hash).to eq(host: 'replica.local', username: 'replica')
-  end
-
-  it 'exposes the database name from the top-level config' do
-    expect(console_config.database).to eq('my_database')
-  end
-end

data/spec/lib/janus-ar/logging/logger_spec.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Janus::Logging::Logger do
-  describe '.log' do
-    let(:logger) { double('logger') }
-
-    before do
-      described_class.logger = logger
-    end
-
-    it 'logs the message with the specified format' do
-      expect(logger).to receive(:send).with(:info, '[Janus] Test message')
-      described_class.log('Test message', :info)
-    end
-
-    it 'does not log the message if logger is not set' do
-      described_class.logger = nil
-      expect(logger).not_to receive(:send)
-      described_class.log('Test message', :info)
-    end
-  end
-
-  describe '.logger=' do
-    let(:logger) { double('logger') }
-
-    it 'sets the logger' do
-      described_class.logger = logger
-      expect(described_class.logger).to eq(logger)
-    end
-  end
-end