Avoid early connection

lib/apartment/adapters/abstract_adapter.rb

@@ -35,6 +35,12 @@ def create(tenant)
         end
       end
 
+      #   Initialize Apartment config options such as excluded_models
+      #
+      def init
+        process_excluded_models
+      end
+
       #   Note alias_method here doesn't work with inheritence apparently ??
       #
       def current

lib/apartment/adapters/postgresql_adapter.rb

@@ -39,6 +39,11 @@ def reset
         Apartment.connection.schema_search_path = full_search_path
       end
 
+      def init
+        super
+        Apartment.connection.schema_search_path = full_search_path
+      end
+
       def current
         @current || default_tenant
       end

lib/apartment/railtie.rb

@@ -24,26 +24,23 @@ class Railtie < Rails::Railtie
       ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
     end
 
-    #   Hook into ActionDispatch::Reloader to ensure Apartment is properly initialized
-    #   Note that this doens't entirely work as expected in Development, because this is called before classes are reloaded
-    #   See the middleware/console declarations below to help with this. Hope to fix that soon.
-    #
+    # Make sure Apartment is reconfigured when the code is reloaded
     config.to_prepare do
-      next if ARGV.any? { |arg| arg =~ /\Aassets:(?:precompile|clean)\z/ }
-      next if ARGV.any? { |arg| arg == 'webpacker:compile' }
+      Apartment::Tenant.reinitialize
+    end
 
-      begin
-        Apartment.connection_class.connection_pool.with_connection do
-          Apartment::Tenant.init
-        end
-      rescue ::ActiveRecord::NoDatabaseError, PG::ConnectionBad
-        # Since `db:create` and other tasks invoke this block from Rails 5.2.0,
-        # we need to swallow the error to execute `db:create` properly.
-        Rails.logger.warn do
-          'Failed to initialize Apartment because a database connection could not be established.'
+    #
+    # Ensure that Apartment::Tenant.init is called when
+    # a new connection is requested.
+    #
+    module ApartmentInitializer
+      def connection
+        super.tap do
+          Apartment::Tenant.init_once
         end
       end
     end
+    ActiveRecord::Base.singleton_class.prepend ApartmentInitializer
 
     #
     #   Ensure rake tasks are loaded

lib/apartment/tenant.rb

@@ -10,15 +10,23 @@ module Tenant
     extend Forwardable
 
     def_delegators :adapter, :create, :drop, :switch, :switch!, :current, :each,
-                   :reset, :set_callback, :seed, :current_tenant,
+                   :reset, :init, :set_callback, :seed, :current_tenant,
                    :default_tenant, :environmentify
 
     attr_writer :config
 
-    #   Initialize Apartment config options such as excluded_models
-    #
-    def init
-      adapter.process_excluded_models
+    def init_once
+      return if @already_initialized
+
+      # To avoid infinite loops in work init is doing,
+      # we need to set @already_initialized to true
+      # before init is called
+      @already_initialized = true
+      init
+    end
+
+    def reinitialize
+      @already_initialized = false
     end
 
     #   Fetch the proper multi-tenant adapter based on Rails config
@@ -53,6 +61,7 @@ def adapter
     #
     def reload!(config = nil)
       Thread.current[:apartment_adapter] = nil
+      reinitialize
       @config = config
     end
 

spec/examples/generic_adapter_examples.rb

@@ -24,7 +24,7 @@
                                              .instance_variable_get(:@queue)
                                              .size
 
-        expect(num_available_connections).to eq(1)
+        expect(num_available_connections).to eq(0)
       end
     end
   end