janus-ar 0.15.2 → 7.2.0

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

@@ -1,54 +1,54 @@
-# frozen_string_literal: true
-module Janus
-  class QueryDirector
-    ALL = :all
-    REPLICA = :replica
-    PRIMARY = :primary
-
-    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
-    ].freeze
-    SQL_REPLICA_MATCHERS = [/\A\s*(select|with.+\)\s*select)\s/i].freeze
-    SQL_ALL_MATCHERS = [/\A\s*set\s/i].freeze
-    SQL_SKIP_ALL_MATCHERS = [/\A\s*set\s+local\s/i].freeze
-    WRITE_PREFIXES = %w(INSERT UPDATE DELETE LOCK CREATE GRANT DROP ALTER TRUNCATE BEGIN SAVEPOINT FLUSH).freeze
-
-    def initialize(sql, open_transactions)
-      @_sql = sql
-      @_open_transactions = open_transactions
-    end
-
-    def where_to_send?
-      if should_send_to_all?
-        ALL
-      elsif can_go_to_replica?
-        REPLICA
-      else
-        PRIMARY
-      end
-    end
-
-    private
-
-    def should_send_to_all?
-      SQL_ALL_MATCHERS.any? { |matcher| @_sql =~ matcher } && SQL_SKIP_ALL_MATCHERS.none? { |matcher| @_sql =~ matcher }
-    end
-
-    def can_go_to_replica?
-      !should_go_to_primary?
-    end
-
-    def should_go_to_primary?
-      Janus::Context.use_primary? ||
-        write_query? ||
-        @_open_transactions.positive? ||
-        SQL_PRIMARY_MATCHERS.any? { |matcher| @_sql =~ matcher }
-    end
-
-    def write_query?
-      WRITE_PREFIXES.include?(@_sql.upcase.split(' ').first)
-    end
-  end
-end
+# frozen_string_literal: true
+module Janus
+  class QueryDirector
+    ALL = :all
+    REPLICA = :replica
+    PRIMARY = :primary
+
+    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
+    ].freeze
+    SQL_REPLICA_MATCHERS = [/\A\s*(select|with.+\)\s*select)\s/i].freeze
+    SQL_ALL_MATCHERS = [/\A\s*set\s/i].freeze
+    SQL_SKIP_ALL_MATCHERS = [/\A\s*set\s+local\s/i].freeze
+    WRITE_PREFIXES = %w(INSERT UPDATE DELETE LOCK CREATE GRANT DROP ALTER TRUNCATE BEGIN SAVEPOINT FLUSH).freeze
+
+    def initialize(sql, open_transactions)
+      @_sql = sql
+      @_open_transactions = open_transactions
+    end
+
+    def where_to_send?
+      if should_send_to_all?
+        ALL
+      elsif can_go_to_replica?
+        REPLICA
+      else
+        PRIMARY
+      end
+    end
+
+    private
+
+    def should_send_to_all?
+      SQL_ALL_MATCHERS.any? { |matcher| @_sql =~ matcher } && SQL_SKIP_ALL_MATCHERS.none? { |matcher| @_sql =~ matcher }
+    end
+
+    def can_go_to_replica?
+      !should_go_to_primary?
+    end
+
+    def should_go_to_primary?
+      Janus::Context.use_primary? ||
+        write_query? ||
+        @_open_transactions.positive? ||
+        SQL_PRIMARY_MATCHERS.any? { |matcher| @_sql =~ matcher }
+    end
+
+    def write_query?
+      WRITE_PREFIXES.include?(@_sql.upcase.split(' ').first)
+    end
+  end
+end

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

