janus-ar 8.0.1 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 192027338ca77fe74dcf3d4ce10209514d57518e55be909c7d7fdf18c6bfcd44
-  data.tar.gz: 7d9cb1c366f05c08c19f07a6435673ddbbe8bc9ae07ab495e2f9901973ea932d
+  metadata.gz: cd05e24e1306fce67609a9e991fddad6c4d7014ce58f696a01eb64317838e837
+  data.tar.gz: d07db4e1d21a6363ed9f0f1ea41736b1d71d1ae0fd6c419f34f15e5f74e8825f
 SHA512:
-  metadata.gz: 6325a5fde59fc041a93182f97d294025a614e99ea974a9a018996af67895fcd28e1f9f156cebffe2366725b37fafca55b11d846dd7fe7ab4a1bd07c369d406f5
-  data.tar.gz: 1eea960641c63b5ba76e4fe285de967d04e79fea4e5de8eaeeffc082c97596dfcb9c3f0cb4e6524b452b59a8a4df8fc50ae2537c56561880c98f233502e34dc0
+  metadata.gz: 9bc3a5029f1b51374051a2c6f8ccc743192780bae4eaaafe18ea6578d9fb77826760ae95a6714bb5ea8f3cd128ef51a3247d39416ae78b8af7b5554ee652ab64
+  data.tar.gz: 0fc71666876765b84cc70ddc4ffc016cd175ae8594fb68dd0a442b047a27aced86e5597ebb1fcf3cebc10d00e81081f8ff63122fcacc4eefa680a89c0fdc4ca2

