fresh_connection 3.1.0 → 3.1.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d21ad20eb5180bd0bfd7c7e4ec352328e73f4be954215aa49ea7056442738490
-  data.tar.gz: 0f7acb28bd1c0fb738491036aa617e43ea0d994fef71d7151d0b977bbd9a28e8
+  metadata.gz: ba2f6c91d19fa7619609c82c464bdd7d11eb9fcc6322fd02a02e5e5b542d1463
+  data.tar.gz: 5861ad563a66ffd18f5050ff7f1852541cd8e5e8a2c2954f8015443a55f9e454
 SHA512:
-  metadata.gz: 70d6f0fbb318ac1687e2ac2fe915c213fd25403f2938aa43037c0aa9bc618a29eaeb0806638390778b364ab7b8dde3488bd5f380cd31fd3ce68a04005793ddd8
-  data.tar.gz: 820751f83fb8f143c700ad6073a72ee2d7427a9e907984c7afe7ed970d90bee40d913550c5f95ce3baff6e1fc3efd3388d6ff93d49039fda7ff206cc0fa84f1c
+  metadata.gz: d930efef155cbe217b93256cf5f78b54d30f19d41a23ef4daefda3d65acb3c5364479a5dd0cf3454aefc6c1d7105c91ec7b6a4b75419d3a0faf3e6e3f36e3e69
+  data.tar.gz: bed2bf124336ef4d4d1e979bd9bb2df5aa39ea263b2525f46e07edd79e6cc7cc75140db0d487e2da90cabf16fa257d26e780a77c2f3d89b703279a88d55eb740

data/.travis.yml

@@ -6,12 +6,13 @@ before_install:
   - gem update --system
   - gem --version
 rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
+  - 2.6.8
+  - 2.7.4
+  - 3.0.2
 gemfile:
   - gemfiles/rails52.gemfile
   - gemfiles/rails60.gemfile
+  - gemfiles/rails61.gemfile
 script:
   - "bin/test"
 matrix:

data/Appraisals

@@ -6,3 +6,7 @@ end
 appraise "rails60" do
   gem 'activerecord', '~> 6.0.0'
 end
+
+appraise "rails61" do
+  gem 'activerecord', '~> 6.1.0'
+end

data/fresh_connection.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '>= 5.2.0', '< 6.1'
+  spec.add_dependency 'activerecord', '>= 5.2.0', '< 7.0'
 
   spec.add_development_dependency 'mysql2', '>= 0.4.4'
   spec.add_development_dependency 'pg', '>= 0.18', '< 2.0'

data/gemfiles/rails61.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.0"
+
+gemspec path: "../"

data/lib/fresh_connection/connection_specification/rails_60.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module FreshConnection
+  class ConnectionSpecification
+    module Rails60
+      def spec
+        ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(config_with_spec_name).spec(@spec_name.to_sym)
+      end
+
+      private
+
+      def config_with_spec_name
+        if defined?(ActiveRecord::DatabaseConfigurations)
+          ActiveRecord::DatabaseConfigurations.new(@spec_name => build_config)
+        else
+          { @spec_name => build_config }
+        end
+      end
+
+      def config_from_url
+        ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(database_group_url).to_hash
+      end
+
+      def base_config
+        ActiveRecord::Base.connection_pool.spec.config
+      end
+    end
+  end
+end
+

data/lib/fresh_connection/connection_specification/rails_61.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module FreshConnection
+  class ConnectionSpecification
+    module Rails61
+      def spec
+        db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(@spec_name.to_sym, ActiveRecord::Base.connection_pool.db_config.name, build_config)
+        ActiveRecord::ConnectionAdapters::PoolConfig.new(ActiveRecord::Base, db_config)
+      end
+
+      private
+
+      def config_from_url
+        ActiveRecord::DatabaseConfigurations::ConnectionUrlResolver.new(database_group_url).to_hash
+      end
+
+      def base_config
+        ActiveRecord::Base.connection_pool.db_config.configuration_hash
+      end
+    end
+  end
+end

data/lib/fresh_connection/connection_specification.rb

@@ -9,16 +9,8 @@ module FreshConnection
       @modify_spec = modify_spec.with_indifferent_access if modify_spec
     end
 
-    def spec
-      resolver.spec(@spec_name.to_sym)
-    end
-
     private
 
-    def resolver
-      ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(build_config)
-    end
-
     def build_config
       config = base_config.with_indifferent_access
 
@@ -27,11 +19,7 @@ module FreshConnection
 
       config = config.merge(@modify_spec) if defined?(@modify_spec)
 
