rails_multisite 2.1.2 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3fe0041751b722c29731d43407a107d44873642fa1166d8c28f15a776c35ac9
-  data.tar.gz: ed8fedef6ee6ae4e11725f88d0375f17abe62a94a04bb99417b69daad3a2887c
+  metadata.gz: 6cf1529e713938afd1edfb04e2e52f8199f86901f3278821d8514c9bc5855b27
+  data.tar.gz: b5d16cf92694fe94445a141ebc0e8bf2817b665d9789f3ba0ac79ef7af369ed4
 SHA512:
-  metadata.gz: b17dd4868f46d9cddf9a7ec2156d0d7aacc1e359673440e15b723b26ec67750fac5f3da2028e2d1d31f9234979dbe3ef3bd03511d1ea19ecb7c9ec40f10c5fca
-  data.tar.gz: e3de9e44f8f4a04b0be895472ad360a32877644f1c7ce2939a674556965070908c5b0dd65d70c7b2ea3962490d4fcccfbd2781798d928d3387c84395426ec2f8
+  metadata.gz: 7ecfa664b8367ebd065ecfee14ab1f52ab613aef1c7d404c2944cbedcc93c45899ef53544ca6915260aca0cd5ed6823e6b1bf032569f69fce3001bdaccda12bf
+  data.tar.gz: d3bb77f2e4906ae9736fba551c40972be4a9bd15777447cb5eaaf45d8dc0b0ecf9fa23d1c2baf09dd4b20304776b2b8f7c929aa2173846d64219c73885be6ccf

data/lib/rails_multisite/connection_management.rb

@@ -11,6 +11,10 @@ module RailsMultisite
     end
 
     def self.clear_settings!
+      @instance&.db_spec_cache&.each do |key, spec|
+        @instance.connection_handlers.delete(self.handler_key(spec))
+      end
+
       @instance = nil
     end
 
@@ -121,14 +125,32 @@ module RailsMultisite
       end
     end
 
-    attr_reader :config_filename
+    def self.handler_key(spec)
+      @handler_key_suffix ||= begin
+        if ActiveRecord::Base.respond_to?(:writing_role)
+          "_#{ActiveRecord::Base.writing_role}"
+        else
+          ""
+        end
+      end
+
+      :"#{spec.name}#{@handler_key_suffix}"
+    end
+
+    attr_reader :config_filename, :db_spec_cache, :connection_handlers
 
     def initialize(config_filename)
       @config_filename = config_filename
 
-      @connection_handlers = {}
-      @db_spec_cache = {}
+      @connection_handlers = begin
+        if ActiveRecord::Base.respond_to?(:connection_handlers)
+          ActiveRecord::Base.connection_handlers
+        else
+          {}
+        end
+      end
 
+      @db_spec_cache = {}
       @default_spec = SPEC_KLASS::Resolver.new(ActiveRecord::Base.configurations).spec(Rails.env.to_sym)
       @default_connection_handler = ActiveRecord::Base.connection_handler
       @established_default = false
@@ -188,8 +210,7 @@ module RailsMultisite
       @db_spec_cache = new_db_spec_cache
 
       # Clean up connection handler cache.
-      # (@connection_handlers is a hash of spec => handler)
-      removed_specs.each { |s| @connection_handlers.delete(s) }
+      removed_specs.each { |s| @connection_handlers.delete(handler_key(s)) }
     end
 
     def reload
@@ -217,11 +238,11 @@ module RailsMultisite
       spec ||= @default_spec
       handler = nil
       if spec != @default_spec
-        handler = @connection_handlers[spec]
+        handler = @connection_handlers[handler_key(spec)]
         unless handler
           handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
           handler_establish_connection(handler, spec)
-          @connection_handlers[spec] = handler
+          @connection_handlers[handler_key(spec)] = handler
         end
       else
         handler = @default_connection_handler
@@ -362,5 +383,9 @@ module RailsMultisite
       handler.establish_connection(spec.config)
     end
 
+    def handler_key(spec)
+      self.class.handler_key(spec)
+    end
+
   end
 end

data/lib/rails_multisite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 #
 module RailsMultisite
-  VERSION = "2.1.2"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.2
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Multi tenancy support for Rails