janus-ar 0.15.3 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba9bd0a8c688fa7d38fb9af101c5f47d3aeab3894499c55759c40190c8e56b6d
-  data.tar.gz: fe843929d1d953d249a5e36cda2779b0b9c72f2ad89da0eb0877f7db38f1c74e
+  metadata.gz: d9a0e04cbb2ece10c1a3fec2d0c1036788eaa290e36f5af3ea78812e8de6ac6c
+  data.tar.gz: 4cdf47f493d980f0c90b2bdb1d45468163cc58bf7d88c60956dc12e62dd2983d
 SHA512:
-  metadata.gz: 6f0de25c9fded2476a892bdb48d5aa40a522fc523374b4de651eebc188263b60d11175ceb66f0f49178c9815b34a03e99fcd7953a3618c9fb8ec38037a127a7a
-  data.tar.gz: 3c883d4c3b81a36696f844e45c583e7d575dc02c8bc3b1b1df30c916cd0420d8e8880f4089d09316f241bdb0c859cf472eb38a7e68e6de45fdebf12fd916ce6e
+  metadata.gz: 1cc3b11d2a1f77ffd74c13fb61d9a6b012fa95375c030f93317be8a02052cc899c3750dbda3273efc4344e9bfc259c22d385842d9ad829ebde770ec3c911d969
+  data.tar.gz: 2abaface3c1b02a535a3b467b047ed03ab67ee5b57396363253fa975ab89b39cffaf0386b08968b9001f86623779b92ef31189cd91598242a31934ae1b71e8d9

data/.rubocop.yml

@@ -1,22 +1,26 @@
-inherit_from:
-  - https://tech.olioex.com/.support/rubocop-styling-v1.0
-
-require:
-  - rubocop-rails
-
-Style/Documentation:
-  Enabled: false
-
-Rails/Delegate:
-  Enabled: false
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*
-
-Style/GlobalVars:
-  Exclude:
-    - 'spec/**/*'
-
-Metrics/AbcSize:
-  Max: 25
+inherit_from:
+  - https://tech.olioex.com/.support/rubocop-styling-v1.0
+
+require:
+  - rubocop-rails
+
+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/Gemfile.lock

@@ -1,33 +1,34 @@
 PATH
   remote: .
   specs:
-    janus-ar (0.15.2)
-      activerecord (>= 7.1.0, < 7.2)
+    janus-ar (7.2.0)
+      activerecord (~> 7.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.4)
-    activerecord (7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
       timeout (>= 0.4.0)
-    activesupport (7.1.3.4)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     diff-lcs (1.5.1)
     drb (2.2.1)
@@ -35,9 +36,9 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
+    logger (1.6.0)
     method_source (1.0.0)
-    minitest (5.24.1)
-    mutex_m (0.2.0)
+    minitest (5.25.1)
     mysql2 (0.5.6)
     parallel (1.26.3)
     parser (3.3.4.2)
@@ -47,12 +48,11 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.8.1)
-    rack (3.1.5)
-      strscan
+    rack (3.1.7)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.5)
+    rexml (3.3.6)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -83,16 +83,17 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.26.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rspec (3.0.4)
       rubocop (~> 1.61)
     rubocop-thread_safety (0.5.1)
       rubocop (>= 0.90.0)
     ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
     strscan (3.1.0)
     timeout (0.4.1)
     trilogy (2.8.1)
@@ -105,7 +106,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  activesupport (>= 7.1.0, < 7.2)
+  activesupport (>= 7.2.0)
   janus-ar!
   mysql2
   pry
@@ -113,7 +114,7 @@ DEPENDENCIES
   rspec (~> 3)
   rubocop (~> 1.65.0)
   rubocop-performance
-  rubocop-rails (~> 2.25.0)
+  rubocop-rails (~> 2.26.0)
   rubocop-rspec
   rubocop-thread_safety
   trilogy

data/README.md

@@ -35,6 +35,22 @@ This project assumes that your read/write endpoints are handled by a separate sy
 
 After a write request during a thread the adapter will continue using the `primary` server, unless the context is specifically released.
 