@@ -1,17 +1,17 @@
-# frozen_string_literal: true
-
-module Janus
-  unless defined?(::Janus::VERSION)
-    module VERSION
-      MAJOR = 0
-      MINOR = 15
-      PATCH = 2
-      PRE = nil
-
-      def self.to_s
-        [MAJOR, MINOR, PATCH, PRE].compact.join('.')
-      end
-    end
-  end
-  ::Janus::VERSION
-end
+# frozen_string_literal: true
+
+module Janus
+  unless defined?(::Janus::VERSION)
+    module VERSION
+      MAJOR = 7
+      MINOR = 2
+      PATCH = 0
+      PRE = nil
+
+      def self.to_s
+        [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+      end
+    end
+  end
+  ::Janus::VERSION
+end

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_mysql_adapter_spec.rb

@@ -1,76 +1,82 @@
-# frozen_string_literal: true
-
-RSpec.describe ActiveRecord::ConnectionAdapters::JanusMysql2Adapter do
-  subject { described_class.new(config) }
-
-  it { expect(described_class::FOUND_ROWS).to eq 'FOUND_ROWS' }
-
-  let(:database) { 'test' }
-  let(:primary_config) do
-    {
-      'username' => 'primary',
-      'password' => 'primary_password',
-      'host' => '127.0.0.1',
-    }
-  end
-  let(:replica_config) do
-    {
-      'username' => 'replica',
-      'password' => 'replica_password',
-      'host' => '127.0.0.1',
-      'pool' => 500,
-    }
-  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
-    describe 'Integration tests' do
-      let(:table_name) { 'table_name_mysql2' }
-
-      it_behaves_like 'a mysql like server'
-    end
-  end
-end
+# frozen_string_literal: true
+
+RSpec.describe ActiveRecord::ConnectionAdapters::JanusMysql2Adapter do
+  subject { described_class.new(config) }
+
+  it { expect(described_class::FOUND_ROWS).to eq 'FOUND_ROWS' }
+
+  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
+    describe 'Integration tests' do
+      let(:table_name) { 'table_name_mysql2' }
+
+      it_behaves_like 'a mysql like server'
+    end
+  end
+end

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

@@ -1,80 +1,82 @@
-# frozen_string_literal: true
-
-RSpec.describe ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter do
-  subject { described_class.new(config) }
-
-  it { expect(described_class::FOUND_ROWS).to eq 'FOUND_ROWS' }
-
-  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
-    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).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).symbolize_keys
-      end
-    end
-  end
-
-  describe 'Integration tests' do
-    let(:table_name) { 'table_name_trilogy' }
-
-    it_behaves_like 'a mysql like server'
-  end
-end
+# frozen_string_literal: true
+
+RSpec.describe ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter do
+  subject { described_class.new(config) }
+
+  it { expect(described_class::FOUND_ROWS).to eq 'FOUND_ROWS' }
+
+  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,
+      'found_rows' => true,
+    }
+  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,
+      'found_rows' => true,
+    }
+  end
+  let(:config) do
+    {
+      database:,
+      adapter: 'janus_trilogy',
+      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).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).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 → janus-ar}/client_spec.rb

@@ -1,7 +1,7 @@
-# frozen_string_literal: true
-
-require 'janus/client'
-
-RSpec.describe Janus::Client do
-  it { expect(described_class::FOUND_ROWS).to eq 2 }
-end
+# 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 → janus-ar}/context_spec.rb

@@ -1,46 +1,46 @@
-# frozen_string_literal: true
-
-require 'janus/context'
-
-RSpec.describe Janus::Context do
-  describe '#initialize' do
-    it 'sets the primary flag and expiry' do
-      context = described_class.new(primary: true, expiry: 60)
-      expect(context.use_primary?).to be true
-      expect(context.last_used_connection).to eq(:primary)
-    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 '#potential_write' do
-    it 'calls stick_to_primary' do
-      context = described_class.new
-      expect(context).to receive(:stick_to_primary)
-      context.potential_write
-    end
-  end
-
-  describe '#release_all' do
-    it 'resets the primary flag and expiry' do
-      context = described_class.new(primary: true, expiry: 60)
-      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(:secondary)
-      expect(context.last_used_connection).to eq(:secondary)
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'janus-ar/context'
+
+RSpec.describe Janus::Context do
+  describe '#initialize' do
+    it 'sets the primary flag and expiry' do
+      context = described_class.new(primary: true, expiry: 60)
+      expect(context.use_primary?).to be true
+      expect(context.last_used_connection).to eq(:primary)
+    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 '#potential_write' do
+    it 'calls stick_to_primary' do
+      context = described_class.new
+      expect(context).to receive(:stick_to_primary)
+      context.potential_write
+    end
+  end
+
+  describe '#release_all' do
+    it 'resets the primary flag and expiry' do
+      context = described_class.new(primary: true, expiry: 60)
+      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(:secondary)
+      expect(context.last_used_connection).to eq(:secondary)
+    end
+  end
+end

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

@@ -1,31 +1,31 @@
-# 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
+# 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