-      if defined?(ActiveRecord::DatabaseConfigurations)
-        ActiveRecord::DatabaseConfigurations.new(@spec_name => config)
-      else
-        { @spec_name => config }
-      end
+      config
     end
 
     def replica_config(config)
@@ -42,14 +30,6 @@ module FreshConnection
       end
     end
 
-    def config_from_url
-      ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(database_group_url).to_hash
-    end
-
-    def base_config
-      ActiveRecord::Base.connection_pool.spec.config
-    end
-
     def database_group_url
       ENV["DATABASE_#{@spec_name.upcase}_URL"]
     end

data/lib/fresh_connection/extend/ar_connection_handler.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module FreshConnection
+  module Extend
+    module ArConnectionHandler
+      private def resolve_pool_config(*args)
+        pool_config = super
+
+        case pool_config.db_config.adapter.to_s
+        when "mysql", "mysql2"
+          require 'fresh_connection/extend/adapters/m2_adapter'
+          __extend_adapter_by_fc(::ActiveRecord::ConnectionAdapters::Mysql2Adapter, M2Adapter)
+        when "postgresql"
+          require 'fresh_connection/extend/adapters/pg_adapter'
+          __extend_adapter_by_fc(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, PgAdapter)
+        else
+          raise NotImplementedError, "This adapter('#{pool_config.db_config.adapter}') is not supported. If you specified the mysql or postgres adapter, it's probably a bug in FreshConnection. Please teach me (https://github.com/tsukasaoishi/fresh_connection/issues/new)"
+        end
+
+        pool_config
+      end
+
+      def __extend_adapter_by_fc(klass, extend_adapter)
+        return if klass.include?(extend_adapter)
+        klass.prepend BaseAdapter
+        klass.prepend extend_adapter
+      end
+    end
+  end
+end

data/lib/fresh_connection/extend.rb

@@ -10,13 +10,31 @@ ActiveSupport.on_load(:active_record) do
   require 'fresh_connection/extend/ar_relation'
   require 'fresh_connection/extend/ar_relation_merger'
   require 'fresh_connection/extend/ar_statement_cache'
-  require 'fresh_connection/extend/ar_resolver'
 
   ActiveRecord::Base.extend FreshConnection::Extend::ArBase
   ActiveRecord::Relation.prepend FreshConnection::Extend::ArRelation
   ActiveRecord::Relation::Merger.prepend FreshConnection::Extend::ArRelationMerger
   ActiveRecord::StatementCache.prepend FreshConnection::Extend::ArStatementCache
-  ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.prepend(
-    FreshConnection::Extend::ArResolver
-  )
+
+  if ActiveRecord::VERSION::MAJOR == 6 && ActiveRecord::VERSION::MINOR == 1
+    require 'fresh_connection/extend/ar_connection_handler'
+    ActiveRecord::ConnectionAdapters::ConnectionHandler.prepend(
+      FreshConnection::Extend::ArConnectionHandler
+    )
+
+    require 'fresh_connection/connection_specification/rails_61'
+    FreshConnection::ConnectionSpecification.include(
+      FreshConnection::ConnectionSpecification::Rails61
+    )
+  else
+    require 'fresh_connection/extend/ar_resolver'
+    ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.prepend(
+      FreshConnection::Extend::ArResolver
+    )
+
+    require 'fresh_connection/connection_specification/rails_60'
+    FreshConnection::ConnectionSpecification.include(
+      FreshConnection::ConnectionSpecification::Rails60
+    )
+  end
 end

data/lib/fresh_connection/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module FreshConnection
-  VERSION = "3.1.0"
+  VERSION = "3.1.1.rc1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1.rc1
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -156,17 +156,21 @@ files:
 - fresh_connection.gemspec
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/fresh_connection.rb
 - lib/fresh_connection/abstract_connection_manager.rb
 - lib/fresh_connection/access_control.rb
 - lib/fresh_connection/connection_manager.rb
 - lib/fresh_connection/connection_specification.rb
+- lib/fresh_connection/connection_specification/rails_60.rb
+- lib/fresh_connection/connection_specification/rails_61.rb
 - lib/fresh_connection/executor_hook.rb
 - lib/fresh_connection/extend.rb
 - lib/fresh_connection/extend/adapters/base_adapter.rb
 - lib/fresh_connection/extend/adapters/m2_adapter.rb
 - lib/fresh_connection/extend/adapters/pg_adapter.rb
 - lib/fresh_connection/extend/ar_base.rb
+- lib/fresh_connection/extend/ar_connection_handler.rb
 - lib/fresh_connection/extend/ar_relation.rb
 - lib/fresh_connection/extend/ar_relation_merger.rb
 - lib/fresh_connection/extend/ar_resolver.rb
@@ -190,11 +194,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: FreshConnection supports connections with configured replica servers.