+## Rails 7.2+
+
+For Rails 7.2 you'll need to manually register the database adaptor in `config/application.rb` after requiring rails but before entering the application configuration, e.g.
+
+```ruby
+require 'rails/all'
+
+ActiveRecord::ConnectionAdapters.register("janus_trilogy", "ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter", 'janus-ar/active_record/connection_adapters/janus_trilogy_adapter')
+# ...or...
+ActiveRecord::ConnectionAdapters.register("janus_mysql2", "ActiveRecord::ConnectionAdapters::JanusMysql2Adapter", 'janus-ar/active_record/connection_adapters/janus_mysql2_adapter')
+```
+
+## Rails <= 7.1
+
+ActiveRecord 7.1 was tested up to releases v0.15.*. After this release we only tested  Rails 7.2+. This does not mean it is not compatible, just not tested.
+
 ### Configuration
 
 Update your **database.yml** as follows:
@@ -104,6 +120,9 @@ There are some edge cases:
 * 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
 
+# Notes
+
+Janus does not support Rails' read/write split or sharding using `with_connection`.
 
 # Acknowlegements
 

data/Rakefile

@@ -1,3 +1,3 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'

data/janus-ar.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('lib/janus/version.rb', __dir__)
+require File.expand_path('lib/janus-ar/version.rb', __dir__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ['Lloyd Watkin']
@@ -21,15 +21,15 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 3.2.0'
 
-  gem.add_dependency 'activerecord', '>= 7.1.0', '< 7.2'
-  gem.add_development_dependency 'activesupport', '>= 7.1.0', '< 7.2'
+  gem.add_dependency 'activerecord', '~> 7.2'
+  gem.add_development_dependency 'activesupport', '>= 7.2.0'
   gem.add_development_dependency 'mysql2'
   gem.add_development_dependency 'trilogy'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3'
   gem.add_development_dependency 'rubocop', '~> 1.65.0'
-  gem.add_development_dependency 'rubocop-rails', '~> 2.25.0'
+  gem.add_development_dependency 'rubocop-rails', '~> 2.26.0'
   gem.add_development_dependency 'rubocop-rspec'
   gem.add_development_dependency 'rubocop-thread_safety'
   gem.add_development_dependency 'rubocop-performance'

data/lib/{active_record → janus-ar/active_record}/connection_adapters/janus_mysql2_adapter.rb

@@ -2,7 +2,7 @@
 
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/mysql2_adapter'
-require_relative '../../janus'
+require_relative '../../../janus-ar'
 
 module ActiveRecord
   module ConnectionHandling
@@ -47,6 +47,10 @@ module ActiveRecord
         update_config
       end
 
+      def with_connection(_args = {})
+        self
+      end
+
       def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: true)
         case where_to_send?(sql)
         when :all

data/lib/{active_record → janus-ar/active_record}/connection_adapters/janus_trilogy_adapter.rb

@@ -2,7 +2,7 @@
 
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/trilogy_adapter'
-require_relative '../../janus'
+require_relative '../../../janus-ar'
 
 module ActiveRecord
   module ConnectionHandling
@@ -89,6 +89,10 @@ module ActiveRecord
         end
       end
 
+      def with_connection(_args = {})
+        self
+      end
+
       def connect!(...)
         replica_connection.connect!(...)
         super

data/lib/{janus → janus-ar}/version.rb

@@ -3,9 +3,9 @@
 module Janus
   unless defined?(::Janus::VERSION)
     module VERSION
-      MAJOR = 0
-      MINOR = 15
-      PATCH = 3
+      MAJOR = 7
+      MINOR = 2
+      PATCH = 0
       PRE = nil
 
       def self.to_s

data/lib/janus-ar.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'active_support'
+
+module Janus
+  autoload :Context, 'janus-ar/context'
+  autoload :Client, 'janus-ar/client'
+  autoload :QueryDirector, 'janus-ar/query_director'
+  autoload :VERSION, 'janus-ar/version'
+  autoload :DbConsoleConfig, 'janus-ar/db_console_config'
+
+  module Logging
+    autoload :Subscriber, 'janus-ar/logging/subscriber'
+    autoload :Logger, 'janus-ar/logging/logger'
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::LogSubscriber.log_subscribers.each do |subscriber|
+    subscriber.extend Janus::Logging::Subscriber
+  end
+end

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

