janus-ar 0.15.2 → 0.15.3

data/lib/janus/context.rb

@@ -1,80 +1,80 @@
-# frozen_string_literal: true
-
-module Janus
-  class Context
-    THREAD_KEY = :janus_ar_context
-
-    # Stores the staged data with an expiration time based on the current time,
-    # and clears any expired entries. Returns true if any changes were made to
-    # the current store
-    def initialize(primary: false, expiry: nil)
-      @primary = primary
-      @expiry = expiry
-      @last_used_connection = :primary
-    end
-
-    def stick_to_primary
-      @primary = true
-    end
-
-    def potential_write
-      stick_to_primary
-    end
-
-    def release_all
-      @primary = false
-      @expiry = nil
-      @last_used_connection = nil
-    end
-
-    def use_primary?
-      @primary
-    end
-
-    def used_connection(connection)
-      @last_used_connection = connection
-    end
-
-    attr_reader :last_used_connection
-
-    class << self
-      def stick_to_primary
-        current.stick_to_primary
-      end
-
-      def release_all
-        current.release_all
-      end
-
-      def used_connection(connection)
-        current.used_connection(connection)
-      end
-
-      def use_primary?
-        current.use_primary?
-      end
-
-      def last_used_connection
-        current.last_used_connection
-      end
-
-      protected
-
-      def current
-        fetch(THREAD_KEY) { new }
-      end
-
-      def fetch(key)
-        get(key) || set(key, yield)
-      end
-
-      def get(key)
-        Thread.current.thread_variable_get(key)
-      end
-
-      def set(key, value)
-        Thread.current.thread_variable_set(key, value)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Janus
+  class Context
+    THREAD_KEY = :janus_ar_context
+
+    # Stores the staged data with an expiration time based on the current time,
+    # and clears any expired entries. Returns true if any changes were made to
+    # the current store
+    def initialize(primary: false, expiry: nil)
+      @primary = primary
+      @expiry = expiry
+      @last_used_connection = :primary
+    end
+
+    def stick_to_primary
+      @primary = true
+    end
+
+    def potential_write
+      stick_to_primary
+    end
+
+    def release_all
+      @primary = false
+      @expiry = nil
+      @last_used_connection = nil
+    end
+
+    def use_primary?
+      @primary
+    end
+
+    def used_connection(connection)
+      @last_used_connection = connection
+    end
+
+    attr_reader :last_used_connection
+
+    class << self
+      def stick_to_primary
+        current.stick_to_primary
+      end
+
+      def release_all
+        current.release_all
+      end
+
+      def used_connection(connection)
+        current.used_connection(connection)
+      end
+
+      def use_primary?
+        current.use_primary?
+      end
+
+      def last_used_connection
+        current.last_used_connection
+      end
+
+      protected
+
+      def current
+        fetch(THREAD_KEY) { new }
+      end
+
+      def fetch(key)
+        get(key) || set(key, yield)
+      end
+
+      def get(key)
+        Thread.current.thread_variable_get(key)
+      end
+
+      def set(key, value)
+        Thread.current.thread_variable_set(key, value)
+      end
+    end
+  end
+end

data/lib/janus/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/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/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/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/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 = 0
+      MINOR = 15
+      PATCH = 3
+      PRE = nil
+
+      def self.to_s
+        [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+      end
+    end
+  end
+  ::Janus::VERSION
+end

data/lib/janus.rb

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

data/spec/lib/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