data/Gemfile

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    janus-ar (8.0.0)
+    janus-ar (8.1.0)
       activerecord (>= 8.0, < 9.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (8.1.3)
-      activesupport (= 8.1.3)
-    activerecord (8.1.3)
-      activemodel (= 8.1.3)
-      activesupport (= 8.1.3)
+    activemodel (8.1.3.1)
+      activesupport (= 8.1.3.1)
+    activerecord (8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       timeout (>= 0.4.0)
-    activesupport (8.1.3)
+    activesupport (8.1.3.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -30,15 +30,15 @@ GEM
     base64 (0.3.0)
     bigdecimal (4.1.2)
     coderay (1.1.3)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
     diff-lcs (1.6.2)
     drb (2.2.3)
-    i18n (1.14.8)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     io-console (0.8.2)
-    json (2.19.9)
-    language_server-protocol (3.17.0.5)
+    json (2.21.2)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
     method_source (1.1.0)
@@ -48,7 +48,7 @@ GEM
     mysql2 (0.5.7)
       bigdecimal
     parallel (1.28.0)
-    parser (3.3.11.1)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
     prism (1.9.0)
@@ -57,7 +57,7 @@ GEM
       method_source (~> 1.0)
       reline (>= 0.6.0)
     racc (1.8.1)
-    rack (3.2.6)
+    rack (3.2.7)
     rainbow (3.1.1)
     rake (13.4.2)
     regexp_parser (2.12.0)
@@ -76,8 +76,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.88.0)
-      json (~> 2.3)
+    rubocop (1.90.0)
+      json (>= 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (>= 1.10)
@@ -87,18 +87,18 @@ GEM
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-performance (1.26.1)
+    rubocop-performance (1.27.0)
       lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.35.4)
+    rubocop-rails (2.37.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
     rubocop-rspec (3.10.2)
       lint_roller (~> 1.1)
@@ -111,7 +111,7 @@ GEM
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     timeout (0.6.1)
-    trilogy (2.12.5)
+    trilogy (2.13.0)
       bigdecimal
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -131,9 +131,9 @@ DEPENDENCIES
   pry
   rake
   rspec (~> 3)
-  rubocop (~> 1.88.0)
+  rubocop (~> 1.90.0)
   rubocop-performance
-  rubocop-rails (~> 2.35.2)
+  rubocop-rails (~> 2.37.0)
   rubocop-rspec
   rubocop-thread_safety
   trilogy

data/README.md

@@ -119,7 +119,7 @@ There are some edge cases:
 * `SET` operations will be sent to all connections
 * Execution of specific methods such as `connect!`, `disconnect!`, `reconnect!`, and `clear_cache!` are invoked on all underlying connections
 * Calls inside a transaction will always be sent to the primary (otherwise changes from within the transaction could not be read back on most transaction isolation levels)
-* Locking reads (e.g. `SELECT ... FOR UPDATE`) will always be sent to the primary
+* Locking reads (e.g. `SELECT ... FOR UPDATE`, `FOR UPDATE SKIP LOCKED`, `FOR SHARE`, `LOCK IN SHARE MODE`, `GET_LOCK(...)`) will always be sent to the primary
 
 # Notes
 
@@ -128,3 +128,26 @@ Janus does not support Rails' read/write split or sharding using `with_connectio
 # Acknowlegements
 
 Amazing project logo by @undevelopedbruce.
+
+## Releasing
+
+Releases are cut from the [GitHub Releases UI](https://github.com/OLIOEX/janus-ar/releases/new).
+Publishing to RubyGems is automatic — there is nothing to bump by hand, and no
+API key to rotate (authentication uses RubyGems
+[trusted publishing](https://guides.rubygems.org/trusted-publishing/) over OIDC).
+
+To release:
+
+1. Create a new release against the head of `main`, with a tag named
+   `vMAJOR.MINOR.PATCH` — e.g. `v8.1.0`. Pre-release suffixes use a dot, as
+   RubyGems requires: `v8.1.0.rc1`, not `v8.1.0-rc1`.
+2. Publish it.
+
+[`.github/workflows/publish.yml`](.github/workflows/publish.yml) then takes the
+version from the tag, writes it into `lib/janus-ar/version.rb`, refreshes
+`Gemfile.lock`, commits that bump to `main` as `Release vX.Y.Z`, moves the tag
+onto that commit, and pushes the gem.
+
+Because the bump is committed to `main`, releases must be created from its head
+— the workflow refuses to publish if the tag sits anywhere else. You never need
+to edit `version.rb` yourself; the tag is the source of truth.

data/janus-ar.gemspec

@@ -13,8 +13,10 @@ Gem::Specification.new do |gem|
     'source_code_uri' => 'https://github.com/olioex/janus-ar',
   }
 
-  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
-  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  ignored           = %r{^(bin|spec|assets|gemfiles|\.github)/|^\.}
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR).grep_v(ignored)
+  # The gem ships no executables; bin/ holds repository maintenance scripts.
+  gem.executables   = []
   gem.name          = 'janus-ar'
   gem.require_paths = %w(lib)
   gem.version       = Janus::VERSION
@@ -28,8 +30,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3'
-  gem.add_development_dependency 'rubocop', '~> 1.88.0'
-  gem.add_development_dependency 'rubocop-rails', '~> 2.35.2'
+  gem.add_development_dependency 'rubocop', '~> 1.90.0'
+  gem.add_development_dependency 'rubocop-rails', '~> 2.37.0'
   gem.add_development_dependency 'rubocop-rspec'
   gem.add_development_dependency 'rubocop-thread_safety'
   gem.add_development_dependency 'rubocop-performance'

data/lib/janus-ar/adapter_extensions.rb

@@ -74,6 +74,11 @@ module Janus
       super
     end
 
+    def discard!(...)
+      replica_connection.discard!(...)
+      super
+    end
+
     def disconnect!(...)
       replica_connection.disconnect!(...)
       super

data/lib/janus-ar/client.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
-module Janus
-  class Client
-    FOUND_ROWS = 2
-  end
-end
+# frozen_string_literal: true
+module Janus
+  class Client
+    FOUND_ROWS = 2
+  end
+end

data/lib/janus-ar/db_console_config.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: true
-
-module Janus
-  class DbConsoleConfig
-    def initialize(config)
-      @_config = config.configuration_hash
-    end
-
-    def configuration_hash
-      @_config[:janus]['replica'].symbolize_keys
-    end
-
-    def database
-      @_config[:database]
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Janus
+  class DbConsoleConfig
+    def initialize(config)
+      @_config = config.configuration_hash
+    end
+
+    def configuration_hash
+      @_config[:janus]['replica'].symbolize_keys
+    end
+
+    def database
+      @_config[:database]
+    end
+  end
+end

data/lib/janus-ar/logging/logger.rb

@@ -1,15 +1,15 @@
-# frozen_string_literal: true
-
-module Janus
-  module Logging
-    class Logger
-      class << self
-        def log(message, format = :info)
-          logger&.send(format, "[Janus] #{message}")
-        end
-
-        attr_accessor :logger
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Janus
+  module Logging
+    class Logger
+      class << self
+        def log(message, format = :info)
+          logger&.send(format, "[Janus] #{message}")
+        end
+
+        attr_accessor :logger
+      end
+    end
+  end
+end

data/lib/janus-ar/logging/subscriber.rb

@@ -1,27 +1,27 @@
-# frozen_string_literal: true
-
-module Janus
-  module Logging
-    module Subscriber
-      IGNORE_PAYLOAD_NAMES = %w(SCHEMA EXPLAIN).freeze
-
-      def sql(event)
-        name = event.payload[:name]
-        unless IGNORE_PAYLOAD_NAMES.include?(name)
-          name = [current_wrapper_name(event), name].compact.join(' ')
-          event.payload[:name] = name
-        end
-        super(event)
-      end
-
-      protected
-
-      def current_wrapper_name(_event)
-        connection = Janus::Context.last_used_connection
-        return nil unless connection
-
-        "[#{connection}]"
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Janus
+  module Logging
+    module Subscriber
+      IGNORE_PAYLOAD_NAMES = %w(SCHEMA EXPLAIN).freeze
+
+      def sql(event)
+        name = event.payload[:name]
+        unless IGNORE_PAYLOAD_NAMES.include?(name)
+          name = [current_wrapper_name(event), name].compact.join(' ')
+          event.payload[:name] = name
+        end
+        super(event)
+      end
+
+      protected
+
+      def current_wrapper_name(_event)
+        connection = Janus::Context.last_used_connection
+        return nil unless connection
+
+        "[#{connection}]"
+      end
+    end
+  end
+end

data/lib/janus-ar/query_director.rb

@@ -5,10 +5,16 @@ module Janus
     REPLICA = :replica
     PRIMARY = :primary
 
+    LOCK_FUNCTIONS = %w(
+      nextval currval lastval get_lock release_lock is_free_lock is_used_lock
+      pg_advisory_lock pg_advisory_unlock
+    ).freeze
+
     SQL_PRIMARY_MATCHERS = [
-      /\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i,
-      /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i,
-      /\A\s*show/i
+      /\A\s*select\b.*\bfor\s+(update|share)\b/im,
+      /\A\s*select\b.*\block\s+in\s+share\s+mode\b/im,
+      /\A\s*select\b.*\b(#{LOCK_FUNCTIONS.join('|')})\s*\(/im,
+      /\A\s*show\b/i,
     ].freeze
     SQL_REPLICA_MATCHERS = [/\A\s*(select|with.+\)\s*select)\s/i].freeze
     SQL_ALL_MATCHERS = [/\A\s*set\s/i].freeze

data/lib/janus-ar/version.rb

@@ -4,8 +4,8 @@ module Janus
   unless defined?(::Janus::VERSION)
     module VERSION
       MAJOR = 8
-      MINOR = 0
-      PATCH = 1
+      MINOR = 1
+      PATCH = 0
       PRE = nil
 
       def self.to_s

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: janus-ar
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.1.0
 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
@@ -119,28 +119,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,29 +186,16 @@ 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
@@ -222,16 +209,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 +228,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'