@@ -14,6 +14,7 @@ RSpec.describe ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter do
       'ssl' => true,
       'ssl_mode' => 'REQUIRED',
       'tls_min_version' => Trilogy::TLS_VERSION_12,
+      'found_rows' => true,
     }
   end
   let(:replica_config) do
@@ -25,6 +26,7 @@ RSpec.describe ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter do
       'ssl' => true,
       'ssl_mode' => 'REQUIRED',
       'tls_min_version' => Trilogy::TLS_VERSION_12,
+      'found_rows' => true,
     }
   end
   let(:config) do

data/spec/lib/{janus → janus-ar}/client_spec.rb

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

data/spec/lib/{janus → janus-ar}/context_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'janus/context'
+require 'janus-ar/context'
 
 RSpec.describe Janus::Context do
   describe '#initialize' do

data/spec/spec_helper.rb

@@ -4,9 +4,12 @@ require 'pry'
 
 require 'active_record'
 
-require './lib/janus'
-require './lib/active_record/connection_adapters/janus_mysql2_adapter'
-require './lib/active_record/connection_adapters/janus_trilogy_adapter'
+require './lib/janus-ar'
+require './lib/janus-ar/active_record/connection_adapters/janus_mysql2_adapter'
+require './lib/janus-ar/active_record/connection_adapters/janus_trilogy_adapter'
+
+ActiveRecord::ConnectionAdapters.register("janus_trilogy", "ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter")
+ActiveRecord::ConnectionAdapters.register("janus_mysql2", "ActiveRecord::ConnectionAdapters::JanusMysql2Adapter")
 
 require './spec/shared_examples/a_mysql_like_server.rb'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: janus-ar
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 7.2.0
 platform: ruby
 authors:
 - Lloyd Watkin
@@ -14,20 +14,14 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '7.2'
 - !ruby/object:Gem::Dependency
@@ -36,20 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
+        version: 7.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.25.0
+        version: 2.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.25.0
+        version: 2.26.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -215,22 +203,22 @@ files:
 - assets/janus-logo.png
 - bin/release.sh
 - janus-ar.gemspec
-- lib/active_record/connection_adapters/janus_mysql2_adapter.rb
-- lib/active_record/connection_adapters/janus_trilogy_adapter.rb
-- lib/janus.rb
-- lib/janus/client.rb
-- lib/janus/context.rb
-- lib/janus/db_console_config.rb
-- lib/janus/logging/logger.rb
-- lib/janus/logging/subscriber.rb
-- lib/janus/query_director.rb
-- lib/janus/version.rb
-- spec/lib/active_record/connection_adapters/janus_mysql_adapter_spec.rb
-- spec/lib/active_record/connection_adapters/janus_trilogy_adapter_spec.rb
-- spec/lib/janus/client_spec.rb
-- spec/lib/janus/context_spec.rb
-- spec/lib/janus/logging/logger_spec.rb
-- spec/lib/janus/query_director_spec.rb
+- lib/janus-ar.rb
+- lib/janus-ar/active_record/connection_adapters/janus_mysql2_adapter.rb
+- lib/janus-ar/active_record/connection_adapters/janus_trilogy_adapter.rb
+- lib/janus-ar/client.rb
+- lib/janus-ar/context.rb
+- lib/janus-ar/db_console_config.rb
+- lib/janus-ar/logging/logger.rb
+- lib/janus-ar/logging/subscriber.rb
+- lib/janus-ar/query_director.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/logging/logger_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

data/lib/janus.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support'
-
-module Janus
-  autoload :Context, 'janus/context'
-  autoload :Client, 'janus/client'
-  autoload :QueryDirector, 'janus/query_director'
-  autoload :VERSION, 'janus/version'
-  autoload :DbConsoleConfig, 'janus/db_console_config'
-
-  module Logging
-    autoload :Subscriber, 'janus/logging/subscriber'
-    autoload :Logger, 'janus/logging/logger'
-  end
-end
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::LogSubscriber.log_subscribers.each do |subscriber|
-    subscriber.extend Janus::Logging::Subscriber
-  end
-end