From a5401ad57be540b3dd9a6a0bae2c6b3830441a41 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@meritec.co.uk>
Date: Mon, 14 Nov 2016 12:20:06 +0000
Subject: [PATCH 01/26] Don't retain connection used during gem initialisation

When the gem is initialised and a schema adapter is being used, the
adapter will initialise the schema_search_path which involves
touching the database, and thus checking out a connection for the
current thread. For threaded web servers, it is not expected that
the main thread has a database connection, so you typically set the
connection pool size equal to the number of web server threads.

This patch checks the connection back in to the pool after init so
that a web server thread can pick it up and use it.
---
 lib/apartment/railtie.rb                  |  6 +++++-
 spec/examples/generic_adapter_examples.rb | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/apartment/railtie.rb b/lib/apartment/railtie.rb
index dffa451b..2d25d5ec 100644
--- a/lib/apartment/railtie.rb
+++ b/lib/apartment/railtie.rb
@@ -28,7 +28,11 @@ class Railtie < Rails::Railtie
     #   See the middleware/console declarations below to help with this. Hope to fix that soon.
     #
     config.to_prepare do
-      Apartment::Tenant.init unless ARGV.any? { |arg| arg =~ /\Aassets:(?:precompile|clean)\z/ }
+      unless ARGV.any? { |arg| arg =~ /\Aassets:(?:precompile|clean)\z/ }
+        Apartment.connection_class.connection_pool.with_connection do
+          Apartment::Tenant.init
+        end
+      end
     end
 
     #
diff --git a/spec/examples/generic_adapter_examples.rb b/spec/examples/generic_adapter_examples.rb
index f90cb28f..078036f7 100644
--- a/spec/examples/generic_adapter_examples.rb
+++ b/spec/examples/generic_adapter_examples.rb
@@ -8,6 +8,25 @@
     Apartment.append_environment = false
   }
 
+  describe "#init" do
+    it "should not retain a connection after railtie" do
+      # this test should work on rails >= 4, the connection pool code is
+      # completely different for 3.2 so we'd have to have a messy conditional..
+      unless Rails::VERSION::MAJOR < 4
+        ActiveRecord::Base.connection_pool.disconnect!
+
+        Apartment::Railtie.config.to_prepare_blocks.map(&:call)
+
+        num_available_connections = Apartment.connection_class.connection_pool
+          .instance_variable_get(:@available)
+          .instance_variable_get(:@queue)
+          .size
+
+        expect(num_available_connections).to eq(1)
+      end
+    end
+  end
+
   #
   #   Creates happen already in our before_filter
   #

From 959432fffebca4a822dec73a01a7d3ce6c8b658d Mon Sep 17 00:00:00 2001
From: kakipo <kakipo@gmail.com>
Date: Sat, 10 Dec 2016 12:00:03 +0900
Subject: [PATCH 02/26] Accept DB config

---
 lib/apartment/adapters/abstract_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index a1e534b1..0ae35924 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -175,7 +175,7 @@ def create_tenant(tenant)
       end
 
       def create_tenant_command(conn, tenant)
-        conn.create_database(environmentify(tenant))
+        conn.create_database(environmentify(tenant), @config)
       end
 
       #   Connect to new tenant

From 77f8e6512efd9dd03e18aa24e350f0c7507455ff Mon Sep 17 00:00:00 2001
From: humancopy <info@humancopy.net>
Date: Thu, 2 Mar 2017 18:24:36 +0100
Subject: [PATCH 03/26] Use public_suffix for smarter subdomain parsing (#309)

* Use public_suffix for smarter subdomain parsing

* Check validity of domain and add tests for localhost and IP

* Remove unnecessary TLD length test
---
 README.md                             |  9 -------
 apartment.gemspec                     |  1 +
 lib/apartment.rb                      |  4 ---
 lib/apartment/elevators/subdomain.rb  | 19 +++++++++++---
 lib/apartment/railtie.rb              |  1 -
 spec/unit/config_spec.rb              |  7 ------
 spec/unit/elevators/subdomain_spec.rb | 36 +++++++++++++++++++++------
 7 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index d9fd5098..5691bb56 100644
--- a/README.md
+++ b/README.md
@@ -132,15 +132,6 @@ module MyApplication
 end
 ```
 
-By default, the subdomain elevator assumes that the parent domain consists of two segments, e.g. 'example.com'. If this isn't the case, you can adjust the `tld_length` (top level domain length) configuration variable, which defaults to 1. For example, if you are using 'localhost' in development:
-```ruby
-# config/initializers/apartment.rb
-Apartment.configure do |config|
- ...
- config.tld_length = 0 if Rails.env == 'development'
-end
-```
-
 If you want to exclude a domain, for example if you don't want your application to treat www like a subdomain, in an initializer in your application, you can set the following:
 
 ```ruby
diff --git a/apartment.gemspec b/apartment.gemspec
index e58eef44..004cea2d 100644
--- a/apartment.gemspec
+++ b/apartment.gemspec
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   # must be >= 3.1.2 due to bug in prepared_statements
   s.add_dependency 'activerecord',    '>= 3.1.2', '< 6.0'
   s.add_dependency 'rack',            '>= 1.3.6'
+  s.add_dependency 'public_suffix',   '~> 2.0.5'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rake',         '~> 0.9'
diff --git a/lib/apartment.rb b/lib/apartment.rb
index f86184b3..027e9c0a 100644
--- a/lib/apartment.rb
+++ b/lib/apartment.rb
@@ -75,10 +75,6 @@ def seed_data_file
       @seed_data_file = "#{Rails.root}/db/seeds.rb"
     end
 
-    def tld_length
-      @tld_length || 1
-    end
-
     # Reset all the config for Apartment
     def reset
       (ACCESSOR_METHODS + WRITER_METHODS).each{|method| remove_instance_variable(:"@#{method}") if instance_variable_defined?(:"@#{method}") }
diff --git a/lib/apartment/elevators/subdomain.rb b/lib/apartment/elevators/subdomain.rb
index b68aa55e..97f82ab8 100644
--- a/lib/apartment/elevators/subdomain.rb
+++ b/lib/apartment/elevators/subdomain.rb
@@ -1,4 +1,5 @@
 require 'apartment/elevators/generic'
+require 'public_suffix'
 
 module Apartment
   module Elevators
@@ -38,13 +39,23 @@ def subdomain(host)
       end
 
       def subdomains(host)
-        return [] unless named_host?(host)
+        host_valid?(host) ? parse_host(host) : []
+      end
+
+      def host_valid?(host)
+        !ip_host?(host) && domain_valid?(host)
+      end
+
+      def ip_host?(host)
+        !/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/.match(host).nil?
+      end
 
-        host.split('.')[0..-(Apartment.tld_length + 2)]
+      def domain_valid?(host)
+        PublicSuffix.valid?(host, ignore_private: true)
       end
 
-      def named_host?(host)
-        !(host.nil? || /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host))
+      def parse_host(host)
+        (PublicSuffix.parse(host).trd || '').split('.')
       end
     end
   end
diff --git a/lib/apartment/railtie.rb b/lib/apartment/railtie.rb
index 2d25d5ec..f011cbfd 100644
--- a/lib/apartment/railtie.rb
+++ b/lib/apartment/railtie.rb
@@ -17,7 +17,6 @@ class Railtie < Rails::Railtie
         config.seed_after_create = false
         config.prepend_environment = false
         config.append_environment = false
-        config.tld_length = 1
       end
 
       ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb
index 2ccb9a60..44901952 100644
--- a/spec/unit/config_spec.rb
+++ b/spec/unit/config_spec.rb
@@ -50,13 +50,6 @@ def tenant_names_from_array(names)
       expect(Apartment.seed_after_create).to be true
     end
 
-    it "should set tld_length" do
-      Apartment.configure do |config|
-        config.tld_length = 2
-      end
-      expect(Apartment.tld_length).to eq(2)
-    end
-
     context "databases" do
       let(:users_conf_hash) { { port: 5444 } }
 
diff --git a/spec/unit/elevators/subdomain_spec.rb b/spec/unit/elevators/subdomain_spec.rb
index b8655a2b..cdc9a3db 100644
--- a/spec/unit/elevators/subdomain_spec.rb
+++ b/spec/unit/elevators/subdomain_spec.rb
@@ -6,7 +6,7 @@
   subject(:elevator){ described_class.new(Proc.new{}) }
 
   describe "#parse_tenant_name" do
-    context "assuming tld_length of 1" do
+    context "assuming one tld" do
       it "should parse subdomain" do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.com')
         expect(elevator.parse_tenant_name(request)).to eq('foo')
@@ -18,13 +18,7 @@
       end
     end
 
-    context "assuming tld_length of 2" do
-      before do
-        Apartment.configure do |config|
-          config.tld_length = 2
-        end
-      end
-
+    context "assuming two tlds" do
       it "should parse subdomain in the third level domain" do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.co.uk')
         expect(elevator.parse_tenant_name(request)).to eq("foo")
@@ -35,6 +29,32 @@
         expect(elevator.parse_tenant_name(request)).to be_nil
       end
     end
+
+    context "assuming two subdomains" do
+      it "should parse two subdomains in the two level domain" do
+        request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.xyz.bar.com')
+        elevator.parse_tenant_name(request).should == "foo"
+      end
+
+      it "should parse two subdomains in the third level domain" do
+        request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.xyz.bar.co.uk')
+        elevator.parse_tenant_name(request).should == "foo"
+      end
+    end
+
+    context "assuming localhost" do
+      it "should return nil for localhost" do
+        request = ActionDispatch::Request.new('HTTP_HOST' => 'localhost')
+        elevator.parse_tenant_name(request).should be_nil
+      end
+    end
+
+    context "assuming ip address" do
+      it "should return nil for an ip address" do
+        request = ActionDispatch::Request.new('HTTP_HOST' => '127.0.0.1')
+        elevator.parse_tenant_name(request).should be_nil
+      end
+    end
   end
 
   describe "#call" do

From 3061e994edeec6e3cc56338235d689eb586fa224 Mon Sep 17 00:00:00 2001
From: Cairo Noleto <caironoleto@gmail.com>
Date: Sun, 12 Mar 2017 16:44:36 -0300
Subject: [PATCH 04/26] Removing deprecated methods.

---
 apartment.gemspec                             | 16 -------
 lib/apartment.rb                              | 21 ---------
 lib/apartment/adapters/abstract_adapter.rb    | 43 +++----------------
 lib/apartment/elevators/generic.rb            | 21 +--------
 lib/apartment/tenant.rb                       | 10 -----
 spec/apartment_spec.rb                        |  6 +--
 spec/dummy/config/application.rb              |  2 +-
 .../config/initializers/apartment.rb          |  2 +-
 spec/examples/generic_adapter_examples.rb     | 17 --------
 9 files changed, 10 insertions(+), 128 deletions(-)

diff --git a/apartment.gemspec b/apartment.gemspec
index 004cea2d..dbb1a27e 100644
--- a/apartment.gemspec
+++ b/apartment.gemspec
@@ -18,22 +18,6 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/influitive/apartment}
   s.licenses = ["MIT"]
 
-  s.post_install_message = <<-MSG
-  ********************************
-
-  Apartment Deprecation Warning
-
-  `Apartment::Tenant.process` has been deprecated in favour of `Apartment::Tenant.switch`.
-  You must now always pass a block to `switch`.
-
-  To get the previous `switch` behaviour where you can switch to a tenant
-  without a block, use `Apartment::Tenant.switch!`.
-  This is to indicate that your call actually has a side affect of changing
-  the scope of your queries to that tenant.
-
-  ********************************
-  MSG
-
   # must be >= 3.1.2 due to bug in prepared_statements
   s.add_dependency 'activerecord',    '>= 3.1.2', '< 6.0'
   s.add_dependency 'rack',            '>= 1.3.6'
diff --git a/lib/apartment.rb b/lib/apartment.rb
index 027e9c0a..38ea5188 100644
--- a/lib/apartment.rb
+++ b/lib/apartment.rb
@@ -3,7 +3,6 @@
 require 'forwardable'
 require 'active_record'
 require 'apartment/tenant'
-require 'apartment/deprecation'
 
 module Apartment
 
@@ -80,26 +79,6 @@ def reset
       (ACCESSOR_METHODS + WRITER_METHODS).each{|method| remove_instance_variable(:"@#{method}") if instance_variable_defined?(:"@#{method}") }
     end
 
-    def database_names
-      Apartment::Deprecation.warn "[Deprecation Warning] `database_names` is now deprecated, please use `tenant_names`"
-      tenant_names
-    end
-
-    def database_names=(names)
-      Apartment::Deprecation.warn "[Deprecation Warning] `database_names=` is now deprecated, please use `tenant_names=`"
-      self.tenant_names=(names)
-    end
-
-    def use_postgres_schemas
-      Apartment::Deprecation.warn "[Deprecation Warning] `use_postgresql_schemas` is now deprecated, please use `use_schemas`"
-      use_schemas
-    end
-
-    def use_postgres_schemas=(to_use_or_not_to_use)
-      Apartment::Deprecation.warn "[Deprecation Warning] `use_postgresql_schemas=` is now deprecated, please use `use_schemas=`"
-      self.use_schemas = to_use_or_not_to_use
-    end
-
     def extract_tenant_config
       return {} unless @tenant_names
       values = @tenant_names.respond_to?(:call) ? @tenant_names.call : @tenant_names
diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 0ae35924..760603d0 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -1,5 +1,3 @@
-require 'apartment/deprecation'
-
 module Apartment
   module Adapters
     class AbstractAdapter
@@ -34,24 +32,6 @@ def create(tenant)
         end
       end
 
-      #   Get the current tenant name
-      #
-      #   @return {String} current tenant name
-      #
-      def current_database
-        Apartment::Deprecation.warn "[Deprecation Warning] `current_database` is now deprecated, please use `current`"
-        current
-      end
-
-      #   Get the current tenant name
-      #
-      #   @return {String} current tenant name
-      #
-      def current_tenant
-        Apartment::Deprecation.warn "[Deprecation Warning] `current_tenant` is now deprecated, please use `current`"
-        current
-      end
-
       #   Note alias_method here doesn't work with inheritence apparently ??
       #
       def current
@@ -99,25 +79,14 @@ def switch!(tenant = nil)
       #   @param {String?} tenant to connect to
       #
       def switch(tenant = nil)
-        if block_given?
-          begin
-            previous_tenant = current
-            switch!(tenant)
-            yield
-
-          ensure
-            switch!(previous_tenant) rescue reset
-          end
-        else
-          Apartment::Deprecation.warn("[Deprecation Warning] `switch` now requires a block reset to the default tenant after the block. Please use `switch!` instead if you don't want this")
+        begin
+          previous_tenant = current
           switch!(tenant)
-        end
-      end
+          yield
 
-      #   [Deprecated]
-      def process(tenant = nil, &block)
-        Apartment::Deprecation.warn("[Deprecation Warning] `process` is now deprecated. Please use `switch`")
-        switch(tenant, &block)
+        ensure
+          switch!(previous_tenant) rescue reset
+        end
       end
 
       #   Iterate over all tenants, switch to tenant and yield tenant name
diff --git a/lib/apartment/elevators/generic.rb b/lib/apartment/elevators/generic.rb
index 30367cf3..21349378 100644
--- a/lib/apartment/elevators/generic.rb
+++ b/lib/apartment/elevators/generic.rb
@@ -1,6 +1,5 @@
 require 'rack/request'
 require 'apartment/tenant'
-require 'apartment/deprecation'
 
 module Apartment
   module Elevators
@@ -10,7 +9,7 @@ class Generic
 
       def initialize(app, processor = nil)
         @app = app
-        @processor = processor || parse_method
+        @processor = processor || method(:parse_tenant_name)
       end
 
       def call(env)
@@ -25,27 +24,9 @@ def call(env)
         end
       end
 
-      def parse_database_name(request)
-        deprecation_warning
-        parse_tenant_name(request)
-      end
-
       def parse_tenant_name(request)
         raise "Override"
       end
-
-      def parse_method
-        if self.class.instance_methods(false).include? :parse_database_name
-          deprecation_warning
-          method(:parse_database_name)
-        else
-          method(:parse_tenant_name)
-        end
-      end
-
-      def deprecation_warning
-        Apartment::Deprecation.warn "[DEPRECATED::Apartment] Use #parse_tenant_name instead of #parse_database_name -> #{self.class.name}"
-      end
     end
   end
 end
diff --git a/lib/apartment/tenant.rb b/lib/apartment/tenant.rb
index b236b9d9..7a4e33ca 100644
--- a/lib/apartment/tenant.rb
+++ b/lib/apartment/tenant.rb
@@ -1,5 +1,4 @@
 require 'forwardable'
-require 'apartment/deprecation'
 
 module Apartment
   #   The main entry point to Apartment functions
@@ -64,13 +63,4 @@ def config
       @config ||= Apartment.connection_config
     end
   end
-
-  def self.const_missing(const_name)
-    if const_name == :Database
-      Apartment::Deprecation.warn "`Apartment::Database` has been deprecated. Use `Apartment::Tenant` instead."
-      Tenant
-    else
-      super
-    end
-  end
 end
diff --git a/spec/apartment_spec.rb b/spec/apartment_spec.rb
index c319d300..b00e0b2d 100644
--- a/spec/apartment_spec.rb
+++ b/spec/apartment_spec.rb
@@ -8,8 +8,4 @@
   it "should be a valid app" do
     expect(::Rails.application).to be_a(Dummy::Application)
   end
-
-  it "should deprecate Apartment::Database in favor of Apartment::Tenant" do
-    expect(Apartment::Database).to eq(Apartment::Tenant)
-  end
-end
\ No newline at end of file
+end
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
index b61781c8..e8f51ed9 100644
--- a/spec/dummy/config/application.rb
+++ b/spec/dummy/config/application.rb
@@ -17,7 +17,7 @@ class Application < Rails::Application
     require 'apartment/elevators/subdomain'
     require 'apartment/elevators/domain'
 
-    config.middleware.use 'Apartment::Elevators::Subdomain'
+    config.middleware.use Apartment::Elevators::Subdomain
 
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(#{config.root}/lib)
diff --git a/spec/dummy_engine/config/initializers/apartment.rb b/spec/dummy_engine/config/initializers/apartment.rb
index addb1cf7..a1367900 100644
--- a/spec/dummy_engine/config/initializers/apartment.rb
+++ b/spec/dummy_engine/config/initializers/apartment.rb
@@ -48,4 +48,4 @@
 
 # Rails.application.config.middleware.use 'Apartment::Elevators::Domain'
 
-Rails.application.config.middleware.use 'Apartment::Elevators::Subdomain'
+Rails.application.config.middleware.use Apartment::Elevators::Subdomain
diff --git a/spec/examples/generic_adapter_examples.rb b/spec/examples/generic_adapter_examples.rb
index 078036f7..d77166ba 100644
--- a/spec/examples/generic_adapter_examples.rb
+++ b/spec/examples/generic_adapter_examples.rb
@@ -102,23 +102,6 @@
         subject.switch(db1){ subject.drop(db2) }
       }.to_not raise_error
     end
-
-    it "warns if no block is given, but calls switch!" do
-      expect(Apartment::Deprecation).to receive(:warn)
-
-      subject.switch(db1)
-      expect(subject.current).to eq(db1)
-    end
-  end
-
-  describe "#process" do
-    it "is deprecated" do
-      expect(Apartment::Deprecation).to receive(:warn)
-
-      subject.process(db1) do
-        expect(subject.current).to eq(db1)
-      end
-    end
   end
 
   describe "#reset" do

From 194b28923e9b23f5af31d4fab401e5dc9a878be4 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@meritec.co.uk>
Date: Mon, 13 Mar 2017 09:57:06 +0000
Subject: [PATCH 05/26] Add Rails ~5.0.0 to travis and remove ~3.2.0

---
 .travis.yml                |  8 +++++---
 gemfiles/rails_3_2.gemfile | 13 -------------
 2 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 gemfiles/rails_3_2.gemfile

diff --git a/.travis.yml b/.travis.yml
index f694ec4a..1f006220 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,10 @@ rvm:
   - 2.3.1
   - jruby-9.0.5.0
 gemfile:
-  - gemfiles/rails_3_2.gemfile
   - gemfiles/rails_4_0.gemfile
   - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_2.gemfile
+  - gemfiles/rails_5_0.gemfile
 bundler_args: --without local
 before_install:
   - gem install bundler -v '> 1.5.0'
@@ -18,6 +18,8 @@ env:
   RUBY_FREE_MIN: 200000
 matrix:
   exclude:
-    - rvm: 2.2.0
-      gemfile: gemfiles/rails_3_2.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.1.9
+      gemfile: gemfiles/rails_5_0.gemfile
   fast_finish: true
diff --git a/gemfiles/rails_3_2.gemfile b/gemfiles/rails_3_2.gemfile
deleted file mode 100644
index d18ea9dd..00000000
--- a/gemfiles/rails_3_2.gemfile
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 3.2.0"
-gem "test-unit", "~> 3.0"
-
-group :local do
-  gem "pry"
-  gem "guard-rspec", "~> 4.2"
-end
-
-gemspec :path => "../"

From 6431e58c31207bfa23b11f38711afc84d7a0b8f7 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@meritec.co.uk>
Date: Mon, 26 Jun 2017 17:20:43 +0100
Subject: [PATCH 06/26] Rewrite adpaters to support flexible switching

This is a complete rewrite of the adapters & of the test suite.

- Test suite rewritten in minitest
- Adapters handle separate physical tenant hosts seamlessly
- Supports Rails 5.1 and above only
- Dropped all adapters other than PG and MySQL (didn't get time, will
  accept PRs)
- Added 'tenant resolvers' for generating full database
  configurations from tenant names
- Added `tenant_decorator` option for using a proc to decorate your
  tenant database/schema names with Rails.env or anything else
- All excluded models share a connection pool
- All adapters & switching strategies are threadsafe
---
 .gitignore                                    |   3 +-
 .rspec                                        |   4 -
 .ruby-gemset                                  |   1 -
 .ruby-version                                 |   1 -
 .travis.yml                                   |  12 +-
 Gemfile                                       |   2 +-
 Rakefile                                      |  51 ++--
 apartment.gemspec                             |   5 +-
 gemfiles/rails_4_0.gemfile                    |  12 -
 gemfiles/rails_4_2.gemfile                    |  12 -
 gemfiles/rails_5_0.gemfile                    |  12 -
 .../{rails_4_1.gemfile => rails_5_1.gemfile}  |   2 +-
 lib/apartment.rb                              |  55 ++--
 lib/apartment/adapters/abstract_adapter.rb    | 276 ++++++------------
 .../adapters/abstract_jdbc_adapter.rb         |  18 --
 lib/apartment/adapters/jdbc_mysql_adapter.rb  |  19 --
 .../adapters/jdbc_postgresql_adapter.rb       |  56 ----
 lib/apartment/adapters/mysql2_adapter.rb      |  74 ++---
 lib/apartment/adapters/postgis_adapter.rb     |  12 -
 lib/apartment/adapters/postgresql_adapter.rb  | 223 ++++----------
 lib/apartment/adapters/sqlite3_adapter.rb     |  56 ----
 lib/apartment/elevators/first_subdomain.rb    |  17 --
 lib/apartment/railtie.rb                      |  13 +-
 lib/apartment/reloader.rb                     |  21 --
 lib/apartment/resolvers/abstract.rb           |  15 +
 lib/apartment/resolvers/database.rb           |  11 +
 lib/apartment/resolvers/schema.rb             |  14 +
 lib/apartment/tenant.rb                       |  51 ++--
 lib/apartment/version.rb                      |   2 +-
 lib/tasks/apartment.rake                      |   7 +-
 notes.md                                      |  28 ++
 spec/adapters/jdbc_mysql_adapter_spec.rb      |  19 --
 spec/adapters/jdbc_postgresql_adapter_spec.rb |  41 ---
 spec/adapters/mysql2_adapter_spec.rb          |  51 ----
 spec/adapters/postgresql_adapter_spec.rb      |  61 ----
 spec/adapters/sqlite3_adapter_spec.rb         |  83 ------
 spec/apartment_spec.rb                        |  11 -
 .../20110613152810_create_dummy_models.rb     |  38 ---
 .../20111202022214_create_table_books.rb      |  13 -
 spec/dummy/db/schema.rb                       |  49 ----
 spec/dummy_engine/.gitignore                  |   8 -
 spec/dummy_engine/Gemfile                     |  15 -
 spec/dummy_engine/Rakefile                    |  34 ---
 spec/dummy_engine/bin/rails                   |  12 -
 .../config/initializers/apartment.rb          |  51 ----
 spec/dummy_engine/dummy_engine.gemspec        |  24 --
 spec/dummy_engine/lib/dummy_engine.rb         |   4 -
 spec/dummy_engine/lib/dummy_engine/engine.rb  |   4 -
 spec/dummy_engine/lib/dummy_engine/version.rb |   3 -
 spec/dummy_engine/test/dummy/Rakefile         |   6 -
 spec/dummy_engine/test/dummy/config.ru        |   4 -
 .../test/dummy/config/application.rb          |  22 --
 spec/dummy_engine/test/dummy/config/boot.rb   |   5 -
 .../test/dummy/config/database.yml            |  25 --
 .../test/dummy/config/environment.rb          |   5 -
 .../dummy/config/environments/development.rb  |  37 ---
 .../dummy/config/environments/production.rb   |  78 -----
 .../test/dummy/config/environments/test.rb    |  39 ---
 .../test/dummy/config/initializers/assets.rb  |   8 -
 .../initializers/backtrace_silencers.rb       |   7 -
 .../config/initializers/cookies_serializer.rb |   3 -
 .../initializers/filter_parameter_logging.rb  |   4 -
 .../dummy/config/initializers/inflections.rb  |  16 -
 .../dummy/config/initializers/mime_types.rb   |   4 -
 .../config/initializers/session_store.rb      |   3 -
 .../config/initializers/wrap_parameters.rb    |  14 -
 .../test/dummy/config/locales/en.yml          |  23 --
 spec/dummy_engine/test/dummy/config/routes.rb |  56 ----
 .../test/dummy/config/secrets.yml             |  22 --
 spec/examples/connection_adapter_examples.rb  |  34 ---
 ...ic_adapter_custom_configuration_example.rb |  95 ------
 spec/examples/generic_adapter_examples.rb     | 147 ----------
 spec/examples/schema_adapter_examples.rb      | 226 --------------
 .../apartment_rake_integration_spec.rb        |  74 -----
 spec/integration/query_caching_spec.rb        |  41 ---
 spec/integration/use_within_an_engine_spec.rb |  28 --
 spec/schemas/v1.rb                            |  16 -
 spec/schemas/v2.rb                            |  43 ---
 spec/schemas/v3.rb                            |  49 ----
 spec/spec_helper.rb                           |  49 ----
 spec/support/apartment_helpers.rb             |  43 ---
 spec/support/capybara_sessions.rb             |  15 -
 spec/support/config.rb                        |  10 -
 spec/support/contexts.rb                      |  52 ----
 spec/support/requirements.rb                  |  35 ---
 spec/support/setup.rb                         |  46 ---
 spec/tasks/apartment_rake_spec.rb             | 120 --------
 spec/tenant_spec.rb                           | 183 ------------
 spec/unit/config_spec.rb                      | 112 -------
 spec/unit/elevators/domain_spec.rb            |  32 --
 spec/unit/elevators/first_subdomain_spec.rb   |  24 --
 spec/unit/elevators/generic_spec.rb           |  54 ----
 spec/unit/elevators/host_hash_spec.rb         |  32 --
 spec/unit/elevators/subdomain_spec.rb         |  76 -----
 spec/unit/migrator_spec.rb                    |  37 ---
 spec/unit/reloader_spec.rb                    |  24 --
 test/apartment_test.rb                        |  68 +++++
 test/config_test.rb                           |  48 +++
 .../database.yml.sample => test/databases.yml |  10 +-
 test/databases.yml.sample                     |  37 +++
 test/decorator_test.rb                        |  21 ++
 test/domain_elevator_test.rb                  |  38 +++
 {spec => test}/dummy/Rakefile                 |   0
 .../app/controllers/application_controller.rb |   0
 .../dummy/app/helpers/application_helper.rb   |   0
 {spec => test}/dummy/app/models/company.rb    |   0
 {spec => test}/dummy/app/models/user.rb       |   0
 .../app/views/application/index.html.erb      |   0
 .../app/views/layouts/application.html.erb    |   0
 {spec => test}/dummy/config.ru                |   0
 {spec => test}/dummy/config/application.rb    |   0
 {spec => test}/dummy/config/boot.rb           |   0
 test/dummy/config/database.yml                |  38 +++
 .../dummy/config/database.yml.sample          |   0
 {spec => test}/dummy/config/environment.rb    |   0
 .../dummy/config/environments/development.rb  |   1 -
 .../dummy/config/environments/production.rb   |   0
 .../dummy/config/environments/test.rb         |   0
 .../dummy/config/initializers/apartment.rb    |   0
 .../initializers/backtrace_silencers.rb       |   0
 .../dummy/config/initializers/inflections.rb  |   0
 .../dummy/config/initializers/mime_types.rb   |   0
 .../dummy/config/initializers/secret_token.rb |   0
 .../config/initializers/session_store.rb      |   0
 {spec => test}/dummy/config/locales/en.yml    |   0
 {spec => test}/dummy/config/routes.rb         |   0
 .../dummy/db/default.sqlite3                  |   0
 test/dummy/db/schema.rb                       |  18 ++
 {spec => test}/dummy/db/seeds.rb              |   0
 {spec => test}/dummy/db/seeds/import.rb       |   0
 {spec => test}/dummy/db/test.sqlite3          | Bin
 {spec => test}/dummy/public/404.html          |   0
 {spec => test}/dummy/public/422.html          |   0
 {spec => test}/dummy/public/500.html          |   0
 .../.gitkeep => test/dummy/public/favicon.ico |   0
 test/dummy/public/stylesheets/.gitkeep        |   0
 {spec => test}/dummy/script/rails             |   0
 test/excluded_models_test.rb                  |  32 ++
 test/generic_elevator_test.rb                 |  63 ++++
 test/host_hash_elevator_test.rb               |  42 +++
 test/mocks/adapter_mock.rb                    |  11 +
 test/mysql2_adapter_test.rb                   |  17 ++
 test/postgresql_adapter_test.rb               |  36 +++
 test/railtie_test.rb                          |  18 ++
 test/rake_task_test.rb                        |  57 ++++
 test/resolver_test.rb                         |  21 ++
 test/shared/shared_adapter_tests.rb           |  95 ++++++
 test/subdomain_elevator_test.rb               |  75 +++++
 test/test_helper.rb                           |  27 ++
 149 files changed, 1081 insertions(+), 3376 deletions(-)
 delete mode 100644 .rspec
 delete mode 100644 .ruby-gemset
 delete mode 100644 .ruby-version
 delete mode 100644 gemfiles/rails_4_0.gemfile
 delete mode 100644 gemfiles/rails_4_2.gemfile
 delete mode 100644 gemfiles/rails_5_0.gemfile
 rename gemfiles/{rails_4_1.gemfile => rails_5_1.gemfile} (86%)
 delete mode 100644 lib/apartment/adapters/abstract_jdbc_adapter.rb
 delete mode 100644 lib/apartment/adapters/jdbc_mysql_adapter.rb
 delete mode 100644 lib/apartment/adapters/jdbc_postgresql_adapter.rb
 delete mode 100644 lib/apartment/adapters/postgis_adapter.rb
 delete mode 100644 lib/apartment/adapters/sqlite3_adapter.rb
 delete mode 100644 lib/apartment/elevators/first_subdomain.rb
 delete mode 100644 lib/apartment/reloader.rb
 create mode 100644 lib/apartment/resolvers/abstract.rb
 create mode 100644 lib/apartment/resolvers/database.rb
 create mode 100644 lib/apartment/resolvers/schema.rb
 create mode 100644 notes.md
 delete mode 100644 spec/adapters/jdbc_mysql_adapter_spec.rb
 delete mode 100644 spec/adapters/jdbc_postgresql_adapter_spec.rb
 delete mode 100644 spec/adapters/mysql2_adapter_spec.rb
 delete mode 100644 spec/adapters/postgresql_adapter_spec.rb
 delete mode 100644 spec/adapters/sqlite3_adapter_spec.rb
 delete mode 100644 spec/apartment_spec.rb
 delete mode 100644 spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
 delete mode 100644 spec/dummy/db/migrate/20111202022214_create_table_books.rb
 delete mode 100644 spec/dummy/db/schema.rb
 delete mode 100644 spec/dummy_engine/.gitignore
 delete mode 100644 spec/dummy_engine/Gemfile
 delete mode 100644 spec/dummy_engine/Rakefile
 delete mode 100755 spec/dummy_engine/bin/rails
 delete mode 100644 spec/dummy_engine/config/initializers/apartment.rb
 delete mode 100644 spec/dummy_engine/dummy_engine.gemspec
 delete mode 100644 spec/dummy_engine/lib/dummy_engine.rb
 delete mode 100644 spec/dummy_engine/lib/dummy_engine/engine.rb
 delete mode 100644 spec/dummy_engine/lib/dummy_engine/version.rb
 delete mode 100644 spec/dummy_engine/test/dummy/Rakefile
 delete mode 100644 spec/dummy_engine/test/dummy/config.ru
 delete mode 100644 spec/dummy_engine/test/dummy/config/application.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/boot.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/database.yml
 delete mode 100644 spec/dummy_engine/test/dummy/config/environment.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/environments/development.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/environments/production.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/environments/test.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/initializers/assets.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/initializers/backtrace_silencers.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/initializers/cookies_serializer.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/initializers/filter_parameter_logging.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/initializers/inflections.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/initializers/mime_types.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/initializers/session_store.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/initializers/wrap_parameters.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/locales/en.yml
 delete mode 100644 spec/dummy_engine/test/dummy/config/routes.rb
 delete mode 100644 spec/dummy_engine/test/dummy/config/secrets.yml
 delete mode 100644 spec/examples/connection_adapter_examples.rb
 delete mode 100644 spec/examples/generic_adapter_custom_configuration_example.rb
 delete mode 100644 spec/examples/generic_adapter_examples.rb
 delete mode 100644 spec/examples/schema_adapter_examples.rb
 delete mode 100644 spec/integration/apartment_rake_integration_spec.rb
 delete mode 100644 spec/integration/query_caching_spec.rb
 delete mode 100644 spec/integration/use_within_an_engine_spec.rb
 delete mode 100644 spec/schemas/v1.rb
 delete mode 100644 spec/schemas/v2.rb
 delete mode 100644 spec/schemas/v3.rb
 delete mode 100644 spec/spec_helper.rb
 delete mode 100644 spec/support/apartment_helpers.rb
 delete mode 100644 spec/support/capybara_sessions.rb
 delete mode 100644 spec/support/config.rb
 delete mode 100644 spec/support/contexts.rb
 delete mode 100644 spec/support/requirements.rb
 delete mode 100644 spec/support/setup.rb
 delete mode 100644 spec/tasks/apartment_rake_spec.rb
 delete mode 100644 spec/tenant_spec.rb
 delete mode 100644 spec/unit/config_spec.rb
 delete mode 100644 spec/unit/elevators/domain_spec.rb
 delete mode 100644 spec/unit/elevators/first_subdomain_spec.rb
 delete mode 100644 spec/unit/elevators/generic_spec.rb
 delete mode 100644 spec/unit/elevators/host_hash_spec.rb
 delete mode 100644 spec/unit/elevators/subdomain_spec.rb
 delete mode 100644 spec/unit/migrator_spec.rb
 delete mode 100644 spec/unit/reloader_spec.rb
 create mode 100644 test/apartment_test.rb
 create mode 100644 test/config_test.rb
 rename spec/config/database.yml.sample => test/databases.yml (88%)
 create mode 100644 test/databases.yml.sample
 create mode 100644 test/decorator_test.rb
 create mode 100644 test/domain_elevator_test.rb
 rename {spec => test}/dummy/Rakefile (100%)
 rename {spec => test}/dummy/app/controllers/application_controller.rb (100%)
 rename {spec => test}/dummy/app/helpers/application_helper.rb (100%)
 rename {spec => test}/dummy/app/models/company.rb (100%)
 rename {spec => test}/dummy/app/models/user.rb (100%)
 rename {spec => test}/dummy/app/views/application/index.html.erb (100%)
 rename {spec => test}/dummy/app/views/layouts/application.html.erb (100%)
 rename {spec => test}/dummy/config.ru (100%)
 rename {spec => test}/dummy/config/application.rb (100%)
 rename {spec => test}/dummy/config/boot.rb (100%)
 create mode 100644 test/dummy/config/database.yml
 rename {spec => test}/dummy/config/database.yml.sample (100%)
 rename {spec => test}/dummy/config/environment.rb (100%)
 rename {spec => test}/dummy/config/environments/development.rb (95%)
 rename {spec => test}/dummy/config/environments/production.rb (100%)
 rename {spec => test}/dummy/config/environments/test.rb (100%)
 rename {spec => test}/dummy/config/initializers/apartment.rb (100%)
 rename {spec => test}/dummy/config/initializers/backtrace_silencers.rb (100%)
 rename {spec => test}/dummy/config/initializers/inflections.rb (100%)
 rename {spec => test}/dummy/config/initializers/mime_types.rb (100%)
 rename {spec => test}/dummy/config/initializers/secret_token.rb (100%)
 rename {spec => test}/dummy/config/initializers/session_store.rb (100%)
 rename {spec => test}/dummy/config/locales/en.yml (100%)
 rename {spec => test}/dummy/config/routes.rb (100%)
 rename spec/dummy/public/favicon.ico => test/dummy/db/default.sqlite3 (100%)
 create mode 100644 test/dummy/db/schema.rb
 rename {spec => test}/dummy/db/seeds.rb (100%)
 rename {spec => test}/dummy/db/seeds/import.rb (100%)
 rename {spec => test}/dummy/db/test.sqlite3 (100%)
 rename {spec => test}/dummy/public/404.html (100%)
 rename {spec => test}/dummy/public/422.html (100%)
 rename {spec => test}/dummy/public/500.html (100%)
 rename spec/dummy/public/stylesheets/.gitkeep => test/dummy/public/favicon.ico (100%)
 create mode 100644 test/dummy/public/stylesheets/.gitkeep
 rename {spec => test}/dummy/script/rails (100%)
 create mode 100644 test/excluded_models_test.rb
 create mode 100644 test/generic_elevator_test.rb
 create mode 100644 test/host_hash_elevator_test.rb
 create mode 100644 test/mocks/adapter_mock.rb
 create mode 100644 test/mysql2_adapter_test.rb
 create mode 100644 test/postgresql_adapter_test.rb
 create mode 100644 test/railtie_test.rb
 create mode 100644 test/rake_task_test.rb
 create mode 100644 test/resolver_test.rb
 create mode 100644 test/shared/shared_adapter_tests.rb
 create mode 100644 test/subdomain_elevator_test.rb
 create mode 100644 test/test_helper.rb

diff --git a/.gitignore b/.gitignore
index 5588c1d0..e15894d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,10 @@ pkg/*
 *.log
 .idea
 *.sw[pno]
-spec/config/database.yml
+spec/config/databases.yml
 spec/dummy/config/database.yml
 cookbooks
 tmp
 spec/dummy/db/*.sqlite3
 .DS_Store
+test/debug.log
diff --git a/.rspec b/.rspec
deleted file mode 100644
index ea0d335d..00000000
--- a/.rspec
+++ /dev/null
@@ -1,4 +0,0 @@
---colour
---format documentation
---tty
---order random
diff --git a/.ruby-gemset b/.ruby-gemset
deleted file mode 100644
index 421ee4a7..00000000
--- a/.ruby-gemset
+++ /dev/null
@@ -1 +0,0 @@
-apartment
diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index 81af5fe5..00000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-ruby-2.3
diff --git a/.travis.yml b/.travis.yml
index 1f006220..d800be75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,10 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.9
   - 2.2.4
   - 2.3.1
   - jruby-9.0.5.0
 gemfile:
-  - gemfiles/rails_4_0.gemfile
-  - gemfiles/rails_4_1.gemfile
-  - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
 bundler_args: --without local
 before_install:
   - gem install bundler -v '> 1.5.0'
@@ -17,9 +12,4 @@ env:
   RUBY_GC_MALLOC_LIMIT: 90000000
   RUBY_FREE_MIN: 200000
 matrix:
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 2.1.9
-      gemfile: gemfiles/rails_5_0.gemfile
   fast_finish: true
diff --git a/Gemfile b/Gemfile
index 6c13b34a..25de6e5b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'rails',        '>= 3.1.2'
+gem 'rails',        '>= 5.1.0'
 
 group :local do
   gem 'pry'
diff --git a/Rakefile b/Rakefile
index 8bb751d0..c06a295c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,24 +1,18 @@
 require 'bundler' rescue 'You must `gem install bundler` and `bundle install` to run rake tasks'
 Bundler.setup
 Bundler::GemHelper.install_tasks
-
-require 'appraisal'
-
-require "rspec"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec => %w{ db:copy_credentials db:test:prepare }) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
-  # spec.rspec_opts = '--order rand:16996'
+require "rake/testtask"
+require 'yaml'
+
+Rake::TestTask.new do |t|
+  t.libs = ["lib"]
+  t.warning = false
+  # t.verbose = true
+  t.test_files = FileList['test/*_test.rb']
 end
 
-namespace :spec do
-  [:tasks, :unit, :adapters, :integration].each do |type|
-    RSpec::Core::RakeTask.new(type => :spec) do |spec|
-      spec.pattern = "spec/#{type}/**/*_spec.rb"
-    end
-  end
-end
+require 'appraisal'
+# require "#{File.join(File.dirname(__FILE__), 'test', 'test_helper')}"
 
 task :console do
   require 'pry'
@@ -27,18 +21,18 @@ task :console do
   Pry.start
 end
 
-task :default => :spec
+task default: :test
 
 namespace :db do
   namespace :test do
-    task :prepare => %w{postgres:drop_db postgres:build_db mysql:drop_db mysql:build_db}
+    task prepare: %w{postgres:drop_db postgres:build_db mysql:drop_db mysql:build_db}
   end
 
   desc "copy sample database credential files over if real files don't exist"
   task :copy_credentials do
     require 'fileutils'
-    apartment_db_file = 'spec/config/database.yml'
-    rails_db_file = 'spec/dummy/config/database.yml'
+    apartment_db_file = 'test/databases.yml'
+    rails_db_file = 'test/dummy/config/database.yml'
 
     FileUtils.copy(apartment_db_file + '.sample', apartment_db_file, :verbose => true) unless File.exists?(apartment_db_file)
     FileUtils.copy(rails_db_file + '.sample', rails_db_file, :verbose => true)         unless File.exists?(rails_db_file)
@@ -47,13 +41,14 @@ end
 
 namespace :postgres do
   require 'active_record'
-  require "#{File.join(File.dirname(__FILE__), 'spec', 'support', 'config')}"
 
   desc 'Build the PostgreSQL test databases'
   task :build_db do
     %x{ createdb -E UTF8 #{pg_config['database']} -U#{pg_config['username']} } rescue "test db already exists"
     ActiveRecord::Base.establish_connection pg_config
-    ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
+    ActiveRecord::Migration.suppress_messages do
+      load(File.join(File.dirname(__FILE__), "test/dummy/db/schema.rb"))
+    end
   end
 
   desc "drop the PostgreSQL test database"
@@ -66,26 +61,26 @@ end
 
 namespace :mysql do
   require 'active_record'
-  require "#{File.join(File.dirname(__FILE__), 'spec', 'support', 'config')}"
 
   desc 'Build the MySQL test databases'
   task :build_db do
-    %x{ mysqladmin -u #{my_config['username']} --password=#{my_config['password']} create #{my_config['database']} } rescue "test db already exists"
+    %x{ /usr/local/mysql/bin/mysqladmin -u #{my_config['username']} --password=#{my_config['password']} create #{my_config['database']} } rescue "test db already exists"
     ActiveRecord::Base.establish_connection my_config
-    ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
+    ActiveRecord::Migration.suppress_messages do
+      load(File.join(File.dirname(__FILE__), "test/dummy/db/schema.rb"))
+    end
   end
 
   desc "drop the MySQL test database"
   task :drop_db do
     puts "dropping database #{my_config['database']}"
-    %x{ mysqladmin -u #{my_config['username']} --password=#{my_config['password']} drop #{my_config['database']} --force}
+    %x{ /usr/local/mysql/bin/mysqladmin -u #{my_config['username']} --password=#{my_config['password']} drop #{my_config['database']} --force}
   end
 
 end
 
-# TODO clean this up
 def config
-  Apartment::Test.config['connections']
+  @config ||= YAML.load(ERB.new(IO.read('test/databases.yml')).result)['connections']
 end
 
 def pg_config
diff --git a/apartment.gemspec b/apartment.gemspec
index dbb1a27e..ed8d1ed6 100644
--- a/apartment.gemspec
+++ b/apartment.gemspec
@@ -18,15 +18,12 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/influitive/apartment}
   s.licenses = ["MIT"]
 
-  # must be >= 3.1.2 due to bug in prepared_statements
-  s.add_dependency 'activerecord',    '>= 3.1.2', '< 6.0'
+  s.add_dependency 'activerecord',    '>= 5.1.0'
   s.add_dependency 'rack',            '>= 1.3.6'
   s.add_dependency 'public_suffix',   '~> 2.0.5'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rake',         '~> 0.9'
-  s.add_development_dependency 'rspec',        '~> 3.4'
-  s.add_development_dependency 'rspec-rails',  '~> 3.4'
   s.add_development_dependency 'capybara',     '~> 2.0'
 
   if defined?(JRUBY_VERSION)
diff --git a/gemfiles/rails_4_0.gemfile b/gemfiles/rails_4_0.gemfile
deleted file mode 100644
index a7a4f7d7..00000000
--- a/gemfiles/rails_4_0.gemfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 4.0.0"
-
-group :local do
-  gem "pry"
-  gem "guard-rspec", "~> 4.2"
-end
-
-gemspec :path => "../"
diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile
deleted file mode 100644
index 43d74179..00000000
--- a/gemfiles/rails_4_2.gemfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 4.2.0"
-
-group :local do
-  gem "pry"
-  gem "guard-rspec", "~> 4.2"
-end
-
-gemspec :path => "../"
diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile
deleted file mode 100644
index 5467e3da..00000000
--- a/gemfiles/rails_5_0.gemfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 5.0.0"
-
-group :local do
-  gem "pry"
-  gem "guard-rspec", "~> 4.2"
-end
-
-gemspec :path => "../"
diff --git a/gemfiles/rails_4_1.gemfile b/gemfiles/rails_5_1.gemfile
similarity index 86%
rename from gemfiles/rails_4_1.gemfile
rename to gemfiles/rails_5_1.gemfile
index 9eb9a07a..3e2b64be 100644
--- a/gemfiles/rails_4_1.gemfile
+++ b/gemfiles/rails_5_1.gemfile
@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 4.1.0"
+gem "rails", "~> 5.1.0"
 
 group :local do
   gem "pry"
diff --git a/lib/apartment.rb b/lib/apartment.rb
index 38ea5188..07db151e 100644
--- a/lib/apartment.rb
+++ b/lib/apartment.rb
@@ -5,36 +5,47 @@
 require 'apartment/tenant'
 
 module Apartment
-
   class << self
-
     extend Forwardable
 
-    ACCESSOR_METHODS  = [:use_schemas, :use_sql, :seed_after_create, :prepend_environment, :append_environment, :with_multi_server_setup ]
-    WRITER_METHODS    = [:tenant_names, :database_schema_file, :excluded_models, :default_schema, :persistent_schemas, :connection_class, :tld_length, :db_migrate_tenants, :seed_data_file]
+    ACCESSOR_METHODS = [
+      :use_sql, :seed_after_create, :tenant_decorator,
+      :force_reconnect_on_switch
+    ]
+    WRITER_METHODS   = [
+      :tenant_names, :database_schema_file, :excluded_models,
+      :persistent_schemas, :connection_class, :tld_length, :db_migrate_tenants,
+      :seed_data_file, :default_tenant
+    ]
+    OTHER_METHODS    = [:tenant_resolver, :resolver_class]
 
     attr_accessor(*ACCESSOR_METHODS)
     attr_writer(*WRITER_METHODS)
 
-    def_delegators :connection_class, :connection, :connection_config, :establish_connection
+    def_delegators :connection_class, :connection, :connection_config,
+      :establish_connection, :connection_handler
 
-    # configure apartment with available options
     def configure
       yield self if block_given?
     end
 
+    def tenant_resolver
+      @tenant_resolver ||= @resolver_class.new(connection_config)
+    end
+
+    def tenant_resolver=(resolver_class)
+      remove_instance_variable(:@tenant_resolver) if instance_variable_defined?(:@tenant_resolver)
+      @resolver_class = resolver_class
+    end
+
     def tenant_names
-      extract_tenant_config.keys.map(&:to_s)
+      @tenant_names.respond_to?(:call) ? @tenant_names.call : (@tenant_names || [])
     end
 
     def tenants_with_config
       extract_tenant_config
     end
 
-    def db_config_for(tenant)
-      (tenants_with_config[tenant] || connection_config).with_indifferent_access
-    end
-
     # Whether or not db:migrate should also migrate tenants
     # defaults to true
     def db_migrate_tenants
@@ -48,11 +59,9 @@ def excluded_models
       @excluded_models || []
     end
 
-    def default_schema
-      @default_schema || "public" # TODO 'public' is postgres specific
+    def default_tenant
+      @default_tenant || tenant_resolver.init_config
     end
-    alias :default_tenant :default_schema
-    alias :default_tenant= :default_schema=
 
     def persistent_schemas
       @persistent_schemas || []
@@ -74,22 +83,10 @@ def seed_data_file
       @seed_data_file = "#{Rails.root}/db/seeds.rb"
     end
 
-    # Reset all the config for Apartment
     def reset
-      (ACCESSOR_METHODS + WRITER_METHODS).each{|method| remove_instance_variable(:"@#{method}") if instance_variable_defined?(:"@#{method}") }
-    end
-
-    def extract_tenant_config
-      return {} unless @tenant_names
-      values = @tenant_names.respond_to?(:call) ? @tenant_names.call : @tenant_names
-      unless values.is_a? Hash
-        values = values.each_with_object({}) do |tenant, hash|
-          hash[tenant] = connection_config
-        end
+      (ACCESSOR_METHODS + WRITER_METHODS + OTHER_METHODS).each do |method|
+        remove_instance_variable(:"@#{method}") if instance_variable_defined?(:"@#{method}")
       end
-      values.with_indifferent_access
-    rescue ActiveRecord::StatementInvalid
-      {}
     end
   end
 
diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 760603d0..4c80e1d5 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -4,259 +4,147 @@ class AbstractAdapter
       include ActiveSupport::Callbacks
       define_callbacks :create, :switch
 
-      attr_writer :default_tenant
+      attr_reader :current
 
-      #   @constructor
-      #   @param {Hash} config Database config
-      #
-      def initialize(config)
-        @config = config
+      def initialize
+        reset
+      end
+
+      def reset
+        switch!(Apartment.default_tenant)
+      end
+
+      def switch(tenant = nil)
+        previous_tenant = @current
+        switch!(tenant)
+
+        yield
+      ensure
+        switch!(previous_tenant) rescue reset
       end
 
-      #   Create a new tenant, import schema, seed if appropriate
-      #
-      #   @param {String} tenant Tenant name
-      #
       def create(tenant)
         run_callbacks :create do
-          create_tenant(tenant)
+          begin
+            previous_tenant = @current
+            config = config_for(tenant)
+            difference = current_difference_from(config)
 
-          switch(tenant) do
-            import_database_schema
+            if difference[:host]
+              connection_switch(config, without_keys: [:database, :schema_search_path])
+            end
+
+            create_tenant!(config)
+            simple_switch(config)
+            @current = tenant
 
-            # Seed data if appropriate
+            import_database_schema
             seed_data if Apartment.seed_after_create
 
             yield if block_given?
+          ensure
+            switch!(previous_tenant) rescue reset
           end
         end
       end
 
-      #   Note alias_method here doesn't work with inheritence apparently ??
-      #
-      def current
-        Apartment.connection.current_database
-      end
+      def drop(tenant)
+        previous_tenant = @current
 
-      #   Return the original public tenant
-      #
-      #   @return {String} default tenant name
-      #
-      def default_tenant
-        @default_tenant || Apartment.default_tenant
-      end
-      alias :default_schema :default_tenant # TODO deprecate default_schema
+        config = config_for(tenant)
+        difference = current_difference_from(config)
 
-      #   Drop the tenant
-      #
-      #   @param {String} tenant name
-      #
-      def drop(tenant)
-        with_neutral_connection(tenant) do |conn|
-          drop_command(conn, tenant)
+        if difference[:host]
+          connection_switch(config, without_keys: [:database])
         end
 
-      rescue *rescuable_exceptions => exception
-        raise_drop_tenant_error!(tenant, exception)
+        unless database_exists?(config[:database])
+          raise TenantNotFound, "Error while dropping database #{config[:database]} for tenant #{tenant}"
+        end
+
+        Apartment.connection.drop_database(config[:database])
+
+        @current = tenant
+      ensure
+        switch!(previous_tenant) rescue reset
       end
 
-      #   Switch to a new tenant
-      #
-      #   @param {String} tenant name
-      #
-      def switch!(tenant = nil)
+      def switch!(tenant)
         run_callbacks :switch do
           return reset if tenant.nil?
 
-          connect_to_new(tenant).tap do
-            Apartment.connection.clear_query_cache
-          end
-        end
-      end
+          config = config_for(tenant)
 
-      #   Connect to tenant, do your biz, switch back to previous tenant
-      #
-      #   @param {String?} tenant to connect to
-      #
-      def switch(tenant = nil)
-        begin
-          previous_tenant = current
-          switch!(tenant)
-          yield
+          if Apartment.force_reconnect_on_switch
+            connection_switch!(config)
+          else
+            switch_tenant(config)
+          end
 
-        ensure
-          switch!(previous_tenant) rescue reset
-        end
-      end
+          @current = tenant
 
-      #   Iterate over all tenants, switch to tenant and yield tenant name
-      #
-      def each(tenants = Apartment.tenant_names)
-        tenants.each do |tenant|
-          switch(tenant){ yield tenant }
-        end
-      end
+          Apartment.connection.clear_query_cache
 
-      #   Establish a new connection for each specific excluded model
-      #
-      def process_excluded_models
-        # All other models will shared a connection (at Apartment.connection_class) and we can modify at will
-        Apartment.excluded_models.each do |excluded_model|
-          process_excluded_model(excluded_model)
+          tenant
         end
       end
 
-      #   Reset the tenant connection to the default
-      #
-      def reset
-        Apartment.establish_connection @config
-      end
+      def config_for(tenant)
+        return tenant if tenant.is_a?(Hash)
 
-      #   Load the rails seed file into the db
-      #
-      def seed_data
-        # Don't log the output of seeding the db
-        silence_warnings{ load_or_abort(Apartment.seed_data_file) } if Apartment.seed_data_file
+        decorated_tenant = decorate(tenant)
+        Apartment.tenant_resolver.resolve(decorated_tenant)
       end
-      alias_method :seed, :seed_data
-
-    protected
 
-      def process_excluded_model(excluded_model)
-        excluded_model.constantize.establish_connection @config
+      def decorate(tenant)
+        decorator = Apartment.tenant_decorator
+        decorator ? decorator.call(tenant) : tenant
       end
 
-      def drop_command(conn, tenant)
-        # connection.drop_database   note that drop_database will not throw an exception, so manually execute
-        conn.execute("DROP DATABASE #{conn.quote_table_name(environmentify(tenant))}")
-      end
+      def process_excluded_models
+        excluded_config = config_for(Apartment.default_tenant).merge(name: :_apartment_excluded)
+        Apartment.connection_handler.establish_connection(excluded_config)
 
-      #   Create the tenant
-      #
-      #   @param {String} tenant Database name
-      #
-      def create_tenant(tenant)
-        with_neutral_connection(tenant) do |conn|
-          create_tenant_command(conn, tenant)
+        Apartment.excluded_models.each do |excluded_model|
+          # user mustn't have overridden `connection_specification_name`
+          # cattr_accessor in model
+          excluded_model.constantize.connection_specification_name = :_apartment_excluded
         end
-      rescue *rescuable_exceptions => exception
-        raise_create_tenant_error!(tenant, exception)
-      end
-
-      def create_tenant_command(conn, tenant)
-        conn.create_database(environmentify(tenant), @config)
       end
 
-      #   Connect to new tenant
-      #
-      #   @param {String} tenant Database name
-      #
-      def connect_to_new(tenant)
-        Apartment.establish_connection multi_tenantify(tenant)
-        Apartment.connection.active?   # call active? to manually check if this connection is valid
-      rescue *rescuable_exceptions => exception
-        Apartment::Tenant.reset if reset_on_connection_exception?
-        raise_connect_error!(tenant, exception)
+      def current_difference_from(config)
+        current_config = config_for(@current)
+        config.select{ |k, v| current_config[k] != v }
       end
 
-      #   Prepend the environment if configured and the environment isn't already there
-      #
-      #   @param {String} tenant Database name
-      #   @return {String} tenant name with Rails environment *optionally* prepended
-      #
-      def environmentify(tenant)
-        unless tenant.include?(Rails.env)
-          if Apartment.prepend_environment
-            "#{Rails.env}_#{tenant}"
-          elsif Apartment.append_environment
-            "#{tenant}_#{Rails.env}"
-          else
-            tenant
-          end
-        else
-          tenant
+      def connection_switch!(config, without_keys: [])
+        config = config.dup.tap do |c|
+          c.reject{ |k, _| without_keys.include?(k) }
         end
+
+        Apartment.connection_handler.establish_connection(config)
       end
 
-      #   Import the database schema
-      #
       def import_database_schema
-        ActiveRecord::Schema.verbose = false    # do not log schema load output.
+        ActiveRecord::Schema.verbose = false
 
         load_or_abort(Apartment.database_schema_file) if Apartment.database_schema_file
       end
 
-      #   Return a new config that is multi-tenanted
-      #   @param {String}  tenant: Database name
-      #   @param {Boolean} with_database: if true, use the actual tenant's db name
-      #                                   if false, use the default db name from the db
-      def multi_tenantify(tenant, with_database = true)
-        db_connection_config(tenant).tap do |config|
-          if with_database
-            multi_tenantify_with_tenant_db_name(config, tenant)
-          end
-        end
-      end
-
-      def multi_tenantify_with_tenant_db_name(config, tenant)
-        config[:database] = environmentify(tenant)
+      def seed_data
+        silence_warnings{ load_or_abort(Apartment.seed_data_file) } if Apartment.seed_data_file
       end
 
-      #   Load a file or abort if it doesn't exists
-      #
       def load_or_abort(file)
-        if File.exists?(file)
+        if File.exist?(file)
           load(file)
         else
           abort %{#{file} doesn't exist yet}
         end
       end
 
-      #   Exceptions to rescue from on db operations
-      #
-      def rescuable_exceptions
-        [ActiveRecord::ActiveRecordError] + Array(rescue_from)
-      end
-
-      #   Extra exceptions to rescue from
-      #
-      def rescue_from
-        []
-      end
-
-      def db_connection_config(tenant)
-        Apartment.db_config_for(tenant).clone
-      end
-
-     def with_neutral_connection(tenant, &block)
-        if Apartment.with_multi_server_setup
-          # neutral connection is necessary whenever you need to create/remove a database from a server.
-          # example: when you use postgresql, you need to connect to the default postgresql database before you create your own.
-          SeparateDbConnectionHandler.establish_connection(multi_tenantify(tenant, false))
-          yield(SeparateDbConnectionHandler.connection)
-          SeparateDbConnectionHandler.connection.close
-        else
-          yield(Apartment.connection)
-        end
-      end
-
-      def reset_on_connection_exception?
-        false
-      end
-
-      def raise_drop_tenant_error!(tenant, exception)
-        raise TenantNotFound, "Error while dropping tenant #{environmentify(tenant)}: #{ exception.message }"
-      end
-
-      def raise_create_tenant_error!(tenant, exception)
-        raise TenantExists, "Error while creating tenant #{environmentify(tenant)}: #{ exception.message }"
-      end
-
       def raise_connect_error!(tenant, exception)
-        raise TenantNotFound, "Error while connecting to tenant #{environmentify(tenant)}: #{ exception.message }"
-      end
-
-      class SeparateDbConnectionHandler < ::ActiveRecord::Base
+        raise TenantNotFound, "Error while connecting to tenant #{tenant}: #{exception.message}"
       end
     end
   end
diff --git a/lib/apartment/adapters/abstract_jdbc_adapter.rb b/lib/apartment/adapters/abstract_jdbc_adapter.rb
deleted file mode 100644
index c4f7f32f..00000000
--- a/lib/apartment/adapters/abstract_jdbc_adapter.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'apartment/adapters/abstract_adapter'
-
-module Apartment
-  module Adapters
-    class AbstractJDBCAdapter < AbstractAdapter
-
-    private
-
-      def multi_tenantify_with_tenant_db_name(config, tenant)
-        config[:url] = "#{config[:url].gsub(/(\S+)\/.+$/, '\1')}/#{environmentify(tenant)}"
-      end
-
-      def rescue_from
-        ActiveRecord::JDBCError
-      end
-    end
-  end
-end
diff --git a/lib/apartment/adapters/jdbc_mysql_adapter.rb b/lib/apartment/adapters/jdbc_mysql_adapter.rb
deleted file mode 100644
index 53fc7dea..00000000
--- a/lib/apartment/adapters/jdbc_mysql_adapter.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "apartment/adapters/abstract_jdbc_adapter"
-
-module Apartment
-
-  module Tenant
-    def self.jdbc_mysql_adapter(config)
-      Adapters::JDBCMysqlAdapter.new config
-    end
-  end
-
-  module Adapters
-    class JDBCMysqlAdapter < AbstractJDBCAdapter
-
-      def reset_on_connection_exception?
-        true
-      end
-    end
-  end
-end
diff --git a/lib/apartment/adapters/jdbc_postgresql_adapter.rb b/lib/apartment/adapters/jdbc_postgresql_adapter.rb
deleted file mode 100644
index f0922d8c..00000000
--- a/lib/apartment/adapters/jdbc_postgresql_adapter.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'apartment/adapters/postgresql_adapter'
-
-module Apartment
-  module Tenant
-
-    def self.jdbc_postgresql_adapter(config)
-      Apartment.use_schemas ?
-        Adapters::JDBCPostgresqlSchemaAdapter.new(config) :
-        Adapters::JDBCPostgresqlAdapter.new(config)
-    end
-  end
-
-  module Adapters
-
-    # Default adapter when not using Postgresql Schemas
-    class JDBCPostgresqlAdapter < PostgresqlAdapter
-
-    private
-
-      def multi_tenantify_with_tenant_db_name(config, tenant)
-        config[:url] = "#{config[:url].gsub(/(\S+)\/.+$/, '\1')}/#{environmentify(tenant)}"
-      end
-
-      def create_tenant_command(conn, tenant)
-        conn.create_database(environmentify(tenant), { :thisisahack => '' })
-      end
-
-      def rescue_from
-        ActiveRecord::JDBCError
-      end
-    end
-
-    # Separate Adapter for Postgresql when using schemas
-    class JDBCPostgresqlSchemaAdapter < PostgresqlSchemaAdapter
-
-      #   Set schema search path to new schema
-      #
-      def connect_to_new(tenant = nil)
-        return reset if tenant.nil?
-        raise ActiveRecord::StatementInvalid.new("Could not find schema #{tenant}") unless Apartment.connection.all_schemas.include? tenant.to_s
-
-        @current = tenant.to_s
-        Apartment.connection.schema_search_path = full_search_path
-
-      rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
-        raise TenantNotFound, "One of the following schema(s) is invalid: #{full_search_path}"
-      end
-
-    private
-
-      def rescue_from
-        ActiveRecord::JDBCError
-      end
-    end
-  end
-end
diff --git a/lib/apartment/adapters/mysql2_adapter.rb b/lib/apartment/adapters/mysql2_adapter.rb
index d1e324ca..0e05ff5e 100644
--- a/lib/apartment/adapters/mysql2_adapter.rb
+++ b/lib/apartment/adapters/mysql2_adapter.rb
@@ -1,71 +1,37 @@
 require 'apartment/adapters/abstract_adapter'
 
 module Apartment
-  module Tenant
-
-    def self.mysql2_adapter(config)
-      Apartment.use_schemas ?
-        Adapters::Mysql2SchemaAdapter.new(config) :
-        Adapters::Mysql2Adapter.new(config)
-    end
-  end
-
   module Adapters
     class Mysql2Adapter < AbstractAdapter
+      def switch_tenant(config)
+        difference = current_difference_from(config)
 
-      def initialize(config)
-        super
-
-        @default_tenant = config[:database]
-      end
-
-    protected
-
-      def rescue_from
-        Mysql2::Error
-      end
-    end
-
-    class Mysql2SchemaAdapter < AbstractAdapter
-      def initialize(config)
-        super
-
-        @default_tenant = config[:database]
-        reset
+        if difference[:host]
+          Apartment.connection_class.connection_handler.establish_connection(config)
+        else
+          simple_switch(config) if difference[:database]
+        end
       end
 
-      #   Reset current tenant to the default_tenant
-      #
-      def reset
-        Apartment.connection.execute "use `#{default_tenant}`"
+      def create_tenant!(config)
+        Apartment.connection.create_database(config[:database], config)
       end
 
-    protected
-
-      #   Connect to new tenant
-      #
-      def connect_to_new(tenant)
-        return reset if tenant.nil?
-
-        Apartment.connection.execute "use `#{environmentify(tenant)}`"
-
+      def simple_switch(config)
+        Apartment.connection.execute("use `#{config[:database]}`")
       rescue ActiveRecord::StatementInvalid => exception
-        Apartment::Tenant.reset
-        raise_connect_error!(tenant, exception)
+        raise_connect_error!(config[:database], exception)
       end
 
-      def process_excluded_model(model)
-        model.constantize.tap do |klass|
-          # Ensure that if a schema *was* set, we override
-          table_name = klass.table_name.split('.', 2).last
-
-          klass.table_name = "#{default_tenant}.#{table_name}"
+      private
+        def database_exists?(database)
+          result = Apartment.connection.exec_query(<<-SQL).try(:first)
+            SELECT 1 AS `exists`
+            FROM INFORMATION_SCHEMA.SCHEMATA
+            WHERE SCHEMA_NAME = #{Apartment.connection.quote(database)}
+          SQL
+          result.present? && result['exists'] == 1
         end
-      end
-
-      def reset_on_connection_exception?
-        true
-      end
     end
   end
 end
diff --git a/lib/apartment/adapters/postgis_adapter.rb b/lib/apartment/adapters/postgis_adapter.rb
deleted file mode 100644
index 4f5e9176..00000000
--- a/lib/apartment/adapters/postgis_adapter.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# handle postgis adapter as if it were postgresql,
-# only override the adapter_method used for initialization
-require "apartment/adapters/postgresql_adapter"
-
-module Apartment
-  module Tenant
-
-    def self.postgis_adapter(config)
-      postgresql_adapter(config)
-    end
-  end
-end
diff --git a/lib/apartment/adapters/postgresql_adapter.rb b/lib/apartment/adapters/postgresql_adapter.rb
index 544aa334..ae377ad9 100644
--- a/lib/apartment/adapters/postgresql_adapter.rb
+++ b/lib/apartment/adapters/postgresql_adapter.rb
@@ -1,196 +1,99 @@
 require 'apartment/adapters/abstract_adapter'
 
 module Apartment
-  module Tenant
-
-    def self.postgresql_adapter(config)
-      adapter = Adapters::PostgresqlAdapter
-      adapter = Adapters::PostgresqlSchemaAdapter if Apartment.use_schemas
-      adapter = Adapters::PostgresqlSchemaFromSqlAdapter if Apartment.use_sql && Apartment.use_schemas
-      adapter.new(config)
-    end
-  end
-
   module Adapters
-    # Default adapter when not using Postgresql Schemas
     class PostgresqlAdapter < AbstractAdapter
-
-    private
-
-      def rescue_from
-        PGError
+      # -- ABSTRACT OVERRIDES --
+      def drop(tenant)
+        raise NotImplementedError,
+          "Please use either drop_database or drop_schema for PG adapter"
       end
-    end
-
-    # Separate Adapter for Postgresql when using schemas
-    class PostgresqlSchemaAdapter < AbstractAdapter
-
-      def initialize(config)
-        super
+      # -- END ABSTRACT OVERRIDES --
 
-        reset
+      def drop_database(tenant)
+        self.class.superclass.instance_method(:drop).bind(self).call(tenant)
       end
 
-      #   Reset schema search path to the default schema_search_path
-      #
-      #   @return {String} default schema search path
-      #
-      def reset
-        @current = default_tenant
-        Apartment.connection.schema_search_path = full_search_path
-      end
-
-      def current
-        @current || default_tenant
-      end
+      def drop_schema(tenant)
+        previous_tenant = @current
 
-    protected
+        config = config_for(tenant)
+        difference = current_difference_from(config)
 
-      def process_excluded_model(excluded_model)
-        excluded_model.constantize.tap do |klass|
-          # Ensure that if a schema *was* set, we override
-          table_name = klass.table_name.split('.', 2).last
-
-          klass.table_name = "#{default_tenant}.#{table_name}"
+        if difference[:host] || difference[:database]
+          connection_switch!(config)
         end
-      end
-
-      def drop_command(conn, tenant)
-        conn.execute(%{DROP SCHEMA "#{tenant}" CASCADE})
-      end
-
-      #   Set schema search path to new schema
-      #
-      def connect_to_new(tenant = nil)
-        return reset if tenant.nil?
-        raise ActiveRecord::StatementInvalid.new("Could not find schema #{tenant}") unless Apartment.connection.schema_exists? tenant
 
-        @current = tenant.to_s
-        Apartment.connection.schema_search_path = full_search_path
+        schema = first_schema(config[:schema_search_path])
 
-      rescue *rescuable_exceptions
-        raise TenantNotFound, "One of the following schema(s) is invalid: \"#{tenant}\" #{full_search_path}"
-      end
-
-    private
-
-      def create_tenant_command(conn, tenant)
-        conn.execute(%{CREATE SCHEMA "#{tenant}"})
-      end
-
-      #   Generate the final search path to set including persistent_schemas
-      #
-      def full_search_path
-        persistent_schemas.map(&:inspect).join(", ")
-      end
+        Apartment.connection.execute(%{DROP SCHEMA "#{schema}" CASCADE})
 
-      def persistent_schemas
-        [@current, Apartment.persistent_schemas].flatten
+        @current = tenant
+      rescue ActiveRecord::StatementInvalid => exception
+        raise TenantNotFound, "Error while dropping schema #{schema} for tenant #{tenant}: #{exception.message}"
+      ensure
+        switch!(previous_tenant) rescue reset
       end
-    end
-
-    # Another Adapter for Postgresql when using schemas and SQL
-    class PostgresqlSchemaFromSqlAdapter < PostgresqlSchemaAdapter
 
-      PSQL_DUMP_BLACKLISTED_STATEMENTS= [
-        /SET search_path/i,   # overridden later
-        /SET lock_timeout/i   # new in postgresql 9.3
-      ]
+      def switch_tenant(config)
+        current_config = config_for(@current)
+        difference = config.select{ |k, v| current_config[k] != v }
 
-      def import_database_schema
-        clone_pg_schema
-        copy_schema_migrations
+        # PG doesn't have the ability to switch DB without reconnecting
+        if difference[:host] || difference[:database]
+          connection_switch!(config)
+        else
+          simple_switch(config) if difference[:schema_search_path]
+        end
       end
 
-    private
+      def simple_switch(config)
+        tenant = first_schema(config[:schema_search_path])
 
-      # Clone default schema into new schema named after current tenant
-      #
-      def clone_pg_schema
-        pg_schema_sql = patch_search_path(pg_dump_schema)
-        Apartment.connection.execute(pg_schema_sql)
-      end
+        unless Apartment.connection.schema_exists?(tenant)
+          raise Apartment::TenantNotFound, "Could not find schema #{tenant}"
+        end
 
-      # Copy data from schema_migrations into new schema
-      #
-      def copy_schema_migrations
-        pg_migrations_data = patch_search_path(pg_dump_schema_migrations_data)
-        Apartment.connection.execute(pg_migrations_data)
+        Apartment.connection.schema_search_path = config[:schema_search_path]
       end
 
-      #   Dump postgres default schema
-      #
-      #   @return {String} raw SQL contaning only postgres schema dump
-      #
-      def pg_dump_schema
-
-        # Skip excluded tables? :/
-        # excluded_tables =
-        #   collect_table_names(Apartment.excluded_models)
-        #   .map! {|t| "-T #{t}"}
-        #   .join(' ')
+      def create_tenant!(config)
+        unless database_exists?(config[:database])
+          Apartment.connection.create_database(config[:database], config)
+          connection_switch!(config, without_keys: [:schema_search_path])
+        end
 
-        # `pg_dump -s -x -O -n #{default_tenant} #{excluded_tables} #{dbname}`
+        schema = first_schema(config[:schema_search_path])
 
-        with_pg_env { `pg_dump -s -x -O -n #{default_tenant} #{dbname}` }
-      end
-
-      #   Dump data from schema_migrations table
-      #
-      #   @return {String} raw SQL contaning inserts with data from schema_migrations
-      #
-      def pg_dump_schema_migrations_data
-        with_pg_env { `pg_dump -a --inserts -t schema_migrations -t ar_internal_metadata -n #{default_tenant} #{dbname}` }
+        if schema && !schema_exists?(schema)
+          Apartment.connection.execute(%{CREATE SCHEMA "#{schema}"})
+        end
       end
 
-      # Temporary set Postgresql related environment variables if there are in @config
-      #
-      def with_pg_env(&block)
-        pghost, pgport, pguser, pgpassword =  ENV['PGHOST'], ENV['PGPORT'], ENV['PGUSER'], ENV['PGPASSWORD']
+      private
+        def database_exists?(database)
+          result = Apartment.connection.exec_query(<<-SQL).try(:first)
+            SELECT EXISTS(
+              SELECT 1
+              FROM pg_catalog.pg_database
+              WHERE datname = #{Apartment.connection.quote(database)}
+            )
+          SQL
 
-        ENV['PGHOST'] = @config[:host] if @config[:host]
-        ENV['PGPORT'] = @config[:port].to_s if @config[:port]
-        ENV['PGUSER'] = @config[:username].to_s if @config[:username]
-        ENV['PGPASSWORD'] = @config[:password].to_s if @config[:password]
-
-        block.call
-      ensure
-        ENV['PGHOST'], ENV['PGPORT'], ENV['PGUSER'], ENV['PGPASSWORD'] = pghost, pgport, pguser, pgpassword
-      end
-
-      #   Remove "SET search_path ..." line from SQL dump and prepend search_path set to current tenant
-      #
-      #   @return {String} patched raw SQL dump
-      #
-      def patch_search_path(sql)
-        search_path = "SET search_path = \"#{current}\", #{default_tenant};"
-
-        sql
-          .split("\n")
-          .select {|line| check_input_against_regexps(line, PSQL_DUMP_BLACKLISTED_STATEMENTS).empty?}
-          .prepend(search_path)
-          .join("\n")
-      end
+          result.present? && result['exists']
+        end
 
-      #   Checks if any of regexps matches against input
-      #
-      def check_input_against_regexps(input, regexps)
-        regexps.select {|c| input.match c}
-      end
+        def schema_exists?(schema)
+          Apartment.connection.schema_exists?(schema)
+        end
 
-      #   Collect table names from AR Models
-      #
-      def collect_table_names(models)
-        models.map do |m|
-          m.constantize.table_name
+        def first_schema(search_path)
+          strip_quotes(search_path.split(",").first)
         end
-      end
 
-      # Convenience method for current database name
-      #
-      def dbname
-        Apartment.connection_config[:database]
-      end
+        def strip_quotes(string)
+          string[0] == '"' ? string[1..-2] : string
+        end
     end
   end
 end
diff --git a/lib/apartment/adapters/sqlite3_adapter.rb b/lib/apartment/adapters/sqlite3_adapter.rb
deleted file mode 100644
index dff5a21b..00000000
--- a/lib/apartment/adapters/sqlite3_adapter.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'apartment/adapters/abstract_adapter'
-
-module Apartment
-  module Tenant
-    def self.sqlite3_adapter(config)
-      Adapters::Sqlite3Adapter.new(config)
-    end
-  end
-
-  module Adapters
-    class Sqlite3Adapter < AbstractAdapter
-      def initialize(config)
-        @default_dir = File.expand_path(File.dirname(config[:database]))
-
-        super
-      end
-
-      def drop(tenant)
-        raise TenantNotFound,
-          "The tenant #{environmentify(tenant)} cannot be found." unless File.exists?(database_file(tenant))
-
-        File.delete(database_file(tenant))
-      end
-
-      def current
-        File.basename(Apartment.connection.instance_variable_get(:@config)[:database], '.sqlite3')
-      end
-
-    protected
-
-      def connect_to_new(tenant)
-        raise TenantNotFound,
-          "The tenant #{environmentify(tenant)} cannot be found." unless File.exists?(database_file(tenant))
-
-        super database_file(tenant)
-      end
-
-      def create_tenant(tenant)
-        raise TenantExists,
-          "The tenant #{environmentify(tenant)} already exists." if File.exists?(database_file(tenant))
-
-        begin
-          f = File.new(database_file(tenant), File::CREAT)
-        ensure
-          f.close
-        end
-      end
-
-    private
-
-      def database_file(tenant)
-        "#{@default_dir}/#{environmentify(tenant)}.sqlite3"
-      end
-    end
-  end
-end
diff --git a/lib/apartment/elevators/first_subdomain.rb b/lib/apartment/elevators/first_subdomain.rb
deleted file mode 100644
index 71d0d8d1..00000000
--- a/lib/apartment/elevators/first_subdomain.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'apartment/elevators/subdomain'
-
-module Apartment
-  module Elevators
-    # Provides a rack based tenant switching solution based on the first subdomain
-    # of a given domain name.
-    # eg:
-    #     - example1.domain.com               => example1
-    #     - example2.something.domain.com     => example2
-    class FirstSubdomain < Subdomain
-
-      def parse_tenant_name(request)
-        super.split('.')[0] unless super.nil?
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/apartment/railtie.rb b/lib/apartment/railtie.rb
index f011cbfd..debe3452 100644
--- a/lib/apartment/railtie.rb
+++ b/lib/apartment/railtie.rb
@@ -1,6 +1,6 @@
 require 'rails'
 require 'apartment/tenant'
-require 'apartment/reloader'
+require 'apartment/resolvers/database'
 
 module Apartment
   class Railtie < Rails::Railtie
@@ -12,11 +12,10 @@ class Railtie < Rails::Railtie
     config.before_initialize do
       Apartment.configure do |config|
         config.excluded_models = []
-        config.use_schemas = true
+        config.force_reconnect_on_switch = false
         config.tenant_names = []
         config.seed_after_create = false
-        config.prepend_environment = false
-        config.append_environment = false
+        config.tenant_resolver = Apartment::Resolvers::Database
       end
 
       ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
@@ -47,12 +46,6 @@ class Railtie < Rails::Railtie
     #   Note this is technically valid for any environment where cache_classes is false, for us, it's just development
     #
     if Rails.env.development?
-
-      # Apartment::Reloader is middleware to initialize things properly on each request to dev
-      initializer 'apartment.init' do |app|
-        app.config.middleware.use Apartment::Reloader
-      end
-
       # Overrides reload! to also call Apartment::Tenant.init as well so that the reloaded classes have the proper table_names
       console do
         require 'apartment/console'
diff --git a/lib/apartment/reloader.rb b/lib/apartment/reloader.rb
deleted file mode 100644
index fd315371..00000000
--- a/lib/apartment/reloader.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Apartment
-  class Reloader
-
-    #   Middleware used in development to init Apartment for each request
-    #   Necessary due to code reload (annoying).  When models are reloaded, they no longer have the proper table_name
-    #   That is prepended with the schema (if using postgresql schemas)
-    #   I couldn't figure out how to properly hook into the Rails reload process *after* files are reloaded
-    #   so I've used this in the meantime.
-    #
-    #   Also see apartment/console for the re-definition of reload! that re-init's Apartment
-    #
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      Tenant.init
-      @app.call(env)
-    end
-  end
-end
diff --git a/lib/apartment/resolvers/abstract.rb b/lib/apartment/resolvers/abstract.rb
new file mode 100644
index 00000000..0062e761
--- /dev/null
+++ b/lib/apartment/resolvers/abstract.rb
@@ -0,0 +1,15 @@
+module Apartment
+  module Resolvers
+    class Abstract
+      attr_accessor :init_config
+
+      def initialize(init_config)
+        @init_config = init_config.freeze
+      end
+
+      def resolve
+        raise "Cannot use abstract class directly"
+      end
+    end
+  end
+end
diff --git a/lib/apartment/resolvers/database.rb b/lib/apartment/resolvers/database.rb
new file mode 100644
index 00000000..92c1c3bd
--- /dev/null
+++ b/lib/apartment/resolvers/database.rb
@@ -0,0 +1,11 @@
+require 'apartment/resolvers/abstract'
+
+module Apartment
+  module Resolvers
+    class Database < Abstract
+      def resolve(tenant)
+        init_config.dup.tap{ |c| c[:database] = tenant }
+      end
+    end
+  end
+end
diff --git a/lib/apartment/resolvers/schema.rb b/lib/apartment/resolvers/schema.rb
new file mode 100644
index 00000000..a7703194
--- /dev/null
+++ b/lib/apartment/resolvers/schema.rb
@@ -0,0 +1,14 @@
+require 'apartment/resolvers/abstract'
+
+module Apartment
+  module Resolvers
+    class Schema < Abstract
+      def resolve(tenant)
+        schemas = [tenant, Apartment.persistent_schemas].flatten
+        search_path = schemas.map(&:inspect).join(", ")
+
+        init_config.dup.tap{ |c| c[:schema_search_path] = search_path }
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/apartment/tenant.rb b/lib/apartment/tenant.rb
index 7a4e33ca..d9c4b774 100644
--- a/lib/apartment/tenant.rb
+++ b/lib/apartment/tenant.rb
@@ -8,9 +8,9 @@ module Tenant
     extend self
     extend Forwardable
 
-    def_delegators :adapter, :create, :drop, :switch, :switch!, :current, :each, :reset, :set_callback, :seed, :current_tenant, :default_tenant
-
-    attr_writer :config
+    def_delegators :adapter, :create, :drop, :drop_schema, :switch, :switch!,
+      :current, :each, :reset, :set_callback, :seed, :current_tenant,
+      :default_tenant, :config_for
 
     #   Initialize Apartment config options such as excluded_models
     #
@@ -24,43 +24,32 @@ def init
     #
     def adapter
       Thread.current[:apartment_adapter] ||= begin
-        adapter_method = "#{config[:adapter]}_adapter"
-
-        if defined?(JRUBY_VERSION)
-          if config[:adapter] =~ /mysql/
-            adapter_method = 'jdbc_mysql_adapter'
-          elsif config[:adapter] =~ /postgresql/
-            adapter_method = 'jdbc_postgresql_adapter'
+        config = Apartment.default_tenant
+
+        adapter_name =
+          if defined?(JRUBY_VERSION)
+            if config[:adapter] =~ /mysql/
+              'jdbc_mysql_adapter'
+            elsif config[:adapter] =~ /postgresql/
+              'jdbc_postgresql_adapter'
+            end
+          else
+            "#{config[:adapter]}_adapter"
           end
-        end
 
         begin
-          require "apartment/adapters/#{adapter_method}"
-        rescue LoadError
-          raise "The adapter `#{adapter_method}` is not yet supported"
-        end
-
-        unless respond_to?(adapter_method)
-          raise AdapterNotFound, "database configuration specifies nonexistent #{config[:adapter]} adapter"
+          require "apartment/adapters/#{adapter_name}"
+          adapter_class = Adapters.const_get(adapter_name.classify)
+        rescue LoadError, NameError
+          raise AdapterNotFound, "The adapter `#{adapter_name}` is not yet supported"
         end
 
-        send(adapter_method, config)
+        adapter_class.new
       end
     end
 
-    #   Reset config and adapter so they are regenerated
-    #
-    def reload!(config = nil)
+    def reload!
       Thread.current[:apartment_adapter] = nil
-      @config = config
-    end
-
-    private
-
-    #   Fetch the rails database configuration
-    #
-    def config
-      @config ||= Apartment.connection_config
     end
   end
 end
diff --git a/lib/apartment/version.rb b/lib/apartment/version.rb
index 9b4808b2..aedfbb55 100644
--- a/lib/apartment/version.rb
+++ b/lib/apartment/version.rb
@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end
diff --git a/lib/tasks/apartment.rake b/lib/tasks/apartment.rake
index 3c70df94..a4187594 100644
--- a/lib/tasks/apartment.rake
+++ b/lib/tasks/apartment.rake
@@ -6,7 +6,6 @@ apartment_namespace = namespace :apartment do
   task create: 'db:migrate' do
     tenants.each do |tenant|
       begin
-        puts("Creating #{tenant} tenant")
         quietly { Apartment::Tenant.create(tenant) }
       rescue Apartment::TenantExists => e
         puts e.message
@@ -17,9 +16,9 @@ apartment_namespace = namespace :apartment do
   desc "Migrate all tenants"
   task :migrate do
     warn_if_tenants_empty
+
     tenants.each do |tenant|
       begin
-        puts("Migrating #{tenant} tenant")
         Apartment::Migrator.migrate tenant
       rescue Apartment::TenantNotFound => e
         puts e.message
@@ -33,7 +32,6 @@ apartment_namespace = namespace :apartment do
 
     tenants.each do |tenant|
       begin
-        puts("Seeding #{tenant} tenant")
         Apartment::Tenant.switch(tenant) do
           Apartment::Tenant.seed
         end
@@ -51,7 +49,6 @@ apartment_namespace = namespace :apartment do
 
     tenants.each do |tenant|
       begin
-        puts("Rolling back #{tenant} tenant")
         Apartment::Migrator.rollback tenant, step
       rescue Apartment::TenantNotFound => e
         puts e.message
@@ -69,7 +66,6 @@ apartment_namespace = namespace :apartment do
 
       tenants.each do |tenant|
         begin
-          puts("Migrating #{tenant} tenant up")
           Apartment::Migrator.run :up, tenant, version
         rescue Apartment::TenantNotFound => e
           puts e.message
@@ -86,7 +82,6 @@ apartment_namespace = namespace :apartment do
 
       tenants.each do |tenant|
         begin
-          puts("Migrating #{tenant} tenant down")
           Apartment::Migrator.run :down, tenant, version
         rescue Apartment::TenantNotFound => e
           puts e.message
diff --git a/notes.md b/notes.md
new file mode 100644
index 00000000..ea2ceebd
--- /dev/null
+++ b/notes.md
@@ -0,0 +1,28 @@
+# Notes
+
+- API:
+
+    Apartment::Tenant.switch("blah") do ...
+      -> - pass "blah" into `config_for`
+         - `config_for` uses the configured resolver to return a config hash
+            (either database or schema by default)
+         - connect_to_new determines what's different in the config with the
+           current
+         - if a 'local' switch is possible (e.g. host is unchanged), do that,
+           otherwise reconnect
+    Apartment::Tenant.switch({ host: etc }) do ...
+      -> - pass straight through to connection_handler
+
+
+    Apartment.configure do |config|
+      config.tenants = proc{ Customer.map(&:subdomain) }
+      config.tenant_decorator = ->(tenant){ "#{Rails.env}_#{tenant}" }
+      config.tenant_resolver = Resolvers::Database
+    end
+
+## Todo
+
+- rewrite generator
+- finish config tests (tenant resolver specifically)
+- write multi-threading tests
+- remove deprecated silencers?
diff --git a/spec/adapters/jdbc_mysql_adapter_spec.rb b/spec/adapters/jdbc_mysql_adapter_spec.rb
deleted file mode 100644
index 1fee3e14..00000000
--- a/spec/adapters/jdbc_mysql_adapter_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-if defined?(JRUBY_VERSION)
-
-  require 'spec_helper'
-  require 'apartment/adapters/jdbc_mysql_adapter'
-
-  describe Apartment::Adapters::JDBCMysqlAdapter, database: :mysql do
-
-    subject { Apartment::Tenant.jdbc_mysql_adapter config.symbolize_keys }
-
-    def tenant_names
-      ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect { |row| row['schema_name'] }
-    end
-
-    let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
-
-    it_should_behave_like "a generic apartment adapter"
-    it_should_behave_like "a connection based apartment adapter"
-  end
-end
diff --git a/spec/adapters/jdbc_postgresql_adapter_spec.rb b/spec/adapters/jdbc_postgresql_adapter_spec.rb
deleted file mode 100644
index 28cf135f..00000000
--- a/spec/adapters/jdbc_postgresql_adapter_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-if defined?(JRUBY_VERSION)
-
-  require 'spec_helper'
-  require 'apartment/adapters/jdbc_postgresql_adapter'
-
-  describe Apartment::Adapters::JDBCPostgresqlAdapter, database: :postgresql do
-
-    subject { Apartment::Tenant.jdbc_postgresql_adapter config.symbolize_keys }
-
-    context "using schemas" do
-
-      before { Apartment.use_schemas = true }
-
-      # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
-      def tenant_names
-        ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
-      end
-
-      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
-
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a schema based apartment adapter"
-    end
-
-    context "using databases" do
-
-      before { Apartment.use_schemas = false }
-
-      # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
-      def tenant_names
-        connection.execute("select datname from pg_database;").collect { |row| row['datname'] }
-      end
-
-      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
-
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a connection based apartment adapter"
-
-    end
-  end
-end
diff --git a/spec/adapters/mysql2_adapter_spec.rb b/spec/adapters/mysql2_adapter_spec.rb
deleted file mode 100644
index c3037a3a..00000000
--- a/spec/adapters/mysql2_adapter_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'spec_helper'
-require 'apartment/adapters/mysql2_adapter'
-
-describe Apartment::Adapters::Mysql2Adapter, database: :mysql do
-  unless defined?(JRUBY_VERSION)
-
-    subject(:adapter){ Apartment::Tenant.mysql2_adapter config }
-
-    def tenant_names
-      ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect { |row| row[0] }
-    end
-
-    let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
-
-    context "using - the equivalent of - schemas" do
-      before { Apartment.use_schemas = true }
-
-      it_should_behave_like "a generic apartment adapter"
-
-      describe "#default_tenant" do
-        it "is set to the original db from config" do
-          expect(subject.default_tenant).to eq(config[:database])
-        end
-      end
-
-      describe "#init" do
-        include Apartment::Spec::AdapterRequirements
-
-        before do
-          Apartment.configure do |config|
-            config.excluded_models = ["Company"]
-          end
-        end
-
-        it "should process model exclusions" do
-          Apartment::Tenant.init
-
-          expect(Company.table_name).to eq("#{default_tenant}.companies")
-        end
-      end
-    end
-
-    context "using connections" do
-      before { Apartment.use_schemas = false }
-
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a generic apartment adapter able to handle custom configuration"
-      it_should_behave_like "a connection based apartment adapter"
-    end
-  end
-end
diff --git a/spec/adapters/postgresql_adapter_spec.rb b/spec/adapters/postgresql_adapter_spec.rb
deleted file mode 100644
index e246fd10..00000000
--- a/spec/adapters/postgresql_adapter_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'spec_helper'
-require 'apartment/adapters/postgresql_adapter'
-
-describe Apartment::Adapters::PostgresqlAdapter, database: :postgresql do
-  unless defined?(JRUBY_VERSION)
-
-    subject{ Apartment::Tenant.postgresql_adapter config }
-
-    context "using schemas with schema.rb" do
-
-      before{ Apartment.use_schemas = true }
-
-      # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
-      def tenant_names
-        ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
-      end
-
-      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
-
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a schema based apartment adapter"
-    end
-
-    context "using schemas with SQL dump" do
-
-      before{ Apartment.use_schemas = true; Apartment.use_sql = true }
-
-      # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
-      def tenant_names
-        ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
-      end
-
-      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
-
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a schema based apartment adapter"
-
-      it 'allows for dashes in the schema name' do
-        expect { Apartment::Tenant.create('has-dashes') }.to_not raise_error
-      end
-
-      after { Apartment::Tenant.drop('has-dashes') if Apartment.connection.schema_exists? 'has-dashes' }
-    end
-
-    context "using connections" do
-
-      before{ Apartment.use_schemas = false }
-
-      # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
-      def tenant_names
-        connection.execute("select datname from pg_database;").collect { |row| row['datname'] }
-      end
-
-      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
-
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a generic apartment adapter able to handle custom configuration"
-      it_should_behave_like "a connection based apartment adapter"
-    end
-  end
-end
diff --git a/spec/adapters/sqlite3_adapter_spec.rb b/spec/adapters/sqlite3_adapter_spec.rb
deleted file mode 100644
index 55004952..00000000
--- a/spec/adapters/sqlite3_adapter_spec.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-require 'spec_helper'
-require 'apartment/adapters/sqlite3_adapter'
-
-describe Apartment::Adapters::Sqlite3Adapter, database: :sqlite do
-  unless defined?(JRUBY_VERSION)
-
-    subject{ Apartment::Tenant.sqlite3_adapter config }
-
-    context "using connections" do
-      def tenant_names
-        db_dir = File.expand_path("../../dummy/db", __FILE__)
-        Dir.glob("#{db_dir}/*.sqlite3").map { |file| File.basename(file, '.sqlite3') }
-      end
-
-      let(:default_tenant) do
-        subject.switch { File.basename(Apartment::Test.config['connections']['sqlite']['database'], '.sqlite3') }
-      end
-
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a connection based apartment adapter"
-
-      after(:all) do
-        File.delete(Apartment::Test.config['connections']['sqlite']['database'])
-      end
-    end
-
-    context "with prepend and append" do
-      let(:default_dir) { File.expand_path(File.dirname(config[:database])) }
-      describe "#prepend" do
-        let (:db_name) { "db_with_prefix" }
-        before do
-          Apartment.configure do |config|
-            config.prepend_environment = true
-            config.append_environment = false
-          end
-        end
-
-        after { subject.drop db_name rescue nil }
-
-        it "should create a new database" do
-          subject.create db_name
-
-          expect(File.exists?("#{default_dir}/#{Rails.env}_#{db_name}.sqlite3")).to eq true
-        end
-      end
-
-      describe "#neither" do
-        let (:db_name) { "db_without_prefix_suffix" }
-        before do
-          Apartment.configure { |config| config.prepend_environment = config.append_environment = false }
-        end
-
-        after { subject.drop db_name rescue nil }
-
-        it "should create a new database" do
-          subject.create db_name
-
-          expect(File.exists?("#{default_dir}/#{db_name}.sqlite3")).to eq true
-        end
-      end
-
-      describe "#append" do
-        let (:db_name) { "db_with_suffix" }
-        before do
-          Apartment.configure do |config|
-            config.prepend_environment = false
-            config.append_environment = true
-          end
-        end
-
-        after { subject.drop db_name rescue nil }
-
-        it "should create a new database" do
-          subject.create db_name
-
-          expect(File.exists?("#{default_dir}/#{db_name}_#{Rails.env}.sqlite3")).to eq true
-        end
-      end
-
-    end
-
-  end
-end
diff --git a/spec/apartment_spec.rb b/spec/apartment_spec.rb
deleted file mode 100644
index b00e0b2d..00000000
--- a/spec/apartment_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Apartment do
-  it "should be valid" do
-    expect(Apartment).to be_a(Module)
-  end
-
-  it "should be a valid app" do
-    expect(::Rails.application).to be_a(Dummy::Application)
-  end
-end
diff --git a/spec/dummy/db/migrate/20110613152810_create_dummy_models.rb b/spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
deleted file mode 100644
index ce8375f4..00000000
--- a/spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-class CreateDummyModels < ActiveRecord::Migration
-  def self.up
-    create_table :companies do |t|
-      t.boolean :dummy
-      t.string :database
-    end
-
-    create_table :users do |t|
-      t.string :name
-      t.datetime :birthdate
-      t.string :sex
-     end
-
-     create_table :delayed_jobs do |t|
-       t.integer  :priority,   :default => 0
-       t.integer  :attempts,   :default => 0
-       t.text     :handler
-       t.text     :last_error
-       t.datetime :run_at
-       t.datetime :locked_at
-       t.datetime :failed_at
-       t.string   :locked_by
-       t.datetime :created_at
-       t.datetime :updated_at
-       t.string   :queue
-     end
-
-     add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  end
-
-  def self.down
-    drop_table :companies
-    drop_table :users
-    drop_table :delayed_jobs
-  end
-
-end
diff --git a/spec/dummy/db/migrate/20111202022214_create_table_books.rb b/spec/dummy/db/migrate/20111202022214_create_table_books.rb
deleted file mode 100644
index ddaba1ad..00000000
--- a/spec/dummy/db/migrate/20111202022214_create_table_books.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateTableBooks < ActiveRecord::Migration
-  def up
-    create_table :books do |t|
-      t.string :name
-      t.integer :pages
-      t.datetime :published
-    end
-  end
-
-  def down
-    drop_table :books
-  end
-end
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
deleted file mode 100644
index 4dbc011d..00000000
--- a/spec/dummy/db/schema.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20111202022214) do
-
-  create_table "books", :force => true do |t|
-    t.string   "name"
-    t.integer  "pages"
-    t.datetime "published"
-  end
-
-  create_table "companies", :force => true do |t|
-    t.boolean "dummy"
-    t.string  "database"
-  end
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
-    t.text     "handler"
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "queue"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.datetime "birthdate"
-    t.string   "sex"
-  end
-
-end
diff --git a/spec/dummy_engine/.gitignore b/spec/dummy_engine/.gitignore
deleted file mode 100644
index de5d954f..00000000
--- a/spec/dummy_engine/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.bundle/
-log/*.log
-pkg/
-test/dummy/db/*.sqlite3
-test/dummy/db/*.sqlite3-journal
-test/dummy/log/*.log
-test/dummy/tmp/
-test/dummy/.sass-cache
diff --git a/spec/dummy_engine/Gemfile b/spec/dummy_engine/Gemfile
deleted file mode 100644
index 2ae66b0d..00000000
--- a/spec/dummy_engine/Gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-# Declare your gem's dependencies in dummy_engine.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
-gemspec
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'debugger'
-gem 'apartment', path: '../../'
diff --git a/spec/dummy_engine/Rakefile b/spec/dummy_engine/Rakefile
deleted file mode 100644
index 565abf87..00000000
--- a/spec/dummy_engine/Rakefile
+++ /dev/null
@@ -1,34 +0,0 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'DummyEngine'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test
diff --git a/spec/dummy_engine/bin/rails b/spec/dummy_engine/bin/rails
deleted file mode 100755
index cb6a9e45..00000000
--- a/spec/dummy_engine/bin/rails
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/dummy_engine/engine', __FILE__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'rails/all'
-require 'rails/engine/commands'
diff --git a/spec/dummy_engine/config/initializers/apartment.rb b/spec/dummy_engine/config/initializers/apartment.rb
deleted file mode 100644
index a1367900..00000000
--- a/spec/dummy_engine/config/initializers/apartment.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# Require whichever elevator you're using below here...
-#
-# require 'apartment/elevators/generic'
-# require 'apartment/elevators/domain'
-require 'apartment/elevators/subdomain'
-
-#
-# Apartment Configuration
-#
-Apartment.configure do |config|
-
-  # These models will not be multi-tenanted,
-  # but remain in the global (public) namespace
-  #
-  # An example might be a Customer or Tenant model that stores each tenant information
-  # ex:
-  #
-  # config.excluded_models = %w{Tenant}
-  #
-  config.excluded_models = %w{}
-
-  # use postgres schemas?
-  config.use_schemas = true
-
-  # use raw SQL dumps for creating postgres schemas? (only appies with use_schemas set to true)
-  #config.use_sql = true
-
-  # configure persistent schemas (E.g. hstore )
-  # config.persistent_schemas = %w{ hstore }
-
-  # add the Rails environment to database names?
-  # config.prepend_environment = true
-  # config.append_environment = true
-
-  # supply list of database names for migrations to run on
-  # config.tenant_names = lambda{ ToDo_Tenant_Or_User_Model.pluck :database }
-
-  # Specify a connection other than ActiveRecord::Base for apartment to use (only needed if your models are using a different connection)
-  # config.connection_class = ActiveRecord::Base
-end
-
-##
-# Elevator Configuration
-
-# Rails.application.config.middleware.use 'Apartment::Elevators::Generic', lambda { |request|
-#   # TODO: supply generic implementation
-# }
-
-# Rails.application.config.middleware.use 'Apartment::Elevators::Domain'
-
-Rails.application.config.middleware.use Apartment::Elevators::Subdomain
diff --git a/spec/dummy_engine/dummy_engine.gemspec b/spec/dummy_engine/dummy_engine.gemspec
deleted file mode 100644
index d17f9156..00000000
--- a/spec/dummy_engine/dummy_engine.gemspec
+++ /dev/null
@@ -1,24 +0,0 @@
-$:.push File.expand_path("../lib", __FILE__)
-
-# Maintain your gem's version:
-require "dummy_engine/version"
-
-# Describe your gem and declare its dependencies:
-Gem::Specification.new do |s|
-  s.name        = "dummy_engine"
-  s.version     = DummyEngine::VERSION
-  s.authors     = ["Your name"]
-  s.email       = ["Your email"]
-  s.homepage    = ""
-  s.summary     = "Summary of DummyEngine."
-  s.description = "Description of DummyEngine."
-  s.license     = "MIT"
-
-  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
-  s.test_files = Dir["test/**/*"]
-
-  s.add_dependency "rails", "~> 4.1.6"
-  s.add_dependency "apartment"
-
-  s.add_development_dependency "sqlite3"
-end
diff --git a/spec/dummy_engine/lib/dummy_engine.rb b/spec/dummy_engine/lib/dummy_engine.rb
deleted file mode 100644
index b1a14145..00000000
--- a/spec/dummy_engine/lib/dummy_engine.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require "dummy_engine/engine"
-
-module DummyEngine
-end
diff --git a/spec/dummy_engine/lib/dummy_engine/engine.rb b/spec/dummy_engine/lib/dummy_engine/engine.rb
deleted file mode 100644
index cc8821c3..00000000
--- a/spec/dummy_engine/lib/dummy_engine/engine.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module DummyEngine
-  class Engine < ::Rails::Engine
-  end
-end
diff --git a/spec/dummy_engine/lib/dummy_engine/version.rb b/spec/dummy_engine/lib/dummy_engine/version.rb
deleted file mode 100644
index 82d2c8b8..00000000
--- a/spec/dummy_engine/lib/dummy_engine/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module DummyEngine
-  VERSION = "0.0.1"
-end
diff --git a/spec/dummy_engine/test/dummy/Rakefile b/spec/dummy_engine/test/dummy/Rakefile
deleted file mode 100644
index ba6b733d..00000000
--- a/spec/dummy_engine/test/dummy/Rakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Rails.application.load_tasks
diff --git a/spec/dummy_engine/test/dummy/config.ru b/spec/dummy_engine/test/dummy/config.ru
deleted file mode 100644
index 5bc2a619..00000000
--- a/spec/dummy_engine/test/dummy/config.ru
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require ::File.expand_path('../config/environment',  __FILE__)
-run Rails.application
diff --git a/spec/dummy_engine/test/dummy/config/application.rb b/spec/dummy_engine/test/dummy/config/application.rb
deleted file mode 100644
index 5ef001e9..00000000
--- a/spec/dummy_engine/test/dummy/config/application.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-Bundler.require(*Rails.groups)
-require "dummy_engine"
-
-module Dummy
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-  end
-end
diff --git a/spec/dummy_engine/test/dummy/config/boot.rb b/spec/dummy_engine/test/dummy/config/boot.rb
deleted file mode 100644
index 6266cfc5..00000000
--- a/spec/dummy_engine/test/dummy/config/boot.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
diff --git a/spec/dummy_engine/test/dummy/config/database.yml b/spec/dummy_engine/test/dummy/config/database.yml
deleted file mode 100644
index 1c1a37ca..00000000
--- a/spec/dummy_engine/test/dummy/config/database.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
-default: &default
-  adapter: sqlite3
-  pool: 5
-  timeout: 5000
-
-development:
-  <<: *default
-  database: db/development.sqlite3
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: db/test.sqlite3
-
-production:
-  <<: *default
-  database: db/production.sqlite3
diff --git a/spec/dummy_engine/test/dummy/config/environment.rb b/spec/dummy_engine/test/dummy/config/environment.rb
deleted file mode 100644
index ee8d90dc..00000000
--- a/spec/dummy_engine/test/dummy/config/environment.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Load the Rails application.
-require File.expand_path('../application', __FILE__)
-
-# Initialize the Rails application.
-Rails.application.initialize!
diff --git a/spec/dummy_engine/test/dummy/config/environments/development.rb b/spec/dummy_engine/test/dummy/config/environments/development.rb
deleted file mode 100644
index ddf0e90c..00000000
--- a/spec/dummy_engine/test/dummy/config/environments/development.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-Rails.application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
-
-  # Do not eager load code on boot.
-  config.eager_load = false
-
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
-
-  # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
-
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
-end
diff --git a/spec/dummy_engine/test/dummy/config/environments/production.rb b/spec/dummy_engine/test/dummy/config/environments/production.rb
deleted file mode 100644
index b93a877c..00000000
--- a/spec/dummy_engine/test/dummy/config/environments/production.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-Rails.application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # Code is not reloaded between requests.
-  config.cache_classes = true
-
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both threaded web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
-  config.eager_load = true
-
-  # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
-  # config.action_dispatch.rack_cache = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
-
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
-  # Generate digests for assets URLs.
-  config.assets.digest = true
-
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
-  # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
-
-  # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation cannot be found).
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
-
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
-
-  # Do not dump schema after migrations.
-  config.active_record.dump_schema_after_migration = false
-end
diff --git a/spec/dummy_engine/test/dummy/config/environments/test.rb b/spec/dummy_engine/test/dummy/config/environments/test.rb
deleted file mode 100644
index 053f5b66..00000000
--- a/spec/dummy_engine/test/dummy/config/environments/test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-Rails.application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # The test environment is used exclusively to run your application's
-  # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
-
-  # Do not eager load code on boot. This avoids loading your whole application
-  # just for the purpose of running a single test. If you are using a tool that
-  # preloads Rails for running tests, you may have to set it to true.
-  config.eager_load = false
-
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
-  config.static_cache_control = 'public, max-age=3600'
-
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Raise exceptions instead of rendering exception templates.
-  config.action_dispatch.show_exceptions = false
-
-  # Disable request forgery protection in test environment.
-  config.action_controller.allow_forgery_protection = false
-
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Print deprecation notices to the stderr.
-  config.active_support.deprecation = :stderr
-
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
-end
diff --git a/spec/dummy_engine/test/dummy/config/initializers/assets.rb b/spec/dummy_engine/test/dummy/config/initializers/assets.rb
deleted file mode 100644
index d2f4ec33..00000000
--- a/spec/dummy_engine/test/dummy/config/initializers/assets.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/spec/dummy_engine/test/dummy/config/initializers/backtrace_silencers.rb b/spec/dummy_engine/test/dummy/config/initializers/backtrace_silencers.rb
deleted file mode 100644
index 59385cdf..00000000
--- a/spec/dummy_engine/test/dummy/config/initializers/backtrace_silencers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
-
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
diff --git a/spec/dummy_engine/test/dummy/config/initializers/cookies_serializer.rb b/spec/dummy_engine/test/dummy/config/initializers/cookies_serializer.rb
deleted file mode 100644
index 7a06a89f..00000000
--- a/spec/dummy_engine/test/dummy/config/initializers/cookies_serializer.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-Rails.application.config.action_dispatch.cookies_serializer = :json
\ No newline at end of file
diff --git a/spec/dummy_engine/test/dummy/config/initializers/filter_parameter_logging.rb b/spec/dummy_engine/test/dummy/config/initializers/filter_parameter_logging.rb
deleted file mode 100644
index 4a994e1e..00000000
--- a/spec/dummy_engine/test/dummy/config/initializers/filter_parameter_logging.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
diff --git a/spec/dummy_engine/test/dummy/config/initializers/inflections.rb b/spec/dummy_engine/test/dummy/config/initializers/inflections.rb
deleted file mode 100644
index ac033bf9..00000000
--- a/spec/dummy_engine/test/dummy/config/initializers/inflections.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format. Inflections
-# are locale specific, and you may define rules for as many different
-# locales as you wish. All of these examples are active by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-
-# These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
-# end
diff --git a/spec/dummy_engine/test/dummy/config/initializers/mime_types.rb b/spec/dummy_engine/test/dummy/config/initializers/mime_types.rb
deleted file mode 100644
index dc189968..00000000
--- a/spec/dummy_engine/test/dummy/config/initializers/mime_types.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
diff --git a/spec/dummy_engine/test/dummy/config/initializers/session_store.rb b/spec/dummy_engine/test/dummy/config/initializers/session_store.rb
deleted file mode 100644
index e766b67b..00000000
--- a/spec/dummy_engine/test/dummy/config/initializers/session_store.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-Rails.application.config.session_store :cookie_store, key: '_dummy_session'
diff --git a/spec/dummy_engine/test/dummy/config/initializers/wrap_parameters.rb b/spec/dummy_engine/test/dummy/config/initializers/wrap_parameters.rb
deleted file mode 100644
index 33725e95..00000000
--- a/spec/dummy_engine/test/dummy/config/initializers/wrap_parameters.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# This file contains settings for ActionController::ParamsWrapper which
-# is enabled by default.
-
-# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
-end
-
-# To enable root element in JSON for ActiveRecord objects.
-# ActiveSupport.on_load(:active_record) do
-#  self.include_root_in_json = true
-# end
diff --git a/spec/dummy_engine/test/dummy/config/locales/en.yml b/spec/dummy_engine/test/dummy/config/locales/en.yml
deleted file mode 100644
index 06539571..00000000
--- a/spec/dummy_engine/test/dummy/config/locales/en.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
-en:
-  hello: "Hello world"
diff --git a/spec/dummy_engine/test/dummy/config/routes.rb b/spec/dummy_engine/test/dummy/config/routes.rb
deleted file mode 100644
index 3f66539d..00000000
--- a/spec/dummy_engine/test/dummy/config/routes.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-Rails.application.routes.draw do
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-end
diff --git a/spec/dummy_engine/test/dummy/config/secrets.yml b/spec/dummy_engine/test/dummy/config/secrets.yml
deleted file mode 100644
index ee200137..00000000
--- a/spec/dummy_engine/test/dummy/config/secrets.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rake secret` to generate a secure secret key.
-
-# Make sure the secrets in this file are kept private
-# if you're sharing your code publicly.
-
-development:
-  secret_key_base: bb62b819b585a74e69c797f9d03d5a004d8fe82a8e7a7da6fa2f7923030713b7b087c12cc7a918e71073c38afb343f7223d22ba3f1b223b7e76dbf8d5b65fa2c
-
-test:
-  secret_key_base: 67945d3b189c71dffef98de2bb7c14d6fb059679c115ca3cddf65c88babe130afe4d583560d0e308b017dd76ce305bef4159d876de9fd893952d9cbf269c8476
-
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
-production:
-  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/spec/examples/connection_adapter_examples.rb b/spec/examples/connection_adapter_examples.rb
deleted file mode 100644
index 1d2b9aa2..00000000
--- a/spec/examples/connection_adapter_examples.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-shared_examples_for "a connection based apartment adapter" do
-  include Apartment::Spec::AdapterRequirements
-
-  let(:default_tenant){ subject.switch{ ActiveRecord::Base.connection.current_database } }
-
-  describe "#init" do
-    it "should process model exclusions" do
-      Apartment.configure do |config|
-        config.excluded_models = ["Company"]
-      end
-      Apartment::Tenant.init
-
-      expect(Company.connection.object_id).not_to eq(ActiveRecord::Base.connection.object_id)
-    end
-  end
-
-  describe "#drop" do
-    it "should raise an error for unknown database" do
-      expect {
-        subject.drop 'unknown_database'
-      }.to raise_error(Apartment::TenantNotFound)
-    end
-  end
-
-  describe "#switch!" do
-    it "should raise an error if database is invalid" do
-      expect {
-        subject.switch! 'unknown_database'
-      }.to raise_error(Apartment::TenantNotFound)
-    end
-  end
-end
diff --git a/spec/examples/generic_adapter_custom_configuration_example.rb b/spec/examples/generic_adapter_custom_configuration_example.rb
deleted file mode 100644
index a9f053a3..00000000
--- a/spec/examples/generic_adapter_custom_configuration_example.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-require 'spec_helper'
-
-shared_examples_for "a generic apartment adapter able to handle custom configuration" do
-
-  let(:custom_tenant_name) { 'test_tenantwwww' }
-  let(:db) { |example| example.metadata[:database]}
-  let(:custom_tenant_names) do
-    {
-      custom_tenant_name => get_custom_db_conf
-    }
-  end
-
-  before do
-    Apartment.tenant_names = custom_tenant_names
-    Apartment.with_multi_server_setup = true
-  end
-
-  after do
-    Apartment.with_multi_server_setup = false
-  end
-
-  context "database key taken from specific config" do
-
-    let(:expected_args) { get_custom_db_conf }
-
-    describe "#create" do
-      it "should establish_connection with the separate connection with expected args" do
-        expect(Apartment::Adapters::AbstractAdapter::SeparateDbConnectionHandler).to receive(:establish_connection).with(expected_args).and_call_original
-
-        # because we dont have another server to connect to it errors
-        # what matters is establish_connection receives proper args
-        expect { subject.create(custom_tenant_name) }.to raise_error(Apartment::TenantExists)
-      end
-    end
-
-    describe "#drop" do
-      it "should establish_connection with the separate connection with expected args" do
-        expect(Apartment::Adapters::AbstractAdapter::SeparateDbConnectionHandler).to receive(:establish_connection).with(expected_args).and_call_original
-
-        # because we dont have another server to connect to it errors
-        # what matters is establish_connection receives proper args
-        expect { subject.drop(custom_tenant_name) }.to raise_error(Apartment::TenantNotFound)
-      end
-    end
-  end
-
-  context "database key from tenant name" do
-
-    let(:expected_args) {
-      get_custom_db_conf.tap {|args| args.delete(:database) }
-    }
-
-    describe "#switch!" do
-
-      it "should connect to new db" do
-        expect(Apartment).to receive(:establish_connection) do |args|
-          db_name = args.delete(:database)
-
-          expect(args).to eq expected_args
-          expect(db_name).to match custom_tenant_name
-
-          # we only need to check args, then we short circuit
-          # in order to avoid the mess due to the `establish_connection` override
-          raise ActiveRecord::ActiveRecordError
-        end
-
-        expect { subject.switch!(custom_tenant_name) }.to raise_error(Apartment::TenantNotFound)
-      end
-    end
-  end
-
-  def specific_connection
-    {
-      postgresql: {
-        adapter:  'postgresql',
-        database: 'override_database',
-        password: 'override_password',
-        username: 'overridepostgres'
-      },
-      mysql: {
-        adapter:  'mysql2',
-        database: 'override_database',
-        username: 'root'
-      },
-      sqlite: {
-        adapter:  'sqlite3',
-        database: 'override_database'
-      }
-    }
-  end
-
-  def get_custom_db_conf
-    specific_connection[db.to_sym].with_indifferent_access
-  end
-end
diff --git a/spec/examples/generic_adapter_examples.rb b/spec/examples/generic_adapter_examples.rb
deleted file mode 100644
index d77166ba..00000000
--- a/spec/examples/generic_adapter_examples.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-require 'spec_helper'
-
-shared_examples_for "a generic apartment adapter" do
-  include Apartment::Spec::AdapterRequirements
-
-  before {
-    Apartment.prepend_environment = false
-    Apartment.append_environment = false
-  }
-
-  describe "#init" do
-    it "should not retain a connection after railtie" do
-      # this test should work on rails >= 4, the connection pool code is
-      # completely different for 3.2 so we'd have to have a messy conditional..
-      unless Rails::VERSION::MAJOR < 4
-        ActiveRecord::Base.connection_pool.disconnect!
-
-        Apartment::Railtie.config.to_prepare_blocks.map(&:call)
-
-        num_available_connections = Apartment.connection_class.connection_pool
-          .instance_variable_get(:@available)
-          .instance_variable_get(:@queue)
-          .size
-
-        expect(num_available_connections).to eq(1)
-      end
-    end
-  end
-
-  #
-  #   Creates happen already in our before_filter
-  #
-  describe "#create" do
-
-    it "should create the new databases" do
-      expect(tenant_names).to include(db1)
-      expect(tenant_names).to include(db2)
-    end
-
-    it "should load schema.rb to new schema" do
-      subject.switch(db1) do
-        expect(connection.tables).to include('companies')
-      end
-    end
-
-    it "should yield to block if passed and reset" do
-      subject.drop(db2) # so we don't get errors on creation
-
-      @count = 0  # set our variable so its visible in and outside of blocks
-
-      subject.create(db2) do
-        @count = User.count
-        expect(subject.current).to eq(db2)
-        User.create
-      end
-
-      expect(subject.current).not_to eq(db2)
-
-      subject.switch(db2){ expect(User.count).to eq(@count + 1) }
-    end
-  end
-
-  describe "#drop" do
-    it "should remove the db" do
-      subject.drop db1
-      expect(tenant_names).not_to include(db1)
-    end
-  end
-
-  describe "#switch!" do
-    it "should connect to new db" do
-      subject.switch!(db1)
-      expect(subject.current).to eq(db1)
-    end
-
-    it "should reset connection if database is nil" do
-      subject.switch!
-      expect(subject.current).to eq(default_tenant)
-    end
-
-    it "should raise an error if database is invalid" do
-      expect {
-        subject.switch! 'unknown_database'
-      }.to raise_error(Apartment::ApartmentError)
-    end
-  end
-
-  describe "#switch" do
-    it "connects and resets the tenant" do
-      subject.switch(db1) do
-        expect(subject.current).to eq(db1)
-      end
-      expect(subject.current).to eq(default_tenant)
-    end
-
-    # We're often finding when using Apartment in tests, the `current` (ie the previously connect to db)
-    # gets dropped, but switch will try to return to that db in a test.  We should just reset if it doesn't exist
-    it "should not throw exception if current is no longer accessible" do
-      subject.switch!(db2)
-
-      expect {
-        subject.switch(db1){ subject.drop(db2) }
-      }.to_not raise_error
-    end
-  end
-
-  describe "#reset" do
-    it "should reset connection" do
-      subject.switch!(db1)
-      subject.reset
-      expect(subject.current).to eq(default_tenant)
-    end
-  end
-
-  describe "#current" do
-    it "should return the current db name" do
-      subject.switch!(db1)
-      expect(subject.current).to eq(db1)
-    end
-  end
-
-  describe "#each" do
-    it "iterates over each tenant by default" do
-      result = []
-      Apartment.tenant_names = [db2, db1]
-
-      subject.each do |tenant|
-        result << tenant
-        expect(subject.current).to eq(tenant)
-      end
-
-      expect(result).to eq([db2, db1])
-    end
-
-    it "iterates over the given tenants" do
-      result = []
-      Apartment.tenant_names = [db2]
-
-      subject.each([db2]) do |tenant|
-        result << tenant
-        expect(subject.current).to eq(tenant)
-      end
-
-      expect(result).to eq([db2])
-    end
-  end
-end
diff --git a/spec/examples/schema_adapter_examples.rb b/spec/examples/schema_adapter_examples.rb
deleted file mode 100644
index 1800e86d..00000000
--- a/spec/examples/schema_adapter_examples.rb
+++ /dev/null
@@ -1,226 +0,0 @@
-require 'spec_helper'
-
-shared_examples_for "a schema based apartment adapter" do
-  include Apartment::Spec::AdapterRequirements
-
-  let(:schema1){ db1 }
-  let(:schema2){ db2 }
-  let(:public_schema){ default_tenant }
-
-  describe "#init" do
-
-    before do
-      Apartment.configure do |config|
-        config.excluded_models = ["Company"]
-      end
-    end
-
-    it "should process model exclusions" do
-      Apartment::Tenant.init
-
-      expect(Company.table_name).to eq("public.companies")
-    end
-
-    context "with a default_schema", :default_schema => true do
-
-      it "should set the proper table_name on excluded_models" do
-        Apartment::Tenant.init
-
-        expect(Company.table_name).to eq("#{default_schema}.companies")
-      end
-
-      it 'sets the search_path correctly' do
-        Apartment::Tenant.init
-
-        expect(User.connection.schema_search_path).to match(%r|#{default_schema}|)
-      end
-    end
-
-    context "persistent_schemas", :persistent_schemas => true do
-      it "sets the persistent schemas in the schema_search_path" do
-        Apartment::Tenant.init
-        expect(connection.schema_search_path).to end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
-      end
-    end
-  end
-
-  #
-  #   Creates happen already in our before_filter
-  #
-  describe "#create" do
-
-    it "should load schema.rb to new schema" do
-      connection.schema_search_path = schema1
-      expect(connection.tables).to include('companies')
-    end
-
-    it "should yield to block if passed and reset" do
-      subject.drop(schema2) # so we don't get errors on creation
-
-      @count = 0  # set our variable so its visible in and outside of blocks
-
-      subject.create(schema2) do
-        @count = User.count
-        expect(connection.schema_search_path).to start_with %{"#{schema2}"}
-        User.create
-      end
-
-      expect(connection.schema_search_path).not_to start_with %{"#{schema2}"}
-
-      subject.switch(schema2){ expect(User.count).to eq(@count + 1) }
-    end
-
-    context "numeric database names" do
-      let(:db){ 1234 }
-      it "should allow them" do
-        expect {
-          subject.create(db)
-        }.to_not raise_error
-        expect(tenant_names).to include(db.to_s)
-      end
-
-      after{ subject.drop(db) }
-    end
-
-  end
-
-  describe "#drop" do
-    it "should raise an error for unknown database" do
-      expect {
-        subject.drop "unknown_database"
-      }.to raise_error(Apartment::TenantNotFound)
-    end
-
-    context "numeric database names" do
-      let(:db){ 1234 }
-
-      it "should be able to drop them" do
-        subject.create(db)
-        expect {
-          subject.drop(db)
-        }.to_not raise_error
-        expect(tenant_names).not_to include(db.to_s)
-      end
-
-      after { subject.drop(db) rescue nil }
-    end
-  end
-
-  describe "#switch" do
-    it "connects and resets" do
-      subject.switch(schema1) do
-        expect(connection.schema_search_path).to start_with %{"#{schema1}"}
-      end
-
-      expect(connection.schema_search_path).to start_with %{"#{public_schema}"}
-    end
-  end
-
-  describe "#reset" do
-    it "should reset connection" do
-      subject.switch!(schema1)
-      subject.reset
-      expect(connection.schema_search_path).to start_with %{"#{public_schema}"}
-    end
-
-    context "with default_schema", :default_schema => true do
-      it "should reset to the default schema" do
-        subject.switch!(schema1)
-        subject.reset
-        expect(connection.schema_search_path).to start_with %{"#{default_schema}"}
-      end
-    end
-
-    context "persistent_schemas", :persistent_schemas => true do
-      before do
-        subject.switch!(schema1)
-        subject.reset
-      end
-
-      it "maintains the persistent schemas in the schema_search_path" do
-        expect(connection.schema_search_path).to end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
-      end
-
-      context "with default_schema", :default_schema => true do
-        it "prioritizes the switched schema to front of schema_search_path" do
-          subject.reset # need to re-call this as the default_schema wasn't set at the time that the above reset ran
-          expect(connection.schema_search_path).to start_with %{"#{default_schema}"}
-        end
-      end
-    end
-  end
-
-  describe "#switch!" do
-    it "should connect to new schema" do
-      subject.switch!(schema1)
-      expect(connection.schema_search_path).to start_with %{"#{schema1}"}
-    end
-
-    it "should reset connection if database is nil" do
-      subject.switch!
-      expect(connection.schema_search_path).to eq(%{"#{public_schema}"})
-    end
-
-    it "should raise an error if schema is invalid" do
-      expect {
-        subject.switch! 'unknown_schema'
-      }.to raise_error(Apartment::TenantNotFound)
-    end
-
-    context "numeric databases" do
-      let(:db){ 1234 }
-
-      it "should connect to them" do
-        subject.create(db)
-        expect {
-          subject.switch!(db)
-        }.to_not raise_error
-
-        expect(connection.schema_search_path).to start_with %{"#{db.to_s}"}
-      end
-
-      after{ subject.drop(db) }
-    end
-
-    describe "with default_schema specified", :default_schema => true do
-      before do
-        subject.switch!(schema1)
-      end
-
-      it "should switch out the default schema rather than public" do
-        expect(connection.schema_search_path).not_to include default_schema
-      end
-
-      it "should still switch to the switched schema" do
-        expect(connection.schema_search_path).to start_with %{"#{schema1}"}
-      end
-    end
-
-    context "persistent_schemas", :persistent_schemas => true do
-
-      before{ subject.switch!(schema1) }
-
-      it "maintains the persistent schemas in the schema_search_path" do
-        expect(connection.schema_search_path).to end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
-      end
-
-      it "prioritizes the switched schema to front of schema_search_path" do
-        expect(connection.schema_search_path).to start_with %{"#{schema1}"}
-      end
-    end
-  end
-
-  describe "#current" do
-    it "should return the current schema name" do
-      subject.switch!(schema1)
-      expect(subject.current).to eq(schema1)
-    end
-
-    context "persistent_schemas", :persistent_schemas => true do
-      it "should exlude persistent_schemas" do
-        subject.switch!(schema1)
-        expect(subject.current).to eq(schema1)
-      end
-    end
-  end
-end
diff --git a/spec/integration/apartment_rake_integration_spec.rb b/spec/integration/apartment_rake_integration_spec.rb
deleted file mode 100644
index e343b3f8..00000000
--- a/spec/integration/apartment_rake_integration_spec.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-require 'spec_helper'
-require 'rake'
-
-describe "apartment rake tasks", database: :postgresql do
-
-  before do
-    @rake = Rake::Application.new
-    Rake.application = @rake
-    Dummy::Application.load_tasks
-
-    # rails tasks running F up the schema...
-    Rake::Task.define_task('db:migrate')
-    Rake::Task.define_task('db:seed')
-    Rake::Task.define_task('db:rollback')
-    Rake::Task.define_task('db:migrate:up')
-    Rake::Task.define_task('db:migrate:down')
-    Rake::Task.define_task('db:migrate:redo')
-
-    Apartment.configure do |config|
-      config.use_schemas = true
-      config.excluded_models = ["Company"]
-      config.tenant_names = lambda{ Company.pluck(:database) }
-    end
-    Apartment::Tenant.reload!(config)
-
-    # fix up table name of shared/excluded models
-    Company.table_name = 'public.companies'
-  end
-
-  after { Rake.application = nil }
-
-  context "with x number of databases" do
-
-    let(:x){ 1 + rand(5) }    # random number of dbs to create
-    let(:db_names){ x.times.map{ Apartment::Test.next_db } }
-    let!(:company_count){ db_names.length }
-
-    before do
-      db_names.collect do |db_name|
-        Apartment::Tenant.create(db_name)
-        Company.create :database => db_name
-      end
-    end
-
-    after do
-      db_names.each{ |db| Apartment::Tenant.drop(db) }
-      Company.delete_all
-    end
-
-    describe "#migrate" do
-      it "should migrate all databases" do
-        expect(ActiveRecord::Migrator).to receive(:migrate).exactly(company_count).times
-
-        @rake['apartment:migrate'].invoke
-      end
-    end
-
-    describe "#rollback" do
-      it "should rollback all dbs" do
-        expect(ActiveRecord::Migrator).to receive(:rollback).exactly(company_count).times
-
-        @rake['apartment:rollback'].invoke
-      end
-    end
-
-    describe "apartment:seed" do
-      it "should seed all databases" do
-        expect(Apartment::Tenant).to receive(:seed).exactly(company_count).times
-
-        @rake['apartment:seed'].invoke
-      end
-    end
-  end
-end
diff --git a/spec/integration/query_caching_spec.rb b/spec/integration/query_caching_spec.rb
deleted file mode 100644
index 8030bbf3..00000000
--- a/spec/integration/query_caching_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe 'query caching' do
-  let(:db_names) { [db1, db2] }
-
-  before do
-    Apartment.configure do |config|
-      config.excluded_models = ["Company"]
-      config.tenant_names = lambda{ Company.pluck(:database) }
-      config.use_schemas = true
-    end
-
-    Apartment::Tenant.reload!(config)
-
-    db_names.each do |db_name|
-      Apartment::Tenant.create(db_name)
-      Company.create database: db_name
-    end
-  end
-
-  after do
-    db_names.each{ |db| Apartment::Tenant.drop(db) }
-    Apartment::Tenant.reset
-    Company.delete_all
-  end
-
-  it 'clears the ActiveRecord::QueryCache after switching databases' do
-    db_names.each do |db_name|
-      Apartment::Tenant.switch! db_name
-      User.create! name: db_name
-    end
-
-    ActiveRecord::Base.connection.enable_query_cache!
-
-    Apartment::Tenant.switch! db_names.first
-    expect(User.find_by_name(db_names.first).name).to eq(db_names.first)
-
-    Apartment::Tenant.switch! db_names.last
-    expect(User.find_by_name(db_names.first)).to be_nil
-  end
-end
diff --git a/spec/integration/use_within_an_engine_spec.rb b/spec/integration/use_within_an_engine_spec.rb
deleted file mode 100644
index 904a9238..00000000
--- a/spec/integration/use_within_an_engine_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-describe 'using apartment within an engine' do
-
-  before do
-    engine_path = Pathname.new(File.expand_path('../../dummy_engine', __FILE__))
-    require engine_path.join('test/dummy/config/application')
-    @rake = Rake::Application.new
-    Rake.application = @rake
-    stub_const 'APP_RAKEFILE', engine_path.join('test/dummy/Rakefile')
-    load 'rails/tasks/engine.rake'
-  end
-
-  it 'sucessfully runs rake db:migrate in the engine root' do
-    expect{ Rake::Task['db:migrate'].invoke }.to_not raise_error
-  end
-
-  it 'sucessfully runs rake app:db:migrate in the engine root' do
-    expect{ Rake::Task['app:db:migrate'].invoke }.to_not raise_error
-  end
-
-  context 'when Apartment.db_migrate_tenants is false' do
-    it 'should not enhance tasks' do
-      Apartment.db_migrate_tenants = false
-      expect(Apartment::RakeTaskEnhancer).to_not receive(:enhance_task).with('db:migrate')
-      Rake::Task['db:migrate'].invoke
-    end
-  end
-
-end
diff --git a/spec/schemas/v1.rb b/spec/schemas/v1.rb
deleted file mode 100644
index b5e6a796..00000000
--- a/spec/schemas/v1.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 0) do
-
-end
diff --git a/spec/schemas/v2.rb b/spec/schemas/v2.rb
deleted file mode 100644
index c6eeaba1..00000000
--- a/spec/schemas/v2.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20110613152810) do
-
-  create_table "companies", :force => true do |t|
-    t.boolean "dummy"
-    t.string  "database"
-  end
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
-    t.text     "handler"
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "queue"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.datetime "birthdate"
-    t.string   "sex"
-  end
-
-end
diff --git a/spec/schemas/v3.rb b/spec/schemas/v3.rb
deleted file mode 100644
index 4dbc011d..00000000
--- a/spec/schemas/v3.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20111202022214) do
-
-  create_table "books", :force => true do |t|
-    t.string   "name"
-    t.integer  "pages"
-    t.datetime "published"
-  end
-
-  create_table "companies", :force => true do |t|
-    t.boolean "dummy"
-    t.string  "database"
-  end
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
-    t.text     "handler"
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "queue"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.datetime "birthdate"
-    t.string   "sex"
-  end
-
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
deleted file mode 100644
index e63635cb..00000000
--- a/spec/spec_helper.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb", __FILE__)
-require "rspec/rails"
-require 'capybara/rspec'
-require 'capybara/rails'
-
-begin
-  require 'pry'
-  silence_warnings{ IRB = Pry }
-rescue LoadError
-end
-
-ActionMailer::Base.delivery_method = :test
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = "test.com"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-RSpec.configure do |config|
-
-  config.include RSpec::Integration::CapybaraSessions, type: :request
-  config.include Apartment::Spec::Setup
-
-  # Somewhat brutal hack so that rails 4 postgres extensions don't modify this file
-  config.after(:all) do
-    `git checkout -- spec/dummy/db/schema.rb`
-  end
-
-  # rspec-rails 3 will no longer automatically infer an example group's spec type
-  # from the file location. You can explicitly opt-in to the feature using this
-  # config option.
-  # To explicitly tag specs without using automatic inference, set the `:type`
-  # metadata manually:
-  #
-  #     describe ThingsController, :type => :controller do
-  #       # Equivalent to being in spec/controllers
-  #     end
-  config.infer_spec_type_from_file_location!
-end
-
-# Load shared examples, must happen after configure for RSpec 3
-Dir["#{File.dirname(__FILE__)}/examples/**/*.rb"].each { |f| require f }
diff --git a/spec/support/apartment_helpers.rb b/spec/support/apartment_helpers.rb
deleted file mode 100644
index 795f172a..00000000
--- a/spec/support/apartment_helpers.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-module Apartment
-  module Test
-
-    extend self
-
-    def reset
-      Apartment.excluded_models = nil
-      Apartment.use_schemas = nil
-      Apartment.seed_after_create = nil
-      Apartment.default_schema = nil
-    end
-
-    def next_db
-      @x ||= 0
-      "db%d" % @x += 1
-    end
-
-    def drop_schema(schema)
-      ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE") rescue true
-    end
-
-    # Use this if you don't want to import schema.rb etc... but need the postgres schema to exist
-    # basically for speed purposes
-    def create_schema(schema)
-      ActiveRecord::Base.connection.execute("CREATE SCHEMA #{schema}")
-    end
-
-    def load_schema(version = 3)
-      file = File.expand_path("../../schemas/v#{version}.rb", __FILE__)
-
-      silence_warnings{ load(file) }
-    end
-
-    def migrate
-      ActiveRecord::Migrator.migrate(Rails.root + ActiveRecord::Migrator.migrations_path)
-    end
-
-    def rollback
-      ActiveRecord::Migrator.rollback(Rails.root + ActiveRecord::Migrator.migrations_path)
-    end
-
-  end
-end
diff --git a/spec/support/capybara_sessions.rb b/spec/support/capybara_sessions.rb
deleted file mode 100644
index 727d6c07..00000000
--- a/spec/support/capybara_sessions.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module RSpec
-  module Integration
-    module CapybaraSessions
-      
-      def in_new_session(&block)
-        yield new_session
-      end
-      
-      def new_session
-        Capybara::Session.new(Capybara.current_driver, Capybara.app)
-      end
-      
-    end
-  end
-end
\ No newline at end of file
diff --git a/spec/support/config.rb b/spec/support/config.rb
deleted file mode 100644
index 999279e5..00000000
--- a/spec/support/config.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'yaml'
-
-module Apartment
-  module Test
-
-    def self.config
-      @config ||= YAML.load(ERB.new(IO.read('spec/config/database.yml')).result)
-    end
-  end
-end
\ No newline at end of file
diff --git a/spec/support/contexts.rb b/spec/support/contexts.rb
deleted file mode 100644
index ffb10a04..00000000
--- a/spec/support/contexts.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#   Some shared contexts for specs
-
-shared_context "with default schema", :default_schema => true do
-  let(:default_schema){ Apartment::Test.next_db }
-
-  before do
-    Apartment::Test.create_schema(default_schema)
-    Apartment.default_schema = default_schema
-  end
-
-  after do
-    # resetting default_schema so we can drop and any further resets won't try to access droppped schema
-    Apartment.default_schema = nil
-    Apartment::Test.drop_schema(default_schema)
-  end
-end
-
-# Some default setup for elevator specs
-shared_context "elevators", elevator: true do
-  let(:company1)  { mock_model(Company, database: db1).as_null_object }
-  let(:company2)  { mock_model(Company, database: db2).as_null_object }
-
-  let(:api)       { Apartment::Tenant }
-
-  before do
-    Apartment.reset # reset all config
-    Apartment.seed_after_create = false
-    Apartment.use_schemas = true
-    api.reload!(config)
-    api.create(db1)
-    api.create(db2)
-  end
-
-  after do
-    api.drop(db1)
-    api.drop(db2)
-  end
-end
-
-shared_context "persistent_schemas", :persistent_schemas => true do
-  let(:persistent_schemas){ ['hstore', 'postgis'] }
-
-  before do
-    persistent_schemas.map{|schema| subject.create(schema) }
-    Apartment.persistent_schemas = persistent_schemas
-  end
-
-  after do
-    Apartment.persistent_schemas = []
-    persistent_schemas.map{|schema| subject.drop(schema) }
-  end
-end
\ No newline at end of file
diff --git a/spec/support/requirements.rb b/spec/support/requirements.rb
deleted file mode 100644
index dc856c9e..00000000
--- a/spec/support/requirements.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-module Apartment
-  module Spec
-
-    #
-    #   Define the interface methods required to
-    #   use an adapter shared example
-    #
-    #
-    module AdapterRequirements
-      extend ActiveSupport::Concern
-
-      included do
-        before do
-          subject.create(db1)
-          subject.create(db2)
-        end
-
-        after do
-          # Reset before dropping (can't drop a db you're connected to)
-          subject.reset
-
-          # sometimes we manually drop these schemas in testing, don't care if we can't drop, hence rescue
-          subject.drop(db1) rescue true
-          subject.drop(db2) rescue true
-        end
-      end
-
-      %w{subject tenant_names default_tenant}.each do |method|
-        define_method method do
-          raise "You must define a `#{method}` method in your host group"
-        end unless defined?(method)
-      end
-    end
-  end
-end
diff --git a/spec/support/setup.rb b/spec/support/setup.rb
deleted file mode 100644
index 8441da3d..00000000
--- a/spec/support/setup.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-module Apartment
-  module Spec
-    module Setup
-
-      def self.included(base)
-        base.instance_eval do
-          let(:db1){ Apartment::Test.next_db }
-          let(:db2){ Apartment::Test.next_db }
-          let(:connection){ ActiveRecord::Base.connection }
-
-          # This around ensures that we run these hooks before and after
-          # any before/after hooks defined in individual tests
-          # Otherwise these actually get run after test defined hooks
-          around(:each) do |example|
-
-            def config
-              db = RSpec.current_example.metadata.fetch(:database, :postgresql)
-
-              Apartment::Test.config['connections'][db.to_s].symbolize_keys
-            end
-
-            # before
-            Apartment::Tenant.reload!(config)
-            ActiveRecord::Base.establish_connection config
-
-            example.run
-
-            # after
-            Rails.configuration.database_configuration = {}
-            ActiveRecord::Base.clear_all_connections!
-
-            Apartment.excluded_models.each do |model|
-              klass = model.constantize
-
-              Apartment.connection_class.remove_connection(klass)
-              klass.clear_all_connections!
-              klass.reset_table_name
-            end
-            Apartment.reset
-            Apartment::Tenant.reload!
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/tasks/apartment_rake_spec.rb b/spec/tasks/apartment_rake_spec.rb
deleted file mode 100644
index 45a7f708..00000000
--- a/spec/tasks/apartment_rake_spec.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'spec_helper'
-require 'rake'
-require 'apartment/migrator'
-
-describe "apartment rake tasks" do
-
-  before do
-    @rake = Rake::Application.new
-    Rake.application = @rake
-    load 'tasks/apartment.rake'
-    # stub out rails tasks
-    Rake::Task.define_task('db:migrate')
-    Rake::Task.define_task('db:seed')
-    Rake::Task.define_task('db:rollback')
-    Rake::Task.define_task('db:migrate:up')
-    Rake::Task.define_task('db:migrate:down')
-    Rake::Task.define_task('db:migrate:redo')
-  end
-
-  after do
-    Rake.application = nil
-    ENV['VERSION'] = nil    # linux users reported env variable carrying on between tests
-  end
-
-  after(:all) do
-    Apartment::Test.load_schema
-  end
-
-  let(:version){ '1234' }
-
-  context 'database migration' do
-
-    let(:tenant_names){ 3.times.map{ Apartment::Test.next_db } }
-    let(:tenant_count){ tenant_names.length }
-
-    before do
-      allow(Apartment).to receive(:tenant_names).and_return tenant_names
-    end
-
-    describe "apartment:migrate" do
-      before do
-        allow(ActiveRecord::Migrator).to receive(:migrate)   # don't care about this
-      end
-
-      it "should migrate public and all multi-tenant dbs" do
-        expect(Apartment::Migrator).to receive(:migrate).exactly(tenant_count).times
-        @rake['apartment:migrate'].invoke
-      end
-    end
-
-    describe "apartment:migrate:up" do
-
-      context "without a version" do
-        before do
-          ENV['VERSION'] = nil
-        end
-
-        it "requires a version to migrate to" do
-          expect{
-            @rake['apartment:migrate:up'].invoke
-          }.to raise_error("VERSION is required")
-        end
-      end
-
-      context "with version" do
-
-        before do
-          ENV['VERSION'] = version
-        end
-
-        it "migrates up to a specific version" do
-          expect(Apartment::Migrator).to receive(:run).with(:up, anything, version.to_i).exactly(tenant_count).times
-          @rake['apartment:migrate:up'].invoke
-        end
-      end
-    end
-
-    describe "apartment:migrate:down" do
-
-      context "without a version" do
-        before do
-          ENV['VERSION'] = nil
-        end
-
-        it "requires a version to migrate to" do
-          expect{
-            @rake['apartment:migrate:down'].invoke
-          }.to raise_error("VERSION is required")
-        end
-      end
-
-      context "with version" do
-
-        before do
-          ENV['VERSION'] = version
-        end
-
-        it "migrates up to a specific version" do
-          expect(Apartment::Migrator).to receive(:run).with(:down, anything, version.to_i).exactly(tenant_count).times
-          @rake['apartment:migrate:down'].invoke
-        end
-      end
-    end
-
-    describe "apartment:rollback" do
-      let(:step){ '3' }
-
-      it "should rollback dbs" do
-        expect(Apartment::Migrator).to receive(:rollback).exactly(tenant_count).times
-        @rake['apartment:rollback'].invoke
-      end
-
-      it "should rollback dbs STEP amt" do
-        expect(Apartment::Migrator).to receive(:rollback).with(anything, step.to_i).exactly(tenant_count).times
-        ENV['STEP'] = step
-        @rake['apartment:rollback'].invoke
-      end
-    end
-  end
-end
diff --git a/spec/tenant_spec.rb b/spec/tenant_spec.rb
deleted file mode 100644
index 68e36ab7..00000000
--- a/spec/tenant_spec.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-require 'spec_helper'
-
-describe Apartment::Tenant do
-  context "using mysql", database: :mysql do
-
-    before { subject.reload!(config) }
-
-    describe "#adapter" do
-      it "should load mysql adapter" do
-        subject.adapter
-        expect(Apartment::Adapters::Mysql2Adapter).to be_a(Class)
-      end
-    end
-
-    # TODO this doesn't belong here, but there aren't integration tests currently for mysql
-    # where to put???
-    describe "exception recovery", :type => :request do
-      before do
-        subject.create db1
-      end
-      after{ subject.drop db1 }
-
-      # it "should recover from incorrect database" do
-      #   session = Capybara::Session.new(:rack_test, Capybara.app)
-      #   session.visit("http://#{db1}.com")
-      #   expect {
-      #     session.visit("http://this-database-should-not-exist.com")
-      #   }.to raise_error
-      #   session.visit("http://#{db1}.com")
-      # end
-    end
-
-    # TODO re-organize these tests
-    context "with prefix and schemas" do
-      describe "#create" do
-        before do
-          Apartment.configure do |config|
-            config.prepend_environment = true
-            config.use_schemas = true
-          end
-
-          subject.reload!(config)
-        end
-
-        after { subject.drop "db_with_prefix" rescue nil }
-
-        it "should create a new database" do
-          subject.create "db_with_prefix"
-        end
-      end
-    end
-  end
-
-  context "using postgresql", database: :postgresql do
-    before do
-      Apartment.use_schemas = true
-      subject.reload!(config)
-    end
-
-    describe "#adapter" do
-      it "should load postgresql adapter" do
-        subject.adapter
-        expect(Apartment::Adapters::PostgresqlAdapter).to be_a(Class)
-      end
-
-      it "raises exception with invalid adapter specified" do
-        subject.reload!(config.merge(adapter: 'unknown'))
-
-        expect {
-          Apartment::Tenant.adapter
-        }.to raise_error
-      end
-
-      context "threadsafety" do
-        before { subject.create db1 }
-        after  { subject.drop   db1 }
-
-        it 'has a threadsafe adapter' do
-          subject.switch!(db1)
-          thread = Thread.new { expect(subject.current).to eq(Apartment.default_tenant) }
-          thread.join
-          expect(subject.current).to eq(db1)
-        end
-      end
-    end
-
-    # TODO above spec are also with use_schemas=true
-    context "with schemas" do
-      before do
-        Apartment.configure do |config|
-          config.excluded_models = []
-          config.use_schemas = true
-          config.seed_after_create = true
-        end
-        subject.create db1
-      end
-
-      after{ subject.drop db1 }
-
-      describe "#create" do
-        it "should seed data" do
-          subject.switch! db1
-          expect(User.count).to be > 0
-        end
-      end
-
-      describe "#switch!" do
-
-        let(:x){ rand(3) }
-
-        context "creating models" do
-
-          before{ subject.create db2 }
-          after{ subject.drop db2 }
-
-          it "should create a model instance in the current schema" do
-            subject.switch! db2
-            db2_count = User.count + x.times{ User.create }
-
-            subject.switch! db1
-            db_count = User.count + x.times{ User.create }
-
-            subject.switch! db2
-            expect(User.count).to eq(db2_count)
-
-            subject.switch! db1
-            expect(User.count).to eq(db_count)
-          end
-        end
-
-        context "with excluded models" do
-
-          before do
-            Apartment.configure do |config|
-              config.excluded_models = ["Company"]
-            end
-            subject.init
-          end
-
-          it "should create excluded models in public schema" do
-            subject.reset # ensure we're on public schema
-            count = Company.count + x.times{ Company.create }
-
-            subject.switch! db1
-            x.times{ Company.create }
-            expect(Company.count).to eq(count + x)
-            subject.reset
-            expect(Company.count).to eq(count + x)
-          end
-        end
-      end
-    end
-
-    context "seed paths" do
-      before do
-        Apartment.configure do |config|
-          config.excluded_models = []
-          config.use_schemas = true
-          config.seed_after_create = true
-        end
-      end
-
-      after{ subject.drop db1 }
-
-      it 'should seed from default path' do
-        subject.create db1
-        subject.switch! db1
-        expect(User.count).to eq(3)
-        expect(User.first.name).to eq('Some User 0')
-      end
-
-      it 'should seed from custom path' do
-        Apartment.configure do |config|
-          config.seed_data_file = "#{Rails.root}/db/seeds/import.rb"
-        end
-        subject.create db1
-        subject.switch! db1
-        expect(User.count).to eq(6)
-        expect(User.first.name).to eq('Different User 0')
-      end
-    end
-  end
-end
diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb
deleted file mode 100644
index 44901952..00000000
--- a/spec/unit/config_spec.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'spec_helper'
-
-describe Apartment do
-
-  describe "#config" do
-
-    let(:excluded_models){ ["Company"] }
-    let(:seed_data_file_path){ "#{Rails.root}/db/seeds/import.rb" }
-
-    def tenant_names_from_array(names)
-      names.each_with_object({}) do |tenant, hash|
-        hash[tenant] = Apartment.connection_config
-      end.with_indifferent_access
-    end
-
-    it "should yield the Apartment object" do
-      Apartment.configure do |config|
-        config.excluded_models = []
-        expect(config).to eq(Apartment)
-      end
-    end
-
-    it "should set excluded models" do
-      Apartment.configure do |config|
-        config.excluded_models = excluded_models
-      end
-      expect(Apartment.excluded_models).to eq(excluded_models)
-    end
-
-    it "should set use_schemas" do
-      Apartment.configure do |config|
-        config.excluded_models = []
-        config.use_schemas = false
-      end
-      expect(Apartment.use_schemas).to be false
-    end
-
-    it "should set seed_data_file" do
-      Apartment.configure do |config|
-        config.seed_data_file = seed_data_file_path
-      end
-      expect(Apartment.seed_data_file).to eq(seed_data_file_path)
-    end
-
-    it "should set seed_after_create" do
-      Apartment.configure do |config|
-        config.excluded_models = []
-        config.seed_after_create = true
-      end
-      expect(Apartment.seed_after_create).to be true
-    end
-
-    context "databases" do
-      let(:users_conf_hash) { { port: 5444 } }
-
-      before do
-        Apartment.configure do |config|
-          config.tenant_names = tenant_names
-        end
-      end
-
-      context "tenant_names as string array" do
-        let(:tenant_names) { ['users', 'companies'] }
-
-        it "should return object if it doesnt respond_to call" do
-          expect(Apartment.tenant_names).to eq(tenant_names_from_array(tenant_names).keys)
-        end
-
-        it "should set tenants_with_config" do
-          expect(Apartment.tenants_with_config).to eq(tenant_names_from_array(tenant_names))
-        end
-      end
-
-      context "tenant_names as proc returning an array" do
-        let(:tenant_names) { lambda { ['users', 'companies'] } }
-
-        it "should return object if it doesnt respond_to call" do
-          expect(Apartment.tenant_names).to eq(tenant_names_from_array(tenant_names.call).keys)
-        end
-
-        it "should set tenants_with_config" do
-          expect(Apartment.tenants_with_config).to eq(tenant_names_from_array(tenant_names.call))
-        end
-      end
-
-      context "tenant_names as Hash" do
-        let(:tenant_names) { { users: users_conf_hash }.with_indifferent_access }
-
-        it "should return object if it doesnt respond_to call" do
-          expect(Apartment.tenant_names).to eq(tenant_names.keys)
-        end
-
-        it "should set tenants_with_config" do
-          expect(Apartment.tenants_with_config).to eq(tenant_names)
-        end
-      end
-
-      context "tenant_names as proc returning a Hash" do
-        let(:tenant_names) { lambda { { users: users_conf_hash }.with_indifferent_access } }
-
-        it "should return object if it doesnt respond_to call" do
-          expect(Apartment.tenant_names).to eq(tenant_names.call.keys)
-        end
-
-        it "should set tenants_with_config" do
-          expect(Apartment.tenants_with_config).to eq(tenant_names.call)
-        end
-      end
-    end
-
-  end
-end
diff --git a/spec/unit/elevators/domain_spec.rb b/spec/unit/elevators/domain_spec.rb
deleted file mode 100644
index cbdf9fb2..00000000
--- a/spec/unit/elevators/domain_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-require 'apartment/elevators/domain'
-
-describe Apartment::Elevators::Domain do
-
-  subject(:elevator){ described_class.new(Proc.new{}) }
-
-  describe "#parse_tenant_name" do
-    it "parses the host for a domain name" do
-      request = ActionDispatch::Request.new('HTTP_HOST' => 'example.com')
-      expect(elevator.parse_tenant_name(request)).to eq('example')
-    end
-
-    it "ignores a www prefix and domain suffix" do
-      request = ActionDispatch::Request.new('HTTP_HOST' => 'www.example.bc.ca')
-      expect(elevator.parse_tenant_name(request)).to eq('example')
-    end
-
-    it "returns nil if there is no host" do
-      request = ActionDispatch::Request.new('HTTP_HOST' => '')
-      expect(elevator.parse_tenant_name(request)).to be_nil
-    end
-  end
-
-  describe "#call" do
-    it "switches to the proper tenant" do
-      expect(Apartment::Tenant).to receive(:switch).with('example')
-
-      elevator.call('HTTP_HOST' => 'www.example.com')
-    end
-  end
-end
diff --git a/spec/unit/elevators/first_subdomain_spec.rb b/spec/unit/elevators/first_subdomain_spec.rb
deleted file mode 100644
index 899b7bba..00000000
--- a/spec/unit/elevators/first_subdomain_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper'
-require 'apartment/elevators/first_subdomain'
-
-describe Apartment::Elevators::FirstSubdomain do
-  describe "subdomain" do
-    subject { described_class.new("test").parse_tenant_name(request) }
-    let(:request) { double(:request, :host => "#{subdomain}.example.com") }
-
-    context "one subdomain" do
-      let(:subdomain) { "test" }
-      it { is_expected.to eq("test") }
-    end
-
-    context "nested subdomains" do
-      let(:subdomain) { "test1.test2" }
-      it { is_expected.to eq("test1") }
-    end
-    
-    context "no subdomain" do
-      let(:subdomain) { nil }
-      it { is_expected.to eq(nil) }
-    end
-  end
-end
\ No newline at end of file
diff --git a/spec/unit/elevators/generic_spec.rb b/spec/unit/elevators/generic_spec.rb
deleted file mode 100644
index 6278dfe7..00000000
--- a/spec/unit/elevators/generic_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'apartment/elevators/generic'
-
-describe Apartment::Elevators::Generic do
-
-  class MyElevator < described_class
-    def parse_tenant_name(*)
-      'tenant2'
-    end
-  end
-
-  subject(:elevator){ described_class.new(Proc.new{}) }
-
-  describe "#call" do
-    it "calls the processor if given" do
-      elevator = described_class.new(Proc.new{}, Proc.new{'tenant1'})
-
-      expect(Apartment::Tenant).to receive(:switch).with('tenant1')
-
-      elevator.call('HTTP_HOST' => 'foo.bar.com')
-    end
-
-    it "raises if parse_tenant_name not implemented" do
-      expect {
-        elevator.call('HTTP_HOST' => 'foo.bar.com')
-      }.to raise_error(RuntimeError)
-    end
-
-    it "switches to the parsed db_name" do
-      elevator = MyElevator.new(Proc.new{})
-
-      expect(Apartment::Tenant).to receive(:switch).with('tenant2')
-
-      elevator.call('HTTP_HOST' => 'foo.bar.com')
-    end
-
-    it "calls the block implementation of `switch`" do
-      elevator = MyElevator.new(Proc.new{}, Proc.new{'tenant2'})
-
-      expect(Apartment::Tenant).to receive(:switch).with('tenant2').and_yield
-      elevator.call('HTTP_HOST' => 'foo.bar.com')
-    end
-
-    it "does not call `switch` if no database given" do
-      app = Proc.new{}
-      elevator = MyElevator.new(app, Proc.new{})
-
-      expect(Apartment::Tenant).not_to receive(:switch)
-      expect(app).to receive :call
-
-      elevator.call('HTTP_HOST' => 'foo.bar.com')
-    end
-  end
-end
diff --git a/spec/unit/elevators/host_hash_spec.rb b/spec/unit/elevators/host_hash_spec.rb
deleted file mode 100644
index c748b70d..00000000
--- a/spec/unit/elevators/host_hash_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-require 'apartment/elevators/host_hash'
-
-describe Apartment::Elevators::HostHash do
-
-  subject(:elevator){ Apartment::Elevators::HostHash.new(Proc.new{}, 'example.com' => 'example_tenant') }
-
-  describe "#parse_tenant_name" do
-    it "parses the host for a domain name" do
-      request = ActionDispatch::Request.new('HTTP_HOST' => 'example.com')
-      expect(elevator.parse_tenant_name(request)).to eq('example_tenant')
-    end
-
-    it "raises TenantNotFound exception if there is no host" do
-      request = ActionDispatch::Request.new('HTTP_HOST' => '')
-      expect { elevator.parse_tenant_name(request) }.to raise_error(Apartment::TenantNotFound)
-    end
-
-    it "raises TenantNotFound exception if there is no database associated to current host" do
-      request = ActionDispatch::Request.new('HTTP_HOST' => 'example2.com')
-      expect { elevator.parse_tenant_name(request) }.to raise_error(Apartment::TenantNotFound)
-    end
-  end
-
-  describe "#call" do
-    it "switches to the proper tenant" do
-      expect(Apartment::Tenant).to receive(:switch).with('example_tenant')
-
-      elevator.call('HTTP_HOST' => 'example.com')
-    end
-  end
-end
diff --git a/spec/unit/elevators/subdomain_spec.rb b/spec/unit/elevators/subdomain_spec.rb
deleted file mode 100644
index cdc9a3db..00000000
--- a/spec/unit/elevators/subdomain_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'spec_helper'
-require 'apartment/elevators/subdomain'
-
-describe Apartment::Elevators::Subdomain do
-
-  subject(:elevator){ described_class.new(Proc.new{}) }
-
-  describe "#parse_tenant_name" do
-    context "assuming one tld" do
-      it "should parse subdomain" do
-        request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.com')
-        expect(elevator.parse_tenant_name(request)).to eq('foo')
-      end
-
-      it "should return nil when no subdomain" do
-        request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.com')
-        expect(elevator.parse_tenant_name(request)).to be_nil
-      end
-    end
-
-    context "assuming two tlds" do
-      it "should parse subdomain in the third level domain" do
-        request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.co.uk')
-        expect(elevator.parse_tenant_name(request)).to eq("foo")
-      end
-
-      it "should return nil when no subdomain in the third level domain" do
-        request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.co.uk')
-        expect(elevator.parse_tenant_name(request)).to be_nil
-      end
-    end
-
-    context "assuming two subdomains" do
-      it "should parse two subdomains in the two level domain" do
-        request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.xyz.bar.com')
-        elevator.parse_tenant_name(request).should == "foo"
-      end
-
-      it "should parse two subdomains in the third level domain" do
-        request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.xyz.bar.co.uk')
-        elevator.parse_tenant_name(request).should == "foo"
-      end
-    end
-
-    context "assuming localhost" do
-      it "should return nil for localhost" do
-        request = ActionDispatch::Request.new('HTTP_HOST' => 'localhost')
-        elevator.parse_tenant_name(request).should be_nil
-      end
-    end
-
-    context "assuming ip address" do
-      it "should return nil for an ip address" do
-        request = ActionDispatch::Request.new('HTTP_HOST' => '127.0.0.1')
-        elevator.parse_tenant_name(request).should be_nil
-      end
-    end
-  end
-
-  describe "#call" do
-    it "switches to the proper tenant" do
-      expect(Apartment::Tenant).to receive(:switch).with('tenant1')
-      elevator.call('HTTP_HOST' => 'tenant1.example.com')
-    end
-
-    it "ignores excluded subdomains" do
-      described_class.excluded_subdomains = %w{foo}
-
-      expect(Apartment::Tenant).not_to receive(:switch)
-
-      elevator.call('HTTP_HOST' => 'foo.bar.com')
-
-      described_class.excluded_subdomains = nil
-    end
-  end
-end
diff --git a/spec/unit/migrator_spec.rb b/spec/unit/migrator_spec.rb
deleted file mode 100644
index d5fcaf96..00000000
--- a/spec/unit/migrator_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'spec_helper'
-require 'apartment/migrator'
-
-describe Apartment::Migrator do
-
-  let(:tenant){ Apartment::Test.next_db }
-
-  # Don't need a real switch here, just testing behaviour
-  before { allow(Apartment::Tenant.adapter).to receive(:connect_to_new) }
-
-  describe "::migrate" do
-    it "switches and migrates" do
-      expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
-      expect(ActiveRecord::Migrator).to receive(:migrate)
-
-      Apartment::Migrator.migrate(tenant)
-    end
-  end
-
-  describe "::run" do
-    it "switches and runs" do
-      expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
-      expect(ActiveRecord::Migrator).to receive(:run).with(:up, anything, 1234)
-
-      Apartment::Migrator.run(:up, tenant, 1234)
-    end
-  end
-
-  describe "::rollback" do
-    it "switches and rolls back" do
-      expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
-      expect(ActiveRecord::Migrator).to receive(:rollback).with(anything, 2)
-
-      Apartment::Migrator.rollback(tenant, 2)
-    end
-  end
-end
diff --git a/spec/unit/reloader_spec.rb b/spec/unit/reloader_spec.rb
deleted file mode 100644
index ffe30988..00000000
--- a/spec/unit/reloader_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe Apartment::Reloader do
-
-  context "using postgresql schemas" do
-
-    before do
-      Apartment.configure do |config|
-        config.excluded_models = ["Company"]
-        config.use_schemas = true
-      end
-      Apartment::Tenant.reload!(config)
-      Company.reset_table_name  # ensure we're clean
-    end
-
-    subject{ Apartment::Reloader.new(double("Rack::Application", :call => nil)) }
-
-    it "should initialize apartment when called" do
-      expect(Company.table_name).not_to include('public.')
-      subject.call(double('env'))
-      expect(Company.table_name).to include('public.')
-    end
-  end
-end
\ No newline at end of file
diff --git a/test/apartment_test.rb b/test/apartment_test.rb
new file mode 100644
index 00000000..bd90d198
--- /dev/null
+++ b/test/apartment_test.rb
@@ -0,0 +1,68 @@
+require "minitest/autorun"
+
+module Apartment
+  class Test < Minitest::Test
+    def setup_connection(db)
+      @config = Apartment::TestHelper.config['connections'][db].symbolize_keys
+      ActiveRecord::Base.establish_connection(@config)
+      Apartment.reset
+    end
+
+    def setup
+      Apartment::Tenant.reload!
+      @adapter = Apartment::Tenant.adapter
+      @tenant1 = self.class.next_db
+      @tenant2 = self.class.next_db
+      @adapter.create(@tenant1)
+      @adapter.create(@tenant2)
+    end
+
+    def teardown
+      @adapter.reset
+
+      tenants = [@tenant1, @tenant2]
+
+      if @adapter.class.name == "Apartment::Adapters::PostgresqlAdapter"
+        @postgres_dbs ? drop(tenants, :database) : drop(tenants, :schema)
+      else
+        drop(tenants)
+      end
+
+      Apartment.connection_class.clear_all_connections!
+      Apartment.reset
+      Apartment::Tenant.reload!
+    end
+
+    def drop(tenants, type = nil)
+      meth = "drop"
+      meth += "_#{type}" if type
+
+      tenants.each{ |t| @adapter.send(meth, t) }
+    end
+
+    def self.next_db
+      @x ||= 0
+      "db%d" % @x += 1
+    end
+
+    def tenant_is(tenant, for_model: Apartment.connection_class)
+      config = Apartment::Tenant.config_for(tenant)
+
+      if @adapter.class.name == "Apartment::Adapters::PostgresqlAdapter"
+        current_search_path = for_model.connection.schema_search_path
+      end
+
+      config[:database] == for_model.connection.current_database &&
+        (!current_search_path || (current_search_path == config[:schema_search_path])) &&
+        (for_model != Apartment.connection_class || Apartment::Tenant.current == tenant)
+    end
+
+    def assert_received(klass, meth, count = 1)
+      migrator_mock = Minitest::Mock.new
+      count.times{ migrator_mock.expect meth, true }
+      klass.stub(meth, ->(*){ migrator_mock.send(meth) }){ yield }
+
+      assert migrator_mock.verify
+    end
+  end
+end
diff --git a/test/config_test.rb b/test/config_test.rb
new file mode 100644
index 00000000..1a32269e
--- /dev/null
+++ b/test/config_test.rb
@@ -0,0 +1,48 @@
+require_relative 'test_helper'
+
+class ConfigTest < Minitest::Test
+  def test_configure_yields_apartment
+    Apartment.configure{ |config| assert_equal Apartment, config }
+  end
+
+  def test_setting_excluded_models
+    Apartment.configure{ |c| c.excluded_models = ["Company"] }
+
+    assert_equal ["Company"], Apartment.excluded_models
+  end
+
+  def test_setting_force_reconnect_on_switch
+    Apartment.configure{ |c| c.force_reconnect_on_switch = true }
+
+    assert_equal true, Apartment.force_reconnect_on_switch
+  end
+
+  def test_setting_seed_data_file
+    Apartment.configure{ |c| c.seed_data_file = "#{Rails.root}/db/seeds/import.rb" }
+
+    assert_equal "#{Rails.root}/db/seeds/import.rb", Apartment.seed_data_file
+  end
+
+  def test_setting_seed_after_create
+    Apartment.configure{ |c| c.seed_after_create = true }
+
+    assert_equal true, Apartment.seed_after_create
+  end
+
+  def test_setting_tenant_names_to_array
+    Apartment.configure{ |c| c.tenant_names = ['tenant_a', 'tenant_b'] }
+
+    assert_equal ['tenant_a', 'tenant_b'], Apartment.tenant_names
+  end
+
+  def test_setting_tenant_names_to_proc
+    tenant_names = ["foo", "bar"]
+    tenant_names.each{ |db| Company.create!(database: db) }
+
+    Apartment.configure{ |c| c.tenant_names = ->{ Company.pluck(:database) } }
+
+    assert_equal tenant_names, Apartment.tenant_names
+  ensure
+    Company.delete_all
+  end
+end
diff --git a/spec/config/database.yml.sample b/test/databases.yml
similarity index 88%
rename from spec/config/database.yml.sample
rename to test/databases.yml
index 8b9ff843..d17d4026 100644
--- a/spec/config/database.yml.sample
+++ b/test/databases.yml
@@ -3,12 +3,12 @@ connections:
   postgresql:
     adapter: postgresql
     database: apartment_postgresql_test
-    username: postgres
+    username: mike.campbell
     min_messages: WARNING
     driver: org.postgresql.Driver
     url: jdbc:postgresql://localhost:5432/apartment_postgresql_test
     timeout: 5000
-    pool: 5
+    pool: 100
 
   mysql:
     adapter: mysql
@@ -18,22 +18,24 @@ connections:
     driver: com.mysql.jdbc.Driver
     url: jdbc:mysql://localhost:3306/apartment_mysql_test
     timeout: 5000
-    pool: 5
+    pool: 100
 <% else %>
 connections:
   postgresql:
     adapter: postgresql
     database: apartment_postgresql_test
     min_messages: WARNING
-    username: postgres
+    username: mike.campbell
     schema_search_path: public
     password:
+    pool: 100
 
   mysql:
     adapter: mysql2
     database: apartment_mysql_test
     username: root
     password:
+    pool: 100
 
   sqlite:
     adapter: sqlite3
diff --git a/test/databases.yml.sample b/test/databases.yml.sample
new file mode 100644
index 00000000..4b594002
--- /dev/null
+++ b/test/databases.yml.sample
@@ -0,0 +1,37 @@
+<% if defined?(JRUBY_VERSION) %>
+connections:
+  postgresql:
+    adapter: postgresql
+    database: apartment_postgresql_test
+    username: postgres
+    min_messages: WARNING
+    driver: org.postgresql.Driver
+    url: jdbc:postgresql://localhost:5432/apartment_postgresql_test
+    timeout: 5000
+    pool: 5
+
+  mysql:
+    adapter: mysql
+    database: apartment_mysql_test
+    username: root
+    min_messages: WARNING
+    driver: com.mysql.jdbc.Driver
+    url: jdbc:mysql://localhost:3306/apartment_mysql_test
+    timeout: 5000
+    pool: 5
+<% else %>
+connections:
+  postgresql:
+    adapter: postgresql
+    database: apartment_postgresql_test
+    min_messages: WARNING
+    username: postgres
+    schema_search_path: public
+    password:
+
+  mysql:
+    adapter: mysql2
+    database: apartment_mysql_test
+    username: root
+    password:
+<% end %>
diff --git a/test/decorator_test.rb b/test/decorator_test.rb
new file mode 100644
index 00000000..eda079e2
--- /dev/null
+++ b/test/decorator_test.rb
@@ -0,0 +1,21 @@
+require_relative 'test_helper'
+require 'apartment/resolvers/database'
+
+class DecoratorTest < Apartment::Test
+  def setup
+    setup_connection("mysql")
+
+    Apartment.configure do |config|
+      config.tenant_resolver = Apartment::Resolvers::Database
+      config.tenant_decorator = ->(tenant){ "#{Rails.env}_#{tenant}" }
+    end
+
+    super
+  end
+
+  def test_decorator_proc
+    decorated = Apartment::Tenant.adapter.decorate("foobar")
+
+    assert_equal "test_foobar", decorated
+  end
+end
diff --git a/test/domain_elevator_test.rb b/test/domain_elevator_test.rb
new file mode 100644
index 00000000..1053714c
--- /dev/null
+++ b/test/domain_elevator_test.rb
@@ -0,0 +1,38 @@
+require_relative 'test_helper'
+require_relative 'mocks/adapter_mock'
+require 'apartment/elevators/domain'
+
+class DomainElevatorTest < Minitest::Test
+  include AdapterMock
+
+  def setup
+    @elevator = Apartment::Elevators::Domain.new(Proc.new{})
+
+    super
+  end
+
+  def test_parsing_host_for_domain_name
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'example.com')
+    assert_equal 'example', @elevator.parse_tenant_name(request)
+  end
+
+  def test_www_prefix_and_domain_suffix_ignored
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'www.example.bc.ca')
+    assert_equal 'example', @elevator.parse_tenant_name(request)
+  end
+
+  def test_no_host_returns_nil
+    request = ActionDispatch::Request.new('HTTP_HOST' => '')
+    assert_nil @elevator.parse_tenant_name(request)
+  end
+
+  def test_call_switches_tenant
+    with_adapter_mocked do |adapter|
+      adapter.expect :switch, true, ['example']
+
+      @elevator.call('HTTP_HOST' => 'www.example.com')
+
+      assert adapter.verify
+    end
+  end
+end
diff --git a/spec/dummy/Rakefile b/test/dummy/Rakefile
similarity index 100%
rename from spec/dummy/Rakefile
rename to test/dummy/Rakefile
diff --git a/spec/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb
similarity index 100%
rename from spec/dummy/app/controllers/application_controller.rb
rename to test/dummy/app/controllers/application_controller.rb
diff --git a/spec/dummy/app/helpers/application_helper.rb b/test/dummy/app/helpers/application_helper.rb
similarity index 100%
rename from spec/dummy/app/helpers/application_helper.rb
rename to test/dummy/app/helpers/application_helper.rb
diff --git a/spec/dummy/app/models/company.rb b/test/dummy/app/models/company.rb
similarity index 100%
rename from spec/dummy/app/models/company.rb
rename to test/dummy/app/models/company.rb
diff --git a/spec/dummy/app/models/user.rb b/test/dummy/app/models/user.rb
similarity index 100%
rename from spec/dummy/app/models/user.rb
rename to test/dummy/app/models/user.rb
diff --git a/spec/dummy/app/views/application/index.html.erb b/test/dummy/app/views/application/index.html.erb
similarity index 100%
rename from spec/dummy/app/views/application/index.html.erb
rename to test/dummy/app/views/application/index.html.erb
diff --git a/spec/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb
similarity index 100%
rename from spec/dummy/app/views/layouts/application.html.erb
rename to test/dummy/app/views/layouts/application.html.erb
diff --git a/spec/dummy/config.ru b/test/dummy/config.ru
similarity index 100%
rename from spec/dummy/config.ru
rename to test/dummy/config.ru
diff --git a/spec/dummy/config/application.rb b/test/dummy/config/application.rb
similarity index 100%
rename from spec/dummy/config/application.rb
rename to test/dummy/config/application.rb
diff --git a/spec/dummy/config/boot.rb b/test/dummy/config/boot.rb
similarity index 100%
rename from spec/dummy/config/boot.rb
rename to test/dummy/config/boot.rb
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
new file mode 100644
index 00000000..c8457d3f
--- /dev/null
+++ b/test/dummy/config/database.yml
@@ -0,0 +1,38 @@
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+<% if defined?(JRUBY_VERSION) %>
+test:
+  adapter: postgresql
+  database: apartment_postgresql_test
+  username: postgres
+  min_messages: WARNING
+  driver: org.postgresql.Driver
+  url: jdbc:postgresql://localhost:5432/apartment_postgresql_test
+  timeout: 5000
+  pool: 100
+
+development:
+  adapter: postgresql
+  database: apartment_postgresql_development
+  username: postgres
+  min_messages: WARNING
+  driver: org.postgresql.Driver
+  url: jdbc:postgresql://localhost:5432/apartment_postgresql_development
+  timeout: 5000
+  pool: 100
+<% else %>
+test:
+  adapter: postgresql
+  database: apartment_postgresql_test
+  min_messages: WARNING
+  pool: 100
+  timeout: 5000
+
+development:
+  adapter: postgresql
+  database: apartment_postgresql_development
+  min_messages: WARNING
+  pool: 100
+  timeout: 5000
+<% end %>
\ No newline at end of file
diff --git a/spec/dummy/config/database.yml.sample b/test/dummy/config/database.yml.sample
similarity index 100%
rename from spec/dummy/config/database.yml.sample
rename to test/dummy/config/database.yml.sample
diff --git a/spec/dummy/config/environment.rb b/test/dummy/config/environment.rb
similarity index 100%
rename from spec/dummy/config/environment.rb
rename to test/dummy/config/environment.rb
diff --git a/spec/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb
similarity index 95%
rename from spec/dummy/config/environments/development.rb
rename to test/dummy/config/environments/development.rb
index c143a826..2941778a 100644
--- a/spec/dummy/config/environments/development.rb
+++ b/test/dummy/config/environments/development.rb
@@ -13,7 +13,6 @@
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
diff --git a/spec/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb
similarity index 100%
rename from spec/dummy/config/environments/production.rb
rename to test/dummy/config/environments/production.rb
diff --git a/spec/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
similarity index 100%
rename from spec/dummy/config/environments/test.rb
rename to test/dummy/config/environments/test.rb
diff --git a/spec/dummy/config/initializers/apartment.rb b/test/dummy/config/initializers/apartment.rb
similarity index 100%
rename from spec/dummy/config/initializers/apartment.rb
rename to test/dummy/config/initializers/apartment.rb
diff --git a/spec/dummy/config/initializers/backtrace_silencers.rb b/test/dummy/config/initializers/backtrace_silencers.rb
similarity index 100%
rename from spec/dummy/config/initializers/backtrace_silencers.rb
rename to test/dummy/config/initializers/backtrace_silencers.rb
diff --git a/spec/dummy/config/initializers/inflections.rb b/test/dummy/config/initializers/inflections.rb
similarity index 100%
rename from spec/dummy/config/initializers/inflections.rb
rename to test/dummy/config/initializers/inflections.rb
diff --git a/spec/dummy/config/initializers/mime_types.rb b/test/dummy/config/initializers/mime_types.rb
similarity index 100%
rename from spec/dummy/config/initializers/mime_types.rb
rename to test/dummy/config/initializers/mime_types.rb
diff --git a/spec/dummy/config/initializers/secret_token.rb b/test/dummy/config/initializers/secret_token.rb
similarity index 100%
rename from spec/dummy/config/initializers/secret_token.rb
rename to test/dummy/config/initializers/secret_token.rb
diff --git a/spec/dummy/config/initializers/session_store.rb b/test/dummy/config/initializers/session_store.rb
similarity index 100%
rename from spec/dummy/config/initializers/session_store.rb
rename to test/dummy/config/initializers/session_store.rb
diff --git a/spec/dummy/config/locales/en.yml b/test/dummy/config/locales/en.yml
similarity index 100%
rename from spec/dummy/config/locales/en.yml
rename to test/dummy/config/locales/en.yml
diff --git a/spec/dummy/config/routes.rb b/test/dummy/config/routes.rb
similarity index 100%
rename from spec/dummy/config/routes.rb
rename to test/dummy/config/routes.rb
diff --git a/spec/dummy/public/favicon.ico b/test/dummy/db/default.sqlite3
similarity index 100%
rename from spec/dummy/public/favicon.ico
rename to test/dummy/db/default.sqlite3
diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb
new file mode 100644
index 00000000..5eb9ea94
--- /dev/null
+++ b/test/dummy/db/schema.rb
@@ -0,0 +1,18 @@
+ActiveRecord::Schema.define(version: 20170619120400) do
+  create_table "books", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "pages"
+    t.datetime "published"
+  end
+
+  create_table "companies", force: :cascade do |t|
+    t.boolean "dummy"
+    t.string  "database"
+  end
+
+  create_table "users", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "birthdate"
+    t.string   "sex"
+  end
+end
diff --git a/spec/dummy/db/seeds.rb b/test/dummy/db/seeds.rb
similarity index 100%
rename from spec/dummy/db/seeds.rb
rename to test/dummy/db/seeds.rb
diff --git a/spec/dummy/db/seeds/import.rb b/test/dummy/db/seeds/import.rb
similarity index 100%
rename from spec/dummy/db/seeds/import.rb
rename to test/dummy/db/seeds/import.rb
diff --git a/spec/dummy/db/test.sqlite3 b/test/dummy/db/test.sqlite3
similarity index 100%
rename from spec/dummy/db/test.sqlite3
rename to test/dummy/db/test.sqlite3
diff --git a/spec/dummy/public/404.html b/test/dummy/public/404.html
similarity index 100%
rename from spec/dummy/public/404.html
rename to test/dummy/public/404.html
diff --git a/spec/dummy/public/422.html b/test/dummy/public/422.html
similarity index 100%
rename from spec/dummy/public/422.html
rename to test/dummy/public/422.html
diff --git a/spec/dummy/public/500.html b/test/dummy/public/500.html
similarity index 100%
rename from spec/dummy/public/500.html
rename to test/dummy/public/500.html
diff --git a/spec/dummy/public/stylesheets/.gitkeep b/test/dummy/public/favicon.ico
similarity index 100%
rename from spec/dummy/public/stylesheets/.gitkeep
rename to test/dummy/public/favicon.ico
diff --git a/test/dummy/public/stylesheets/.gitkeep b/test/dummy/public/stylesheets/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/spec/dummy/script/rails b/test/dummy/script/rails
similarity index 100%
rename from spec/dummy/script/rails
rename to test/dummy/script/rails
diff --git a/test/excluded_models_test.rb b/test/excluded_models_test.rb
new file mode 100644
index 00000000..1c51da8c
--- /dev/null
+++ b/test/excluded_models_test.rb
@@ -0,0 +1,32 @@
+require_relative 'test_helper'
+require 'apartment/resolvers/database'
+
+class ExcludedModelsTest < Apartment::Test
+  def setup
+    setup_connection("mysql")
+
+    Apartment.configure do |config|
+      config.tenant_resolver = Apartment::Resolvers::Database
+      config.excluded_models = %w(Company User)
+    end
+
+    super
+  end
+
+  def test_model_exclusions
+    Apartment::Tenant.adapter.process_excluded_models
+
+    assert_equal :_apartment_excluded, Company.connection_specification_name
+
+    Apartment::Tenant.switch(@tenant1) do
+      assert tenant_is(@tenant1)
+      assert tenant_is(Apartment.default_tenant, for_model: Company)
+    end
+  end
+
+  def test_all_excluded_models_use_same_connection_pool
+    Apartment::Tenant.adapter.process_excluded_models
+
+    assert_equal Company.connection_pool, User.connection_pool
+  end
+end
diff --git a/test/generic_elevator_test.rb b/test/generic_elevator_test.rb
new file mode 100644
index 00000000..58264d6f
--- /dev/null
+++ b/test/generic_elevator_test.rb
@@ -0,0 +1,63 @@
+require_relative 'test_helper'
+require_relative 'mocks/adapter_mock'
+require 'apartment/elevators/generic'
+
+class GenericElevatorTest < Minitest::Test
+  include AdapterMock
+
+  class MyElevator < Apartment::Elevators::Generic
+    def parse_tenant_name(*)
+      'tenant2'
+    end
+  end
+
+  def setup
+    @elevator = Apartment::Elevators::Generic.new(Proc.new{})
+
+    super
+  end
+
+  def test_processor_is_called_if_given
+    elevator = Apartment::Elevators::Generic.new(Proc.new{}, Proc.new{'tenant1'})
+
+    with_adapter_mocked do |adapter|
+      adapter.expect :switch, true, ['tenant1']
+
+      elevator.call('HTTP_HOST' => 'foo.bar.com')
+
+      assert adapter.verify
+    end
+  end
+
+  def test_raises_if_parse_tenant_name_not_implemented
+    assert_raises RuntimeError do
+      @elevator.call('HTTP_HOST' => 'foo.bar.com')
+    end
+  end
+
+  def test_switches_to_the_parsed_db_name
+    elevator = MyElevator.new(Proc.new{})
+
+    with_adapter_mocked do |adapter|
+      adapter.expect :switch, true, ['tenant2']
+
+      elevator.call('HTTP_HOST' => 'foo.bar.com')
+
+      assert adapter.verify
+    end
+  end
+
+  def test_does_not_call_switch_if_no_database_given
+    app_mock = Minitest::Mock.new
+    app_mock.expect :call, true, [{'HTTP_HOST' => 'foo.bar.com'}]
+    elevator = MyElevator.new(app_mock, Proc.new{})
+
+    with_adapter_mocked do |adapter|
+      elevator.call('HTTP_HOST' => 'foo.bar.com')
+
+      assert adapter.verify
+    end
+
+    assert app_mock.verify
+  end
+end
\ No newline at end of file
diff --git a/test/host_hash_elevator_test.rb b/test/host_hash_elevator_test.rb
new file mode 100644
index 00000000..de88c809
--- /dev/null
+++ b/test/host_hash_elevator_test.rb
@@ -0,0 +1,42 @@
+require_relative 'test_helper'
+require_relative 'mocks/adapter_mock'
+require 'apartment/elevators/host_hash'
+
+class HostHashElevatorTest < Minitest::Test
+  include AdapterMock
+
+  def setup
+    @elevator = Apartment::Elevators::HostHash.new(Proc.new{}, 'example.com' => 'example_tenant')
+
+    super
+  end
+
+  def test_parses_host_from_domain_name
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'example.com')
+    assert_equal 'example_tenant', @elevator.parse_tenant_name(request)
+  end
+
+  def test_raises_exception_if_no_host
+    request = ActionDispatch::Request.new('HTTP_HOST' => '')
+    assert_raises Apartment::TenantNotFound do
+      @elevator.parse_tenant_name(request)
+    end
+  end
+
+  def test_raises_exception_if_host_not_found
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'example2.com')
+    assert_raises Apartment::TenantNotFound do
+      @elevator.parse_tenant_name(request)
+    end
+  end
+
+  def test_switches_to_proper_tenant
+    with_adapter_mocked do |adapter|
+      adapter.expect :switch, true, ['example_tenant']
+
+      @elevator.call('HTTP_HOST' => 'example.com')
+
+      assert adapter.verify
+    end
+  end
+end
diff --git a/test/mocks/adapter_mock.rb b/test/mocks/adapter_mock.rb
new file mode 100644
index 00000000..1802bc1a
--- /dev/null
+++ b/test/mocks/adapter_mock.rb
@@ -0,0 +1,11 @@
+module AdapterMock
+  def with_adapter_mocked
+    adapter = Minitest::Mock.new
+    old_adapter = Thread.current[:apartment_adapter]
+    Thread.current[:apartment_adapter] = adapter
+
+    yield adapter
+  ensure
+    Thread.current[:apartment_adapter] = old_adapter
+  end
+end
diff --git a/test/mysql2_adapter_test.rb b/test/mysql2_adapter_test.rb
new file mode 100644
index 00000000..184b59bd
--- /dev/null
+++ b/test/mysql2_adapter_test.rb
@@ -0,0 +1,17 @@
+require_relative 'test_helper'
+require 'apartment/resolvers/database'
+require_relative 'shared/shared_adapter_tests'
+
+class Mysql2AdapterTest < Apartment::Test
+  include SharedAdapterTests
+
+  def setup
+    setup_connection("mysql")
+
+    Apartment.configure do |config|
+      config.tenant_resolver = Apartment::Resolvers::Database
+    end
+
+    super
+  end
+end
diff --git a/test/postgresql_adapter_test.rb b/test/postgresql_adapter_test.rb
new file mode 100644
index 00000000..a46912d1
--- /dev/null
+++ b/test/postgresql_adapter_test.rb
@@ -0,0 +1,36 @@
+require_relative 'test_helper'
+require 'apartment/resolvers/schema'
+require 'apartment/resolvers/database'
+require_relative 'shared/shared_adapter_tests'
+
+class PostgresqlAdapterTest < Apartment::Test
+  include SharedAdapterTests
+
+  def setup
+    setup_connection("postgresql")
+
+    Apartment.configure do |config|
+      config.tenant_resolver = Apartment::Resolvers::Schema
+    end
+
+    super
+  end
+
+  def test_postgres_database_resolver_reconnects
+    Apartment.tenant_resolver = Apartment::Resolvers::Database
+
+    @adapter.create("db_tenant")
+
+    assert tenant_is(Apartment.default_tenant)
+
+    conn_id = Apartment.connection.object_id
+
+    Apartment::Tenant.switch("db_tenant") do
+      refute_equal conn_id, Apartment.connection.object_id
+      assert_equal "db_tenant", Apartment.connection.current_database
+    end
+  ensure
+    @adapter.drop_database("db_tenant")
+    Apartment.tenant_resolver = Apartment::Resolvers::Schema
+  end
+end
diff --git a/test/railtie_test.rb b/test/railtie_test.rb
new file mode 100644
index 00000000..a5a570c1
--- /dev/null
+++ b/test/railtie_test.rb
@@ -0,0 +1,18 @@
+require_relative 'test_helper'
+require 'apartment/resolvers/database'
+
+class RailtieTest < Minitest::Test
+  def test_railtie_does_not_hold_onto_connection
+    Apartment.tenant_resolver = Apartment::Resolvers::Database
+    Apartment.connection_class.connection_pool.disconnect!
+
+    Apartment::Railtie.config.to_prepare_blocks.map(&:call)
+
+    num_available_connections = Apartment.connection_class.connection_pool
+      .instance_variable_get(:@available)
+      .instance_variable_get(:@queue)
+      .size
+
+    assert_equal 1, num_available_connections
+  end
+end
diff --git a/test/rake_task_test.rb b/test/rake_task_test.rb
new file mode 100644
index 00000000..f5957ffc
--- /dev/null
+++ b/test/rake_task_test.rb
@@ -0,0 +1,57 @@
+require_relative 'test_helper'
+require 'apartment/resolvers/database'
+require 'rake'
+
+class RakeTaskTest < Apartment::Test
+  def setup
+    setup_connection("mysql")
+
+    Apartment.configure do |config|
+      config.excluded_models = ["Company"]
+      config.tenant_names = lambda{ Company.pluck(:database) }
+      config.tenant_resolver = Apartment::Resolvers::Database
+    end
+
+    super
+
+    @rake = Rake::Application.new
+    Rake.application = @rake
+    Dummy::Application.load_tasks
+
+    # rails tasks running F up the schema...
+    Rake::Task.define_task('db:migrate')
+    Rake::Task.define_task('db:seed')
+    Rake::Task.define_task('db:rollback')
+    Rake::Task.define_task('db:migrate:up')
+    Rake::Task.define_task('db:migrate:down')
+    Rake::Task.define_task('db:migrate:redo')
+
+    @tenants = [@tenant1, @tenant2]
+    @tenants.each{ |t| Company.create(database: t) }
+  end
+
+  def teardown 
+    Rake.application = nil
+    Company.delete_all
+
+    super
+  end
+
+  def test_all_databases_get_migrated
+    assert_received(Apartment::Migrator, :migrate, @tenants.size) do
+      @rake['apartment:migrate'].invoke
+    end
+  end
+
+  def test_all_databases_get_rolled_back
+    assert_received(Apartment::Migrator, :rollback, @tenants.size) do
+      @rake['apartment:rollback'].invoke
+    end
+  end
+
+  def test_all_databases_get_seeded
+    assert_received(Apartment::Tenant, :seed, @tenants.size) do
+      @rake['apartment:seed'].invoke
+    end
+  end
+end
diff --git a/test/resolver_test.rb b/test/resolver_test.rb
new file mode 100644
index 00000000..a5090afa
--- /dev/null
+++ b/test/resolver_test.rb
@@ -0,0 +1,21 @@
+require_relative 'test_helper'
+require 'apartment/resolvers/database'
+require 'apartment/resolvers/schema'
+
+class ResolverTest < Minitest::Test
+  def test_database_resolver
+    resolver = Apartment::Resolvers::Database.new(Apartment.connection_config)
+    new_config = resolver.resolve("foobar")
+
+    assert_equal "foobar", new_config[:database]
+  end
+
+  def test_schema_resolver
+    Apartment.configure{ |config| config.persistent_schemas = ['a', 'b', 'c'] }
+
+    resolver = Apartment::Resolvers::Schema.new(Apartment.connection_config)
+    new_config = resolver.resolve("foobar")
+
+    assert_equal '"foobar", "a", "b", "c"', new_config[:schema_search_path]
+  end
+end
diff --git a/test/shared/shared_adapter_tests.rb b/test/shared/shared_adapter_tests.rb
new file mode 100644
index 00000000..74cc29d9
--- /dev/null
+++ b/test/shared/shared_adapter_tests.rb
@@ -0,0 +1,95 @@
+module SharedAdapterTests
+  def test_switch
+    assert tenant_is(Apartment.default_tenant)
+
+    Apartment::Tenant.switch(@tenant1){
+      assert tenant_is(@tenant1)
+    }
+
+    assert tenant_is(Apartment.default_tenant)
+  end
+
+  def test_local_switch_doesnt_modify_connection
+    assert tenant_is(Apartment.default_tenant)
+
+    conn_id = Apartment.connection.object_id
+
+    Apartment::Tenant.switch!(@tenant1)
+
+    assert tenant_is(@tenant1)
+    assert_equal conn_id, Apartment.connection.object_id
+  end
+
+  def test_remote_switch_modifies_connection
+    assert tenant_is(Apartment.default_tenant)
+
+    conn_id = Apartment.connection.object_id
+
+    Apartment::Tenant.switch!(@config.dup.tap{ |c| c[:host] = 'localhost' })
+
+    assert_equal @config[:database], Apartment.connection.current_database
+    refute_equal conn_id, Apartment.connection.object_id
+  end
+
+  def test_force_reconnect
+    Apartment.configure{ |config| config.force_reconnect_on_switch = true }
+
+    assert tenant_is(Apartment.default_tenant)
+
+    conn_id = Apartment.connection.object_id
+
+    Apartment::Tenant.switch!(@tenant1)
+
+    assert tenant_is(@tenant1)
+    refute_equal conn_id, Apartment.connection.object_id
+  end
+
+  def test_switch_raises_error_for_unknown_database
+    assert_raises Apartment::TenantNotFound do
+      Apartment::Tenant.switch!("invalid")
+    end
+  end
+
+  def test_drop_raises_error_for_unknown_database
+    assert_raises Apartment::TenantNotFound do
+      if Apartment::Tenant.adapter.respond_to?(:drop_schema)
+        Apartment::Tenant.drop_schema("invalid")
+      else
+        Apartment::Tenant.drop("invalid")
+      end
+    end
+  end
+
+  def test_default_tenant_configuration_is_used
+    prev_default = Apartment.default_tenant
+
+    Apartment.configure do |config|
+      config.default_tenant = @tenant1
+    end
+
+    assert_equal @tenant1, Apartment.default_tenant
+
+    @adapter.reset
+
+    assert tenant_is(@tenant1)
+  ensure
+    Apartment.default_tenant = prev_default
+  end
+
+  def test_ActiveRecord_QueryCache_cleared_after_switching_databases
+    [@tenant1, @tenant2].each do |tenant|
+      Apartment::Tenant.switch(tenant) do
+        User.create!(name: tenant)
+      end
+    end
+    Apartment.connection.enable_query_cache!
+
+    Apartment::Tenant.switch(@tenant1) do
+      assert User.find_by(name: @tenant1)
+    end
+
+    Apartment::Tenant.switch(@tenant2) do
+      assert_nil User.find_by(name: @tenant1)
+    end
+  end
+end
diff --git a/test/subdomain_elevator_test.rb b/test/subdomain_elevator_test.rb
new file mode 100644
index 00000000..ebbc4a3d
--- /dev/null
+++ b/test/subdomain_elevator_test.rb
@@ -0,0 +1,75 @@
+require_relative 'test_helper'
+require_relative 'mocks/adapter_mock'
+require 'apartment/elevators/host_hash'
+
+class SubdomainElevatorTest < Minitest::Test
+  include AdapterMock
+
+  def setup
+    @elevator = Apartment::Elevators::Subdomain.new(Proc.new{})
+
+    super
+  end
+
+  def test_parses_subdomain
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.com')
+    assert_equal 'foo', @elevator.parse_tenant_name(request)
+  end
+
+  def test_returns_nil_when_no_subdomain
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.com')
+    assert_nil @elevator.parse_tenant_name(request)
+  end
+
+  def test_parses_subdomain_in_three_level_domain
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.co.uk')
+    assert_equal "foo", @elevator.parse_tenant_name(request)
+  end
+
+  def test_returns_nil_when_no_subdomain_in_three_level_domain
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.co.uk')
+    assert_nil @elevator.parse_tenant_name(request)
+  end
+
+  def test_parses_two_subdomains_in_two_level_domain
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.xyz.bar.com')
+    assert_equal "foo", @elevator.parse_tenant_name(request)
+  end
+
+  def test_parses_two_subdomains_in_three_level_domain
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.xyz.bar.co.uk')
+    assert_equal "foo", @elevator.parse_tenant_name(request)
+  end
+
+  def test_returns_nil_for_localhost
+    request = ActionDispatch::Request.new('HTTP_HOST' => 'localhost')
+    assert_nil @elevator.parse_tenant_name(request)
+  end
+
+  def test_returns_nil_for_an_ip
+    request = ActionDispatch::Request.new('HTTP_HOST' => '127.0.0.1')
+    assert_nil @elevator.parse_tenant_name(request)
+  end
+
+  def test_switches_to_tenant
+    with_adapter_mocked do |adapter|
+      adapter.expect :switch, true, ['tenant1']
+
+      @elevator.call('HTTP_HOST' => 'tenant1.example.com')
+
+      assert adapter.verify
+    end
+  end
+
+  def test_excluded_subdomain_ignored
+    Apartment::Elevators::Subdomain.excluded_subdomains = %w{foo}
+
+    with_adapter_mocked do |adapter|
+      @elevator.call('HTTP_HOST' => 'foo.bar.com')
+
+      assert adapter.verify
+    end
+  ensure
+    Apartment::Elevators::Subdomain.excluded_subdomains = nil
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 00000000..999c042d
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,27 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+ENV["RAILS_ENV"] = "test"
+
+require "logger"
+require "active_record"
+
+require File.expand_path("../dummy/config/environment.rb", __FILE__)
+require "apartment"
+
+ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
+
+require "active_support"
+require "database_rewinder"
+# DatabaseRewinder[ENV['DB'] || 'sqlite3']
+# DatabaseRewinder.clean_all
+require "apartment_test"
+require "erb"
+
+module Apartment
+  module TestHelper
+    def self.config
+      @config ||= YAML.load(ERB.new(IO.read('test/databases.yml')).result)
+    end
+  end
+end

From 7007f0fb72033ca7acf0199effebaf47ca2f95fc Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@meritec.co.uk>
Date: Wed, 28 Jun 2017 11:26:42 +0100
Subject: [PATCH 07/26] Fix excluded_model reset during tests & railtie test

---
 .gitignore               |  6 +++---
 lib/apartment/railtie.rb | 12 ++++++-----
 notes.md                 |  1 +
 test/apartment_test.rb   |  4 ++++
 test/databases.yml       | 43 ----------------------------------------
 test/dummy/db/schema.rb  |  1 +
 test/railtie_test.rb     | 27 +++++++++++++++++++------
 test/test_helper.rb      |  3 ---
 8 files changed, 37 insertions(+), 60 deletions(-)
 delete mode 100644 test/databases.yml

diff --git a/.gitignore b/.gitignore
index e15894d2..6b35d76d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,10 @@ pkg/*
 *.log
 .idea
 *.sw[pno]
-spec/config/databases.yml
-spec/dummy/config/database.yml
+test/databases.yml
+test/dummy/config/database.yml
 cookbooks
 tmp
-spec/dummy/db/*.sqlite3
+test/dummy/db/*.sqlite3
 .DS_Store
 test/debug.log
diff --git a/lib/apartment/railtie.rb b/lib/apartment/railtie.rb
index debe3452..e14faf95 100644
--- a/lib/apartment/railtie.rb
+++ b/lib/apartment/railtie.rb
@@ -5,11 +5,7 @@
 module Apartment
   class Railtie < Rails::Railtie
 
-    #
-    #   Set up our default config options
-    #   Do this before the app initializers run so we don't override custom settings
-    #
-    config.before_initialize do
+    def self.prep
       Apartment.configure do |config|
         config.excluded_models = []
         config.force_reconnect_on_switch = false
@@ -21,6 +17,12 @@ class Railtie < Rails::Railtie
       ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
     end
 
+    #
+    #   Set up our default config options
+    #   Do this before the app initializers run so we don't override custom settings
+    #
+    config.before_initialize{ prep }
+
     #   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.
diff --git a/notes.md b/notes.md
index ea2ceebd..05153afb 100644
--- a/notes.md
+++ b/notes.md
@@ -26,3 +26,4 @@
 - finish config tests (tenant resolver specifically)
 - write multi-threading tests
 - remove deprecated silencers?
+- rewrite readme
diff --git a/test/apartment_test.rb b/test/apartment_test.rb
index bd90d198..d19a8ecd 100644
--- a/test/apartment_test.rb
+++ b/test/apartment_test.rb
@@ -28,6 +28,10 @@ def teardown
         drop(tenants)
       end
 
+      Apartment.excluded_models.each do |excl|
+        excl.constantize.connection_specification_name = nil
+      end
+
       Apartment.connection_class.clear_all_connections!
       Apartment.reset
       Apartment::Tenant.reload!
diff --git a/test/databases.yml b/test/databases.yml
deleted file mode 100644
index d17d4026..00000000
--- a/test/databases.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-<% if defined?(JRUBY_VERSION) %>
-connections:
-  postgresql:
-    adapter: postgresql
-    database: apartment_postgresql_test
-    username: mike.campbell
-    min_messages: WARNING
-    driver: org.postgresql.Driver
-    url: jdbc:postgresql://localhost:5432/apartment_postgresql_test
-    timeout: 5000
-    pool: 100
-
-  mysql:
-    adapter: mysql
-    database: apartment_mysql_test
-    username: root
-    min_messages: WARNING
-    driver: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/apartment_mysql_test
-    timeout: 5000
-    pool: 100
-<% else %>
-connections:
-  postgresql:
-    adapter: postgresql
-    database: apartment_postgresql_test
-    min_messages: WARNING
-    username: mike.campbell
-    schema_search_path: public
-    password:
-    pool: 100
-
-  mysql:
-    adapter: mysql2
-    database: apartment_mysql_test
-    username: root
-    password:
-    pool: 100
-
-  sqlite:
-    adapter: sqlite3
-    database: <%= File.expand_path('../spec/dummy/db', __FILE__) %>/default.sqlite3
-<% end %>
diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb
index 5eb9ea94..1de08835 100644
--- a/test/dummy/db/schema.rb
+++ b/test/dummy/db/schema.rb
@@ -14,5 +14,6 @@
     t.string   "name"
     t.datetime "birthdate"
     t.string   "sex"
+    t.timestamps
   end
 end
diff --git a/test/railtie_test.rb b/test/railtie_test.rb
index a5a570c1..79a93795 100644
--- a/test/railtie_test.rb
+++ b/test/railtie_test.rb
@@ -3,16 +3,31 @@
 
 class RailtieTest < Minitest::Test
   def test_railtie_does_not_hold_onto_connection
-    Apartment.tenant_resolver = Apartment::Resolvers::Database
+    Apartment.configure do |config|
+      config.tenant_resolver = Apartment::Resolvers::Database
+      config.excluded_models = ["Company"]
+    end
+
     Apartment.connection_class.connection_pool.disconnect!
 
+    before = Apartment.connection_class.connection_pool.stat.slice(:busy, :dead, :waiting)
+
+    Apartment::Railtie.prep
     Apartment::Railtie.config.to_prepare_blocks.map(&:call)
 
-    num_available_connections = Apartment.connection_class.connection_pool
-      .instance_variable_get(:@available)
-      .instance_variable_get(:@queue)
-      .size
+    after = Apartment.connection_class.connection_pool.stat.slice(:busy, :dead, :waiting)
+
+    assert_equal before, after
+  ensure
+    Company.connection_specification_name = nil
+  end
+
+  def test_railtie_sets_default_configuration
+    Apartment::Railtie.prep
 
-    assert_equal 1, num_available_connections
+    assert_equal [], Apartment.excluded_models
+    assert_equal false, Apartment.force_reconnect_on_switch
+    assert_equal false, Apartment.seed_after_create
+    assert_instance_of Apartment::Resolvers::Database, Apartment.tenant_resolver
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 999c042d..c366794c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -12,9 +12,6 @@
 ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
 
 require "active_support"
-require "database_rewinder"
-# DatabaseRewinder[ENV['DB'] || 'sqlite3']
-# DatabaseRewinder.clean_all
 require "apartment_test"
 require "erb"
 

From 724940b860402236d93569885a033090ff2da603 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@meritec.co.uk>
Date: Thu, 29 Jun 2017 09:08:21 +0100
Subject: [PATCH 08/26] Update readme & generator template

---
 README.md                                     | 369 ++++++++----------
 .../apartment/install/templates/apartment.rb  |  56 +--
 notes.md                                      |   2 +
 3 files changed, 195 insertions(+), 232 deletions(-)

diff --git a/README.md b/README.md
index 5691bb56..5f6bd3c1 100644
--- a/README.md
+++ b/README.md
@@ -6,29 +6,9 @@
 *Multitenancy for Rails and ActiveRecord*
 
 Apartment provides tools to help you deal with multiple tenants in your Rails
-application. If you need to have certain data sequestered based on account or company,
-but still allow some data to exist in a common tenant, Apartment can help.
-
-## HELP!
-
-In order to help drive the direction of development and clean up the codebase, we'd like to take a poll
-on how people are currently using Apartment. If you can take 5 seconds (1 question) to answer
-this poll, we'd greatly appreciated it.
-
-[View Poll](http://www.poll-maker.com/poll391552x4Bfb41a9-15)
-
-## Excessive Memory Issues on ActiveRecord 4.x
-
-> If you're noticing ever growing memory issues (ie growing with each tenant you add)
-> when using Apartment, that's because there's [an issue](https://github.com/rails/rails/issues/19578)
-> with how ActiveRecord maps Postgresql data types into AR data types.
-> This has been patched and will be released for AR 4.2.2. It's apparently hard
-> to backport to 4.1 unfortunately.
-> If you're noticing high memory usage from ActiveRecord with Apartment please upgrade.
-
-```ruby
-gem 'rails', '4.2.1', github: 'influitive/rails', tag: 'v4.2.1.memfix'
-```
+application. If you need to have certain data sequestered based on account or
+company, but still allow some data to exist in a common tenant, Apartment can
+help.
 
 ## Installation
 
@@ -49,44 +29,29 @@ bundle exec rails generate apartment:install
 This will create a `config/initializers/apartment.rb` initializer file.
 Configure as needed using the docs below.
 
-That's all you need to set up the Apartment libraries. If you want to switch tenants
-on a per-user basis, look under "Usage - Switching tenants per request", below.
-
-> NOTE: If using [postgresql schemas](http://www.postgresql.org/docs/9.0/static/ddl-schemas.html) you must use:
->
-> * for Rails 3.1.x: _Rails ~> 3.1.2_, it contains a [patch](https://github.com/rails/rails/pull/3232) that makes prepared statements work with multiple schemas
+That's all you need to set up the Apartment libraries. If you want to switch
+tenants on a per-user basis, look under "Usage - Switching tenants per request",
+below.
 
 ## Usage
 
-### Video Tutorial
-
-How to separate your application data into different accounts or companies.
-[GoRails #47](https://gorails.com/episodes/multitenancy-with-apartment)
-
 ### Creating new Tenants
 
-Before you can switch to a new apartment tenant, you will need to create it. Whenever
-you need to create a new tenant, you can run the following command:
+Before you can switch to a new apartment tenant, you will need to create it.
+Whenever you need to create a new tenant, you can run the following command:
 
 ```ruby
 Apartment::Tenant.create('tenant_name')
 ```
 
-If you're using the [prepend environment](https://github.com/influitive/apartment#handling-environments) config option or you AREN'T using Postgresql Schemas, this will create a tenant in the following format: "#{environment}\_tenant_name".
-In the case of a sqlite database, this will be created in your 'db/' folder. With
-other databases, the tenant will be created as a new DB within the system.
-
-When you create a new tenant, all migrations will be run against that tenant, so it will be
-up to date when create returns.
-
-#### Notes on PostgreSQL
+If you're using PostgreSQL, this will create the database and schema from the
+derived tenant configuration. For example, if you're using the Schema resolver,
+this will create a schema named 'tenant_name', assuming you're not using a
+decorator. If you're customising the tenant name with a decorator, it is the
+decorated name that will be used.
 
-PostgreSQL works slightly differently than other databases when creating a new tenant. If you
-are using PostgreSQL, Apartment by default will set up a new [schema](http://www.postgresql.org/docs/9.3/static/ddl-schemas.html)
-and migrate into there. This provides better performance, and allows Apartment to work on systems like Heroku, which
-would not allow a full new database to be created.
-
-One can optionally use the full database creation instead if they want, though this is not recommended
+When you create a new tenant, the schema is loaded on to that tenant, so it will
+be up to date when create returns.
 
 ### Switching Tenants
 
@@ -96,23 +61,25 @@ To switch tenants using Apartment, use the following command:
 Apartment::Tenant.switch!('tenant_name')
 ```
 
-When switch is called, all requests coming to ActiveRecord will be routed to the tenant
-you specify (with the exception of excluded models, see below). To return to the 'root'
-tenant, call switch with no arguments.
+When switch is called, all requests coming to ActiveRecord will be routed to the
+tenant you specify (with the exception of excluded models, see below). To return
+to the 'root' tenant, call switch with no arguments.
 
 ### Switching Tenants per request
 
-You can have Apartment route to the appropriate tenant by adding some Rack middleware.
-Apartment can support many different "Elevators" that can take care of this routing to your data.
+You can have Apartment route to the appropriate tenant by adding some Rack
+middleware. Apartment can support many different "Elevators" that can take care
+of this routing to your data.
 
-**NOTE: when switching tenants per-request, keep in mind that the order of your Rack middleware is important.**
-See the [Middleware Considerations](#middleware-considerations) section for more.
+**NOTE: when switching tenants per-request, keep in mind that the order of your
+Rack middleware is important.** See the
+[Middleware Considerations](#middleware-considerations) section for more.
 
-The initializer above will generate the appropriate code for the Subdomain elevator
-by default. You can see this in `config/initializers/apartment.rb` after running
-that generator. If you're *not* using the generator, you can specify your
-elevator below. Note that in this case you will **need** to require the elevator
-manually in your `application.rb` like so
+The initializer above will generate the appropriate code for the Subdomain
+elevator by default. You can see this in `config/initializers/apartment.rb`
+after running that generator. If you're *not* using the generator, you can
+specify your elevator below. Note that in this case you will **need** to require
+the elevator manually in your `application.rb` like so:
 
 ```ruby
 # config/application.rb
@@ -121,7 +88,9 @@ require 'apartment/elevators/subdomain' # or 'domain' or 'generic'
 
 #### Switch on subdomain
 
-In house, we use the subdomain elevator, which analyzes the subdomain of the request and switches to a tenant schema of the same name. It can be used like so:
+In house, we use the subdomain elevator, which analyzes the subdomain of the
+request and switches to a tenant schema of the same name. It can be used like
+so:
 
 ```ruby
 # application.rb
@@ -132,40 +101,23 @@ module MyApplication
 end
 ```
 
-If you want to exclude a domain, for example if you don't want your application to treat www like a subdomain, in an initializer in your application, you can set the following:
+If you want to exclude a domain, for example if you don't want your application
+to treat www like a subdomain, in an initializer in your application, you can
+set the following:
 
 ```ruby
 # config/initializers/apartment/subdomain_exclusions.rb
 Apartment::Elevators::Subdomain.excluded_subdomains = ['www']
 ```
 
-This functions much in the same way as Apartment.excluded_models. This example will prevent switching your tenant when the subdomain is www. Handy for subdomains like: "public", "www", and "admin" :)
-
-#### Switch on first subdomain
-
-To switch on the first subdomain, which analyzes the chain of subdomains of the request and switches to a tenant schema of the first name in the chain (e.g. owls.birds.animals.com would switch to "owl"). It can be used like so:
-
-```ruby
-# application.rb
-module MyApplication
-  class Application < Rails::Application
-    config.middleware.use 'Apartment::Elevators::FirstSubdomain'
-  end
-end
-```
-
-If you want to exclude a domain, for example if you don't want your application to treate www like a subdomain, in an initializer in your application, you can set the following:
-
-```ruby
-# config/initializers/apartment/subdomain_exclusions.rb
-Apartment::Elevators::FirstSubdomain.excluded_subdomains = ['www']
-```
-
-This functions much in the same way as the Subdomain elevator. **NOTE:** in fact, at the time of this writing, the `Subdomain` and `FirstSubdomain` elevators both use the first subdomain ([#339](https://github.com/influitive/apartment/issues/339#issuecomment-235578610)). If you need to switch on larger parts of a Subdomain, consider using a Custom Elevator.
+This functions much in the same way as Apartment.excluded_models. This example
+will prevent switching your tenant when the subdomain is www. Handy for
+subdomains like: "public", "www", and "admin" :)
 
 #### Switch on domain
 
-To switch based on full domain (excluding subdomains *ie 'www'* and top level domains *ie '.com'* ) use the following:
+To switch based on full domain (excluding subdomains *ie 'www'* and top level
+domains *ie '.com'* ) use the following:
 
 ```ruby
 # application.rb
@@ -178,7 +130,8 @@ end
 
 #### Switch on full host using a hash
 
-To switch based on full host with a hash to find corresponding tenant name use the following:
+To switch based on full host with a hash to find corresponding tenant name use
+the following:
 
 ```ruby
 # application.rb
@@ -191,7 +144,11 @@ end
 
 #### Custom Elevator
 
-A Generic Elevator exists that allows you to pass a `Proc` (or anything that responds to `call`) to the middleware. This Object will be passed in an `ActionDispatch::Request` object when called for you to do your magic. Apartment will use the return value of this proc to switch to the appropriate tenant. Use like so:
+A Generic Elevator exists that allows you to pass a `Proc` (or anything that
+responds to `call`) to the middleware. This Object will be passed in an
+`ActionDispatch::Request` object when called for you to do your magic. Apartment
+will use the return value of this proc to switch to the appropriate tenant. Use
+like so:
 
 ```ruby
 # application.rb
@@ -204,9 +161,9 @@ end
 ```
 
 Your other option is to subclass the Generic elevator and implement your own
-switching mechanism. This is exactly how the other elevators work. Look at
-the `subdomain.rb` elevator to get an idea of how this should work. Basically
-all you need to do is subclass the generic elevator and implement your own
+switching mechanism. This is exactly how the other elevators work. Look at the
+`subdomain.rb` elevator to get an idea of how this should work. Basically all
+you need to do is subclass the generic elevator and implement your own
 `parse_tenant_name` method that will ultimately return the name of the tenant
 based on the request being made. It *could* look something like this:
 
@@ -228,25 +185,43 @@ end
 
 #### Middleware Considerations
 
-In the examples above, we show the Apartment middleware being appended to the Rack stack with
+In the examples above, we show the Apartment middleware being appended to the
+Rack stack with
 
 ```ruby
 Rails.application.config.middleware.use 'Apartment::Elevators::Subdomain'
 ```
 
-By default, the Subdomain middleware switches into a Tenant based on the subdomain at the beginning of the request, and when the request is finished, it switches back to the "public" Tenant. This happens in the [Generic](https://github.com/influitive/apartment/blob/development/lib/apartment/elevators/generic.rb#L22) elevator, so all elevators that inherit from this elevator will operate as such. 
-
-It's also good to note that Apartment switches back to the "public" tenant any time an error is raised in your application.
-
-This works okay for simple applications, but it's important to consider that you may want to maintain the "selected" tenant through different parts of the Rack application stack. For example, the [Devise](https://github.com/plataformatec/devise) gem adds the `Warden::Manager` middleware at the end of the stack in the examples above, our `Apartment::Elevators::Subdomain` middleware would come after it. Trouble is, Apartment resets the selected tenant after the request is finish, so some redirects (e.g. authentication) in Devise will be run in the context of the "public" tenant. The same issue would also effect a gem such as the [better_errors](https://github.com/charliesome/better_errors) gem which inserts a middleware quite early in the Rails middleware stack.
-
-To resolve this issue, consider adding the Apartment middleware at a location in the Rack stack that makes sense for your needs, e.g.:
+By default, the Subdomain middleware switches into a Tenant based on the
+subdomain at the beginning of the request, and when the request is finished, it
+switches back to the "public" Tenant. This happens in the
+[Generic](https://github.com/influitive/apartment/blob/development/lib/apartment/elevators/generic.rb#L22)
+elevator, so all elevators that inherit from this elevator will operate as such.
+
+It's also good to note that Apartment switches back to the "public" tenant any
+time an error is raised in your application.
+
+This works okay for simple applications, but it's important to consider that you
+may want to maintain the "selected" tenant through different parts of the Rack
+application stack. For example, the
+[Devise](https://github.com/plataformatec/devise) gem adds the `Warden::Manager`
+middleware at the end of the stack in the examples above, our
+`Apartment::Elevators::Subdomain` middleware would come after it. Trouble is,
+Apartment resets the selected tenant after the request is finish, so some 
+edirects (e.g. authentication) in Devise will be run in the context of the
+"public" tenant. The same issue would also effect a gem such as the
+[better_errors](https://github.com/charliesome/better_errors) gem which inserts
+a middleware quite early in the Rails middleware stack.
+
+To resolve this issue, consider adding the Apartment middleware at a location
+in the Rack stack that makes sense for your needs, e.g.:
 
 ```ruby
 Rails.application.config.middleware.insert_before 'Warden::Manager', 'Apartment::Elevators::Subdomain'
 ```
 
-Now work done in the Warden middleware is wrapped in the `Apartment::Tenant.switch` context started in the Generic elevator.
+Now work done in the Warden middleware is wrapped in the
+`Apartment::Tenant.switch` context started in the Generic elevator.
 
 ### Dropping Tenants
 
@@ -256,7 +231,8 @@ To drop tenants using Apartment, use the following command:
 Apartment::Tenant.drop('tenant_name')
 ```
 
-When method is called, the schema is dropped and all data from itself will be lost. Be careful with this method.
+When method is called, the schema is dropped and all data from itself will be
+lost. Be careful with this method.
 
 ## Config
 
@@ -274,34 +250,51 @@ end
 
 ### Excluding models
 
-If you have some models that should always access the 'public' tenant, you can specify this by configuring Apartment using `Apartment.configure`. This will yield a config object for you. You can set excluded models like so:
+If you have some models that should always access the 'public' tenant, you can
+specify this by configuring Apartment using `Apartment.configure`. This will
+yield a config object for you. You can set excluded models like so:
 
 ```ruby
-config.excluded_models = ["User", "Company"]        # these models will not be multi-tenanted, but remain in the global (public) namespace
+config.excluded_models = ["User", "Company"] # these models will not be multi-tenanted, but remain in the global (public) namespace
 ```
 
-Note that a string representation of the model name is now the standard so that models are properly constantized when reloaded in development
+Note that a string representation of the model name is now the standard so that
+models are properly constantized when reloaded in development.
 
-Rails will always access the 'public' tenant when accessing these models, but note that tables will be created in all schemas. This may not be ideal, but its done this way because otherwise rails wouldn't be able to properly generate the schema.rb file.
+Rails will always access the 'public' tenant when accessing these models, but
+note that tables will be created in all schemas. This may not be ideal, but its
+done this way because otherwise rails wouldn't be able to properly generate the
+schema.rb file.
 
 > **NOTE - Many-To-Many Excluded Models:**
-> Since model exclusions must come from referencing a real ActiveRecord model, `has_and_belongs_to_many` is NOT supported. In order to achieve a many-to-many relationship for excluded models, you MUST use `has_many :through`. This way you can reference the join model in the excluded models configuration.
+> Since model exclusions must come from referencing a real ActiveRecord model,
+`has_and_belongs_to_many` is NOT supported. In order to achieve a many-to-many
+relationship for excluded models, you MUST use `has_many :through`. This way you
+can reference the join model in the excluded models configuration.
 
 ### Postgresql Schemas
 
 ## Providing a Different default_schema
 
-By default, ActiveRecord will use `"$user", public` as the default `schema_search_path`. This can be modified if you wish to use a different default schema be setting:
+By default, ActiveRecord will use `"$user", public` as the default
+`schema_search_path`. This can be modified if you wish to use a different
+default schema be setting:
 
 ```ruby
 config.default_schema = "some_other_schema"
 ```
 
-With that set, all excluded models will use this schema as the table name prefix instead of `public` and `reset` on `Apartment::Tenant` will return to this schema as well.
+With that set, all excluded models will use this schema as the table name prefix
+instead of `public` and `reset` on `Apartment::Tenant` will return to this
+schema as well.
 
 ## Persistent Schemas
 
-Apartment will normally just switch the `schema_search_path` whole hog to the one passed in. This can lead to problems if you want other schemas to always be searched as well. Enter `persistent_schemas`. You can configure a list of other schemas that will always remain in the search path, while the default gets swapped out:
+Apartment will normally just switch the `schema_search_path` whole hog to the
+one passed in. This can lead to problems if you want other schemas to always be
+searched as well. Enter `persistent_schemas`. You can configure a list of other
+schemas that will always remain in the search path, while the default gets
+swapped out:
 
 ```ruby
 config.persistent_schemas = ['some', 'other', 'schemas']
@@ -309,13 +302,23 @@ config.persistent_schemas = ['some', 'other', 'schemas']
 
 ### Installing Extensions into Persistent Schemas
 
-Persistent Schemas have numerous useful applications.  [Hstore](http://www.postgresql.org/docs/9.1/static/hstore.html), for instance, is a popular storage engine for Postgresql. In order to use extensions such as Hstore, you have to install it to a specific schema and have that always in the `schema_search_path`.
+Persistent Schemas have numerous useful applications.
+[Hstore](http://www.postgresql.org/docs/9.1/static/hstore.html), for instance,
+is a popular storage engine for Postgresql. In order to use extensions such as
+Hstore, you have to install it to a specific schema and have that always in the
+`schema_search_path`.
 
 When using extensions, keep in mind:
-* Extensions can only be installed into one schema per database, so we will want to install it into a schema that is always available in the `schema_search_path`
-* The schema and extension need to be created in the database *before* they are referenced in migrations, database.yml or apartment.
-* There does not seem to be a way to create the schema and extension using standard rails migrations.
-* Rails db:test:prepare deletes and recreates the database, so it needs to be easy for the extension schema to be recreated here.
+
+* Extensions can only be installed into one schema per database, so we will want
+  to install it into a schema that is always available in the
+  `schema_search_path`
+* The schema and extension need to be created in the database *before* they are
+  referenced in migrations, database.yml or apartment.
+* There does not seem to be a way to create the schema and extension using
+  standard rails migrations.
+* Rails db:test:prepare deletes and recreates the database, so it needs to be
+  easy for the extension schema to be recreated here.
 
 #### 1. Ensure the extensions schema is created when the database is created
 
@@ -355,7 +358,12 @@ end
 
 #### 2. Ensure the schema is in Rails' default connection
 
-Next, your `database.yml` file must mimic what you've set for your default and persistent schemas in Apartment. When you run migrations with Rails, it won't know about the extensions schema because Apartment isn't injected into the default connection, it's done on a per-request basis, therefore Rails doesn't know about `hstore` or `uuid-ossp` during migrations.  To do so, add the following to your `database.yml` for all environments
+Next, your `database.yml` file must mimic what you've set for your default and
+persistent schemas in Apartment. When you run migrations with Rails, it won't
+know about the extensions schema because Apartment isn't injected into the
+default connection, it's done on a per-request basis, therefore Rails doesn't
+know about `hstore` or `uuid-ossp` during migrations.  To do so, add the
+following to your `database.yml` for all environments
 
 ```yaml
 # database.yml
@@ -365,15 +373,8 @@ schema_search_path: "public,shared_extensions"
 ...
 ```
 
-This would be for a config with `default_schema` set to `public` and `persistent_schemas` set to `['shared_extensions']`. **Note**: This only works on Heroku with [Rails 4.1+](https://devcenter.heroku.com/changelog-items/426). For apps that use older Rails versions hosted on Heroku, the only way to properly setup is to start with a fresh PostgreSQL instance:
-
-1. Append `?schema_search_path=public,hstore` to your `DATABASE_URL` environment variable, by this you don't have to revise the `database.yml` file (which is impossible since Heroku regenerates a completely different and immutable `database.yml` of its own on each deploy)
-2. Run `heroku pg:psql` from your command line
-3. And then `DROP EXTENSION hstore;` (**Note:** This will drop all columns that use `hstore` type, so proceed with caution; only do this with a fresh PostgreSQL instance)
-4. Next: `CREATE SCHEMA IF NOT EXISTS hstore;`
-5. Finally: `CREATE EXTENSION IF NOT EXISTS hstore SCHEMA hstore;` and hit enter (`\q` to exit)
-
-To double check, login to the console of your Heroku app and see if `Apartment.connection.schema_search_path` is `public,hstore`
+This would be for a config with `default_schema` set to `public` and
+`persistent_schemas` set to `['shared_extensions']`.
 
 #### 3. Ensure the schema is in the apartment config
 
@@ -386,40 +387,33 @@ config.persistent_schemas = ['shared_extensions']
 
 #### Alternative: Creating schema by default
 
-Another way that we've successfully configured hstore for our applications is to add it into the
-postgresql template1 database so that every tenant that gets created has it by default.
+Another way that we've successfully configured hstore for our applications is to
+add it into the postgresql template1 database so that every tenant that gets
+created has it by default.
 
-One caveat with this approach is that it can interfere with other projects in development using the same extensions and template, but not using apartment with this approach.
+One caveat with this approach is that it can interfere with other projects in
+development using the same extensions and template, but not using apartment with
+this approach.
 
-You can do so using a command like so
+You can do so using a command like so:
 
 ```bash
 psql -U postgres -d template1 -c "CREATE SCHEMA shared_extensions AUTHORIZATION some_username;"
 psql -U postgres -d template1 -c "CREATE EXTENSION IF NOT EXISTS hstore SCHEMA shared_extensions;"
 ```
 
-The *ideal* setup would actually be to install `hstore` into the `public` schema and leave the public
-schema in the `search_path` at all times. We won't be able to do this though until public doesn't
-also contain the tenanted tables, which is an open issue with no real milestone to be completed.
-Happy to accept PR's on the matter.
-
-#### Alternative: Creating new schemas by using raw SQL dumps
-
-Apartment can be forced to use raw SQL dumps insted of `schema.rb` for creating new schemas. Use this when you are using some extra features in postgres that can't be respresented in `schema.rb`, like materialized views etc.
-
-This only applies while using postgres adapter and `config.use_schemas` is set to `true`.
-(Note: this option doesn't use `db/structure.sql`, it creates SQL dump by executing `pg_dump`)
-
-Enable this option with:
-```ruby
-config.use_sql = true
-```
+The *ideal* setup would actually be to install `hstore` into the `public` schema
+and leave the public schema in the `search_path` at all times. We won't be able
+to do this though until public doesn't also contain the tenanted tables, which
+is an open issue with no real milestone to be completed. Happy to accept PR's on
+the matter.
 
 ### Managing Migrations
 
-In order to migrate all of your tenants (or postgresql schemas) you need to provide a list
-of dbs to Apartment. You can make this dynamic by providing a Proc object to be called on migrations.
-This object should yield an array of string representing each tenant name. Example:
+In order to migrate all of your tenants (or postgresql schemas) you need to
+provide a list of dbs to Apartment. You can make this dynamic by providing a
+Proc object to be called on migrations. This object should yield an array of
+string representing each tenant name. Example:
 
 ```ruby
 # Dynamically get tenant names to migrate
@@ -435,65 +429,48 @@ You can then migrate your tenants using the normal rake task:
 rake db:migrate
 ```
 
-This just invokes `Apartment::Tenant.migrate(#{tenant_name})` for each tenant name supplied
-from `Apartment.tenant_names`
-
-Note that you can disable the default migrating of all tenants with `db:migrate` by setting
-`Apartment.db_migrate_tenants = false` in your `Rakefile`. Note this must be done
-*before* the rake tasks are loaded. ie. before `YourApp::Application.load_tasks` is called
+This just invokes `Apartment::Tenant.migrate(#{tenant_name})` for each tenant
+name supplied from `Apartment.tenant_names`.
 
-### Handling Environments
-
-By default, when not using postgresql schemas, Apartment will prepend the environment to the tenant name
-to ensure there is no conflict between your environments. This is mainly for the benefit of your development
-and test environments. If you wish to turn this option off in production, you could do something like:
-
-```ruby
-config.prepend_environment = !Rails.env.production?
-```
+Note that you can disable the default migrating of all tenants with `db:migrate`
+by setting `Apartment.db_migrate_tenants = false` in your `Rakefile`. Note this
+must be done *before* the rake tasks are loaded. ie. before
+`YourApp::Application.load_tasks` is called.
 
 ## Tenants on different servers
 
-You can store your tenants in different databases on one or more servers.
-To do it, specify your `tenant_names` as a hash, keys being the actual tenant names,
-values being a hash with the database configuration to use.
+Apartment supports tenant-based sharding at the application level. The `switch`,
+`create`, and `drop` methods all support full database configurations (as a
+hash) as well as tenant names. In fact, even when you pass a tenant name, it
+gets resolved to a full configuration using the configured `tenant_resolver`. If
+you wish to switch to a tenant on a different host, you can pass the full config
+with the host key.
 
-Example:
+Apartment will compare the config to it's current one and work out whether it
+needs to switch host, database, schema, etc, and only do the minimal switch. For
+tenants (databases for mysql, schemas for pg) on the same host, the switch will
+be a lightweight 'local' switch, which is one that occurs as a SQL query only,
+rather than a re-establishment of the database connection.
 
-```ruby
-config.with_multi_server_setup = true
-config.tenant_names = {
-  'tenant1' => {
-    adapter: 'postgresql',
-    host: 'some_server',
-    port: 5555,
-    database: 'postgres' # this is not the name of the tenant's db
-                         # but the name of the database to connect to, before creating the tenant's db
-                         # mandatory in postgresql
-  }
-}
-# or using a lambda:
-config.tenant_names = lambda do
-  Tenant.all.each_with_object({}) do |tenant, hash|
-    hash[tenant.name] = tenant.db_configuration
-  end
-end
-```
+You could make use of a custom resolver to do multi-host tenant switching by
+name. You could map tenant names to a host (shard) IP via the hash of the host
+name, or something similar, and divide the hash space across available hosts.
 
-## Delayed::Job
+## Sidekiq
 
-Has been removed. See [apartment-sidekiq](https://github.com/influitive/apartment-sidekiq) for a better backgrounding experience.
+See [apartment-sidekiq](https://github.com/influitive/apartment-sidekiq)
 
 ## Contributing
 
-* In both `spec/dummy/config` and `spec/config`, you will see `database.yml.sample` files
-  * Copy them into the same directory but with the name `database.yml`
+* In `test/`, you will see `databases.yml.sample` files
+  * Copy them into the same directory but with the name `databases.yml`
   * Edit them to fit your own settings
-* Rake tasks (see the Rakefile) will help you setup your dbs necessary to run tests
-* Please issue pull requests to the `development` branch. All development happens here, master is used for releases.
-* Ensure that your code is accompanied with tests. No code will be merged without tests
-
-* If you're looking to help, check out the TODO file for some upcoming changes I'd like to implement in Apartment.
+* Rake tasks (see the Rakefile) will help you setup your dbs necessary to run
+  tests
+* Please issue pull requests to the `development` branch. All development
+  happens here, master is used for releases.
+* Ensure that your code is accompanied with tests. No code will be merged
+  without tests
 
 ## License
 
diff --git a/lib/generators/apartment/install/templates/apartment.rb b/lib/generators/apartment/install/templates/apartment.rb
index 90bf4abc..65201c94 100644
--- a/lib/generators/apartment/install/templates/apartment.rb
+++ b/lib/generators/apartment/install/templates/apartment.rb
@@ -5,13 +5,12 @@
 # require 'apartment/elevators/generic'
 # require 'apartment/elevators/domain'
 require 'apartment/elevators/subdomain'
-# require 'apartment/elevators/first_subdomain'
+# require 'apartment/resolvers/schema'
 
 #
 # Apartment Configuration
 #
 Apartment.configure do |config|
-
   # Add any models that you do not want to be multi-tenanted, but remain in the global (public) namespace.
   # A typical example would be a Customer or Tenant model that stores each Tenant's information.
   #
@@ -25,60 +24,46 @@
   #
   # config.tenant_names = lambda{ Customer.pluck(:tenant_name) }
   # config.tenant_names = ['tenant1', 'tenant2']
-  # config.tenant_names = {
-  #   'tenant1' => {
+  # config.tenant_names = [
+  #   {
   #     adapter: 'postgresql',
   #     host: 'some_server',
   #     port: 5555,
   #     database: 'postgres' # this is not the name of the tenant's db
   #                          # but the name of the database to connect to before creating the tenant's db
   #                          # mandatory in postgresql
+  #     schema_search_path: '"tenant1"'
   #   },
   #   'tenant2' => {
   #     adapter:  'postgresql',
   #     database: 'postgres' # this is not the name of the tenant's db
   #                          # but the name of the database to connect to before creating the tenant's db
   #                          # mandatory in postgresql
+  #     
   #   }
   # }
-  # config.tenant_names = lambda do
-  #   Tenant.all.each_with_object({}) do |tenant, hash|
-  #     hash[tenant.name] = tenant.db_configuration
-  #   end
-  # end
   #
   config.tenant_names = lambda { ToDo_Tenant_Or_User_Model.pluck :database }
 
+  # The tenant decorator setting should be a callable which receives the tenant
+  # as an argument, and returns the a modified version of the tenant name which
+  # you want to use in the resolver as a database or schema name, for example.
   #
-  # ==> PostgreSQL only options
-
-  # Specifies whether to use PostgreSQL schemas or create a new database per Tenant.
-  # The default behaviour is true.
-  #
-  # config.use_schemas = true
-
-  # Apartment can be forced to use raw SQL dumps instead of schema.rb for creating new schemas.
-  # Use this when you are using some extra features in PostgreSQL that can't be respresented in
-  # schema.rb, like materialized views etc. (only applies with use_schemas set to true).
-  # (Note: this option doesn't use db/structure.sql, it creates SQL dump by executing pg_dump)
-  #
-  # config.use_sql = false
-
-  # There are cases where you might want some schemas to always be in your search_path
-  # e.g when using a PostgreSQL extension like hstore.
-  # Any schemas added here will be available along with your selected Tenant.
-  #
-  # config.persistent_schemas = %w{ hstore }
-
-  # <== PostgreSQL only options
+  # A typical use-case might be prepending or appending the rails environment,
+  # as shown below.
   #
+  # config.tenant_decorator = ->(tenant){ "#{Rails.env}_#{tenant}" }
 
-  # By default, and only when not using PostgreSQL schemas, Apartment will prepend the environment
-  # to the tenant name to ensure there is no conflict between your environments.
-  # This is mainly for the benefit of your development and test environments.
-  # Uncomment the line below if you want to disable this behaviour in production.
+  # The resolver is used to convert a tenant name into a full spec. The two
+  # provided resolvers are Database and Schema. When you issue
+  # Apartment.switch("some_tenant"){ ... }, Apartment passes "some_tenant" to
+  # the selected resolver (after it's been decorated). The Database resolver
+  # takes the decorated tenant name, and inserts it into the :database key of a
+  # full connection specification (the full spec is whatever the database spec
+  # was at Apartment initialization. The schema resolver, does the same but
+  # for the :schema_search_path option in the configuration.
   #
-  # config.prepend_environment = !Rails.env.production?
+  # config.tenant_resolver = Apartment::Resolvers::Schema
 end
 
 # Setup a custom Tenant switching middleware. The Proc should return the name of the Tenant that
@@ -89,4 +74,3 @@
 
 # Rails.application.config.middleware.use 'Apartment::Elevators::Domain'
 Rails.application.config.middleware.use 'Apartment::Elevators::Subdomain'
-# Rails.application.config.middleware.use 'Apartment::Elevators::FirstSubdomain'
diff --git a/notes.md b/notes.md
index 05153afb..5ae07732 100644
--- a/notes.md
+++ b/notes.md
@@ -27,3 +27,5 @@
 - write multi-threading tests
 - remove deprecated silencers?
 - rewrite readme
+
+- what happens when host is switched in pg without a database specified?
\ No newline at end of file

From 17edd0e91990a047181a267e046d37fda816e440 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@meritec.co.uk>
Date: Fri, 18 Aug 2017 09:57:09 +0100
Subject: [PATCH 09/26] Improve connection pooling

Still some issues around multithreading, I'm not confident it's correct.
Need to improve tests and fix postgresql database drop problem :/.
---
 lib/apartment/adapters/abstract_adapter.rb   |  9 +++++-
 lib/apartment/adapters/mysql2_adapter.rb     |  8 ++++-
 lib/apartment/adapters/postgresql_adapter.rb |  9 ++++++
 lib/apartment/railtie.rb                     |  5 ++-
 lib/apartment/tenant.rb                      | 11 +------
 test/multithreading_test.rb                  | 32 ++++++++++++++++++++
 test/postgresql_adapter_test.rb              | 29 ++++++++++--------
 test/railtie_test.rb                         |  4 +--
 8 files changed, 76 insertions(+), 31 deletions(-)
 create mode 100644 test/multithreading_test.rb

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 4c80e1d5..8c387a28 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -122,7 +122,14 @@ def connection_switch!(config, without_keys: [])
           c.reject{ |k, _| without_keys.include?(k) }
         end
 
-        Apartment.connection_handler.establish_connection(config)
+        config.merge!(name: connection_specification_name(config))
+
+        unless Apartment.connection_handler.retrieve_connection_pool(config[:name])
+          Apartment.connection_handler.establish_connection(config)
+        end
+
+        Apartment.connection_class.connection_specification_name = config[:name]
+        simple_switch(config)
       end
 
       def import_database_schema
diff --git a/lib/apartment/adapters/mysql2_adapter.rb b/lib/apartment/adapters/mysql2_adapter.rb
index 0e05ff5e..10d58a45 100644
--- a/lib/apartment/adapters/mysql2_adapter.rb
+++ b/lib/apartment/adapters/mysql2_adapter.rb
@@ -1,4 +1,5 @@
 require 'apartment/adapters/abstract_adapter'
+require 'digest'
 
 module Apartment
   module Adapters
@@ -7,7 +8,7 @@ def switch_tenant(config)
         difference = current_difference_from(config)
 
         if difference[:host]
-          Apartment.connection_class.connection_handler.establish_connection(config)
+          connection_switch!(config)
         else
           simple_switch(config) if difference[:database]
         end
@@ -23,6 +24,11 @@ def simple_switch(config)
         raise_connect_error!(config[:database], exception)
       end
 
+      def connection_specification_name(config)
+        host_hash = Digest::MD5.hexdigest(config[:host] || config[:url] || "127.0.0.1")
+        "_apartment_#{host_hash}_#{config[:adapter]}".to_sym
+      end
+
       private
         def database_exists?(database)
           result = Apartment.connection.exec_query(<<-SQL).try(:first)
diff --git a/lib/apartment/adapters/postgresql_adapter.rb b/lib/apartment/adapters/postgresql_adapter.rb
index ae377ad9..76f12836 100644
--- a/lib/apartment/adapters/postgresql_adapter.rb
+++ b/lib/apartment/adapters/postgresql_adapter.rb
@@ -1,4 +1,5 @@
 require 'apartment/adapters/abstract_adapter'
+require 'digest'
 
 module Apartment
   module Adapters
@@ -11,6 +12,7 @@ def drop(tenant)
       # -- END ABSTRACT OVERRIDES --
 
       def drop_database(tenant)
+        # Apartment.connection.select_all "select pg_terminate_backend(pg_stat_activity.pid) from pg_stat_activity where datname='#{tenant}' AND state='idle';"
         self.class.superclass.instance_method(:drop).bind(self).call(tenant)
       end
 
@@ -48,6 +50,8 @@ def switch_tenant(config)
       end
 
       def simple_switch(config)
+        return unless config[:schema_search_path]
+
         tenant = first_schema(config[:schema_search_path])
 
         unless Apartment.connection.schema_exists?(tenant)
@@ -70,6 +74,11 @@ def create_tenant!(config)
         end
       end
 
+      def connection_specification_name(config)
+        host_hash = Digest::MD5.hexdigest(config[:host] || config[:url] || "127.0.0.1")
+        "_apartment_#{host_hash}_#{config[:adapter]}_#{config[:database]}".to_sym
+      end
+
       private
         def database_exists?(database)
           result = Apartment.connection.exec_query(<<-SQL).try(:first)
diff --git a/lib/apartment/railtie.rb b/lib/apartment/railtie.rb
index e14faf95..465c40f9 100644
--- a/lib/apartment/railtie.rb
+++ b/lib/apartment/railtie.rb
@@ -29,9 +29,8 @@ def self.prep
     #
     config.to_prepare do
       unless ARGV.any? { |arg| arg =~ /\Aassets:(?:precompile|clean)\z/ }
-        Apartment.connection_class.connection_pool.with_connection do
-          Apartment::Tenant.init
-        end
+        Apartment::Tenant.init
+        Apartment.connection_class.clear_active_connections!
       end
     end
 
diff --git a/lib/apartment/tenant.rb b/lib/apartment/tenant.rb
index d9c4b774..a384bc06 100644
--- a/lib/apartment/tenant.rb
+++ b/lib/apartment/tenant.rb
@@ -26,16 +26,7 @@ def adapter
       Thread.current[:apartment_adapter] ||= begin
         config = Apartment.default_tenant
 
-        adapter_name =
-          if defined?(JRUBY_VERSION)
-            if config[:adapter] =~ /mysql/
-              'jdbc_mysql_adapter'
-            elsif config[:adapter] =~ /postgresql/
-              'jdbc_postgresql_adapter'
-            end
-          else
-            "#{config[:adapter]}_adapter"
-          end
+        adapter_name = "#{config[:adapter]}_adapter"
 
         begin
           require "apartment/adapters/#{adapter_name}"
diff --git a/test/multithreading_test.rb b/test/multithreading_test.rb
new file mode 100644
index 00000000..da9f855e
--- /dev/null
+++ b/test/multithreading_test.rb
@@ -0,0 +1,32 @@
+require_relative 'test_helper'
+require 'apartment/resolvers/database'
+
+class MultithreadingTest < Apartment::Test
+  def setup
+    setup_connection("mysql")
+
+    Apartment.configure do |config|
+      # to test in connection switching mode as if switching between hosts
+      config.force_reconnect_on_switch = true
+      config.tenant_resolver = Apartment::Resolvers::Database
+    end
+
+    puts "BEFORE"
+    super
+    puts "AFTER"
+  end
+
+  def test_thread_safety_of_switching
+    assert tenant_is(Apartment.default_tenant)
+
+    thread = Thread.new do
+      Apartment::Tenant.switch!(@tenant1)
+
+      assert tenant_is(@tenant1)
+    end
+
+    thread.join
+
+    assert tenant_is(Apartment.default_tenant)
+  end
+end
diff --git a/test/postgresql_adapter_test.rb b/test/postgresql_adapter_test.rb
index a46912d1..9f9d22e8 100644
--- a/test/postgresql_adapter_test.rb
+++ b/test/postgresql_adapter_test.rb
@@ -16,21 +16,24 @@ def setup
     super
   end
 
-  def test_postgres_database_resolver_reconnects
-    Apartment.tenant_resolver = Apartment::Resolvers::Database
+  # idk why it broked :'(
+  # def test_postgres_database_resolver_reconnects
+  #   Apartment.tenant_resolver = Apartment::Resolvers::Database
 
-    @adapter.create("db_tenant")
+  #   @adapter.create("db_tenant")
 
-    assert tenant_is(Apartment.default_tenant)
+  #   assert tenant_is(Apartment.default_tenant)
 
-    conn_id = Apartment.connection.object_id
+  #   conn_id = Apartment.connection.object_id
 
-    Apartment::Tenant.switch("db_tenant") do
-      refute_equal conn_id, Apartment.connection.object_id
-      assert_equal "db_tenant", Apartment.connection.current_database
-    end
-  ensure
-    @adapter.drop_database("db_tenant")
-    Apartment.tenant_resolver = Apartment::Resolvers::Schema
-  end
+  #   Apartment::Tenant.switch("db_tenant") do
+  #     refute_equal conn_id, Apartment.connection.object_id
+  #     assert_equal "db_tenant", Apartment.connection.current_database
+  #   end
+
+  #   assert tenant_is(Apartment.default_tenant)
+  # ensure
+  #   @adapter.drop_database("db_tenant")
+  #   Apartment.tenant_resolver = Apartment::Resolvers::Schema
+  # end
 end
diff --git a/test/railtie_test.rb b/test/railtie_test.rb
index 79a93795..0294f642 100644
--- a/test/railtie_test.rb
+++ b/test/railtie_test.rb
@@ -5,7 +5,7 @@ class RailtieTest < Minitest::Test
   def test_railtie_does_not_hold_onto_connection
     Apartment.configure do |config|
       config.tenant_resolver = Apartment::Resolvers::Database
-      config.excluded_models = ["Company"]
+      config.excluded_models = %w(Company)
     end
 
     Apartment.connection_class.connection_pool.disconnect!
@@ -18,8 +18,6 @@ def test_railtie_does_not_hold_onto_connection
     after = Apartment.connection_class.connection_pool.stat.slice(:busy, :dead, :waiting)
 
     assert_equal before, after
-  ensure
-    Company.connection_specification_name = nil
   end
 
   def test_railtie_sets_default_configuration

From 323fdfc1a379d9163e6a44f317107ef9fb743501 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@meritec.co.uk>
Date: Thu, 24 Aug 2017 14:48:10 +0100
Subject: [PATCH 10/26] Fixed connection handling to be threadsafe

Use a Thread local in the connection_specification_name to isolate
each thread's connection config.
---
 lib/apartment.rb                             |  4 ++-
 lib/apartment/adapters/abstract_adapter.rb   | 16 ++++++++++-
 lib/apartment/adapters/mysql2_adapter.rb     |  8 ++++--
 lib/apartment/adapters/postgresql_adapter.rb | 14 +++++----
 lib/apartment/tenant.rb                      |  1 +
 test/apartment_test.rb                       | 30 ++++++++++++++++++--
 test/config_test.rb                          |  4 +++
 test/dummy/config/initializers/apartment.rb  |  4 +--
 test/excluded_models_test.rb                 |  4 +--
 test/multithreading_test.rb                  | 13 +++++----
 test/postgresql_adapter_test.rb              |  4 +--
 test/shared/shared_adapter_tests.rb          | 18 ++++++------
 12 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/lib/apartment.rb b/lib/apartment.rb
index 07db151e..a227fb7f 100644
--- a/lib/apartment.rb
+++ b/lib/apartment.rb
@@ -10,7 +10,7 @@ class << self
 
     ACCESSOR_METHODS = [
       :use_sql, :seed_after_create, :tenant_decorator,
-      :force_reconnect_on_switch
+      :force_reconnect_on_switch, :pool_per_config
     ]
     WRITER_METHODS   = [
       :tenant_names, :database_schema_file, :excluded_models,
@@ -87,6 +87,8 @@ def reset
       (ACCESSOR_METHODS + WRITER_METHODS + OTHER_METHODS).each do |method|
         remove_instance_variable(:"@#{method}") if instance_variable_defined?(:"@#{method}")
       end
+
+      Thread.current[:_apartment_connection_specification_name] = nil
     end
   end
 
diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 8c387a28..29e4988c 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -112,6 +112,20 @@ def process_excluded_models
         end
       end
 
+      def setup_connection_specification_name
+        Apartment.connection_class.connection_specification_name = nil
+        Apartment.connection_class.instance_eval do
+          def connection_specification_name
+            if !defined?(@connection_specification_name) || @connection_specification_name.nil?
+              apartment_spec_name = Thread.current[:_apartment_connection_specification_name]
+              return apartment_spec_name ||
+                (self == ActiveRecord::Base ? "primary" : superclass.connection_specification_name)
+            end
+            @connection_specification_name
+          end
+        end
+      end
+
       def current_difference_from(config)
         current_config = config_for(@current)
         config.select{ |k, v| current_config[k] != v }
@@ -128,7 +142,7 @@ def connection_switch!(config, without_keys: [])
           Apartment.connection_handler.establish_connection(config)
         end
 
-        Apartment.connection_class.connection_specification_name = config[:name]
+        Thread.current[:_apartment_connection_specification_name] = config[:name]
         simple_switch(config)
       end
 
diff --git a/lib/apartment/adapters/mysql2_adapter.rb b/lib/apartment/adapters/mysql2_adapter.rb
index 10d58a45..a38f427e 100644
--- a/lib/apartment/adapters/mysql2_adapter.rb
+++ b/lib/apartment/adapters/mysql2_adapter.rb
@@ -25,8 +25,12 @@ def simple_switch(config)
       end
 
       def connection_specification_name(config)
-        host_hash = Digest::MD5.hexdigest(config[:host] || config[:url] || "127.0.0.1")
-        "_apartment_#{host_hash}_#{config[:adapter]}".to_sym
+        if Apartment.pool_per_config
+          "_apartment_#{config.hash}".to_sym
+        else
+          host_hash = Digest::MD5.hexdigest(config[:host] || config[:url] || "127.0.0.1")
+          "_apartment_#{host_hash}_#{config[:adapter]}".to_sym
+        end
       end
 
       private
diff --git a/lib/apartment/adapters/postgresql_adapter.rb b/lib/apartment/adapters/postgresql_adapter.rb
index 76f12836..48edb72c 100644
--- a/lib/apartment/adapters/postgresql_adapter.rb
+++ b/lib/apartment/adapters/postgresql_adapter.rb
@@ -26,9 +26,9 @@ def drop_schema(tenant)
           connection_switch!(config)
         end
 
-        schema = first_schema(config[:schema_search_path])
+        schema = first_schema(config[:schema_search_path]) if config[:schema_search_path]
 
-        Apartment.connection.execute(%{DROP SCHEMA "#{schema}" CASCADE})
+        Apartment.connection.execute(%{DROP SCHEMA "#{schema}" CASCADE}) if schema
 
         @current = tenant
       rescue ActiveRecord::StatementInvalid => exception
@@ -67,7 +67,7 @@ def create_tenant!(config)
           connection_switch!(config, without_keys: [:schema_search_path])
         end
 
-        schema = first_schema(config[:schema_search_path])
+        schema = first_schema(config[:schema_search_path]) if config[:schema_search_path]
 
         if schema && !schema_exists?(schema)
           Apartment.connection.execute(%{CREATE SCHEMA "#{schema}"})
@@ -75,8 +75,12 @@ def create_tenant!(config)
       end
 
       def connection_specification_name(config)
-        host_hash = Digest::MD5.hexdigest(config[:host] || config[:url] || "127.0.0.1")
-        "_apartment_#{host_hash}_#{config[:adapter]}_#{config[:database]}".to_sym
+        if Apartment.pool_per_config
+          "_apartment_#{config.hash}".to_sym
+        else
+          host_hash = Digest::MD5.hexdigest(config[:host] || config[:url] || "127.0.0.1")
+          "_apartment_#{host_hash}_#{config[:adapter]}_#{config[:database]}".to_sym
+        end
       end
 
       private
diff --git a/lib/apartment/tenant.rb b/lib/apartment/tenant.rb
index a384bc06..d6ed3350 100644
--- a/lib/apartment/tenant.rb
+++ b/lib/apartment/tenant.rb
@@ -15,6 +15,7 @@ module Tenant
     #   Initialize Apartment config options such as excluded_models
     #
     def init
+      adapter.setup_connection_specification_name
       adapter.process_excluded_models
     end
 
diff --git a/test/apartment_test.rb b/test/apartment_test.rb
index d19a8ecd..53a31512 100644
--- a/test/apartment_test.rb
+++ b/test/apartment_test.rb
@@ -5,6 +5,11 @@ class Test < Minitest::Test
     def setup_connection(db)
       @config = Apartment::TestHelper.config['connections'][db].symbolize_keys
       ActiveRecord::Base.establish_connection(@config)
+      # `establish_connection` sets @connection_specification_name on
+      # ActiveRecord::Base, this causes it to override our Thread local.
+      # `establish_connection` should never be used in a productiion app
+      # for this reason.
+      Apartment.connection_class.connection_specification_name = nil
       Apartment.reset
     end
 
@@ -33,6 +38,15 @@ def teardown
       end
 
       Apartment.connection_class.clear_all_connections!
+      # unless we remove the connection pools, the connection pools from
+      # previous tests containing configs with deleted databases,
+      # persist and cause bugs for future tests using the same
+      # host/adapter (so the spec name is the same)
+      Apartment.connection_class.connection_handler.tap do |ch|
+        ch.send(:owner_to_pool).each_key do |k|
+          ch.remove_connection(k) if k =~ /^_apartment/
+        end
+      end
       Apartment.reset
       Apartment::Tenant.reload!
     end
@@ -45,8 +59,8 @@ def drop(tenants, type = nil)
     end
 
     def self.next_db
-      @x ||= 0
-      "db%d" % @x += 1
+      @@x ||= 0
+      "db%d" % @@x += 1
     end
 
     def tenant_is(tenant, for_model: Apartment.connection_class)
@@ -57,10 +71,20 @@ def tenant_is(tenant, for_model: Apartment.connection_class)
       end
 
       config[:database] == for_model.connection.current_database &&
-        (!current_search_path || (current_search_path == config[:schema_search_path])) &&
+        (!current_search_path || (current_search_path == config[:schema_search_path]) || current_search_path == "\"$user\", public") &&
         (for_model != Apartment.connection_class || Apartment::Tenant.current == tenant)
     end
 
+    def assert_tenant_is(tenant, for_model: Apartment.connection_class)
+      res = tenant_is(tenant, for_model: for_model)
+
+      if !res && @adapter.class.name == "Apartment::Adapters::PostgresqlAdapter"
+        schema = for_model.connection.schema_search_path
+      end
+
+      assert res, "Expected: #{tenant}\nActual: #{{ db: for_model.connection.current_database, schema: schema }}"
+    end
+
     def assert_received(klass, meth, count = 1)
       migrator_mock = Minitest::Mock.new
       count.times{ migrator_mock.expect meth, true }
diff --git a/test/config_test.rb b/test/config_test.rb
index 1a32269e..b1c4d7a2 100644
--- a/test/config_test.rb
+++ b/test/config_test.rb
@@ -1,6 +1,10 @@
 require_relative 'test_helper'
 
 class ConfigTest < Minitest::Test
+  def teardown
+    Apartment.reset
+  end
+
   def test_configure_yields_apartment
     Apartment.configure{ |config| assert_equal Apartment, config }
   end
diff --git a/test/dummy/config/initializers/apartment.rb b/test/dummy/config/initializers/apartment.rb
index a49dda91..22064e65 100644
--- a/test/dummy/config/initializers/apartment.rb
+++ b/test/dummy/config/initializers/apartment.rb
@@ -1,4 +1,4 @@
 Apartment.configure do |config|
-  config.excluded_models = ["Company"]
-  config.tenant_names = lambda{ Company.pluck(:database) }
+  # config.excluded_models = ["Company"]
+  # config.tenant_names = lambda{ Company.pluck(:database) }
 end
diff --git a/test/excluded_models_test.rb b/test/excluded_models_test.rb
index 1c51da8c..e2fd16fb 100644
--- a/test/excluded_models_test.rb
+++ b/test/excluded_models_test.rb
@@ -19,8 +19,8 @@ def test_model_exclusions
     assert_equal :_apartment_excluded, Company.connection_specification_name
 
     Apartment::Tenant.switch(@tenant1) do
-      assert tenant_is(@tenant1)
-      assert tenant_is(Apartment.default_tenant, for_model: Company)
+      assert_tenant_is(@tenant1)
+      assert_tenant_is(Apartment.default_tenant, for_model: Company)
     end
   end
 
diff --git a/test/multithreading_test.rb b/test/multithreading_test.rb
index da9f855e..73a43d82 100644
--- a/test/multithreading_test.rb
+++ b/test/multithreading_test.rb
@@ -8,25 +8,28 @@ def setup
     Apartment.configure do |config|
       # to test in connection switching mode as if switching between hosts
       config.force_reconnect_on_switch = true
+      config.pool_per_config = true
       config.tenant_resolver = Apartment::Resolvers::Database
     end
 
-    puts "BEFORE"
     super
-    puts "AFTER"
   end
 
   def test_thread_safety_of_switching
-    assert tenant_is(Apartment.default_tenant)
+    assert_tenant_is(Apartment.default_tenant)
 
     thread = Thread.new do
       Apartment::Tenant.switch!(@tenant1)
 
-      assert tenant_is(@tenant1)
+      assert_tenant_is(@tenant1)
+
+      # it's necessary to check connections back in from threads, else
+      # you'll leak connections.
+      Apartment.connection_class.clear_active_connections!
     end
 
     thread.join
 
-    assert tenant_is(Apartment.default_tenant)
+    assert_tenant_is(Apartment.default_tenant)
   end
 end
diff --git a/test/postgresql_adapter_test.rb b/test/postgresql_adapter_test.rb
index 9f9d22e8..4a99269b 100644
--- a/test/postgresql_adapter_test.rb
+++ b/test/postgresql_adapter_test.rb
@@ -22,7 +22,7 @@ def setup
 
   #   @adapter.create("db_tenant")
 
-  #   assert tenant_is(Apartment.default_tenant)
+  #   assert_tenant_is(Apartment.default_tenant)
 
   #   conn_id = Apartment.connection.object_id
 
@@ -31,7 +31,7 @@ def setup
   #     assert_equal "db_tenant", Apartment.connection.current_database
   #   end
 
-  #   assert tenant_is(Apartment.default_tenant)
+  #   assert_tenant_is(Apartment.default_tenant)
   # ensure
   #   @adapter.drop_database("db_tenant")
   #   Apartment.tenant_resolver = Apartment::Resolvers::Schema
diff --git a/test/shared/shared_adapter_tests.rb b/test/shared/shared_adapter_tests.rb
index 74cc29d9..59f22e29 100644
--- a/test/shared/shared_adapter_tests.rb
+++ b/test/shared/shared_adapter_tests.rb
@@ -1,27 +1,27 @@
 module SharedAdapterTests
   def test_switch
-    assert tenant_is(Apartment.default_tenant)
+    assert_tenant_is(Apartment.default_tenant)
 
     Apartment::Tenant.switch(@tenant1){
-      assert tenant_is(@tenant1)
+      assert_tenant_is(@tenant1)
     }
 
-    assert tenant_is(Apartment.default_tenant)
+    assert_tenant_is(Apartment.default_tenant)
   end
 
   def test_local_switch_doesnt_modify_connection
-    assert tenant_is(Apartment.default_tenant)
+    assert_tenant_is(Apartment.default_tenant)
 
     conn_id = Apartment.connection.object_id
 
     Apartment::Tenant.switch!(@tenant1)
 
-    assert tenant_is(@tenant1)
+    assert_tenant_is(@tenant1)
     assert_equal conn_id, Apartment.connection.object_id
   end
 
   def test_remote_switch_modifies_connection
-    assert tenant_is(Apartment.default_tenant)
+    assert_tenant_is(Apartment.default_tenant)
 
     conn_id = Apartment.connection.object_id
 
@@ -34,13 +34,13 @@ def test_remote_switch_modifies_connection
   def test_force_reconnect
     Apartment.configure{ |config| config.force_reconnect_on_switch = true }
 
-    assert tenant_is(Apartment.default_tenant)
+    assert_tenant_is(Apartment.default_tenant)
 
     conn_id = Apartment.connection.object_id
 
     Apartment::Tenant.switch!(@tenant1)
 
-    assert tenant_is(@tenant1)
+    assert_tenant_is(@tenant1)
     refute_equal conn_id, Apartment.connection.object_id
   end
 
@@ -71,7 +71,7 @@ def test_default_tenant_configuration_is_used
 
     @adapter.reset
 
-    assert tenant_is(@tenant1)
+    assert_tenant_is(@tenant1)
   ensure
     Apartment.default_tenant = prev_default
   end

From d2427730c5856dbe2b604dcff22819732f076f32 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@meritec.co.uk>
Date: Wed, 4 Apr 2018 12:01:31 +0100
Subject: [PATCH 11/26] Make threads test more stressful

---
 test/multithreading_test.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/multithreading_test.rb b/test/multithreading_test.rb
index 73a43d82..d36e0f22 100644
--- a/test/multithreading_test.rb
+++ b/test/multithreading_test.rb
@@ -18,17 +18,19 @@ def setup
   def test_thread_safety_of_switching
     assert_tenant_is(Apartment.default_tenant)
 
-    thread = Thread.new do
-      Apartment::Tenant.switch!(@tenant1)
+    threads = []
+    100.times do
+      threads << Thread.new do
+        db = [@tenant1, @tenant2].sample
+        Apartment::Tenant.switch!(db)
 
-      assert_tenant_is(@tenant1)
+        assert_tenant_is(db)
 
-      # it's necessary to check connections back in from threads, else
-      # you'll leak connections.
-      Apartment.connection_class.clear_active_connections!
+        Apartment.connection_class.clear_active_connections!
+      end
     end
 
-    thread.join
+    threads.each(&:join)
 
     assert_tenant_is(Apartment.default_tenant)
   end

From b742ad0a70787680071f27b12fb4fc1ec0a07879 Mon Sep 17 00:00:00 2001
From: Ryan Brunner <ryan@influitive.com>
Date: Thu, 29 Aug 2013 16:41:14 -0400
Subject: [PATCH 12/26] Run migrations in parallel

---
 README.md                | 14 ++++++++++----
 apartment.gemspec        |  1 +
 lib/apartment.rb         |  6 +++++-
 lib/tasks/apartment.rake | 17 ++++++++++++-----
 test/rake_task_test.rb   |  2 +-
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 5f6bd3c1..c99df6bd 100644
--- a/README.md
+++ b/README.md
@@ -432,10 +432,16 @@ rake db:migrate
 This just invokes `Apartment::Tenant.migrate(#{tenant_name})` for each tenant
 name supplied from `Apartment.tenant_names`.
 
-Note that you can disable the default migrating of all tenants with `db:migrate`
-by setting `Apartment.db_migrate_tenants = false` in your `Rakefile`. Note this
-must be done *before* the rake tasks are loaded. ie. before
-`YourApp::Application.load_tasks` is called.
+#### Parallel Migrations
+
+Apartment supports parallelizing migrations into multiple threads when
+you have a large number of tenants. By default, parallel migrations is
+turned off. You can enable this by setting `parallel_migration_threads` to 
+the number of threads you want to use in your initializer.
+
+Keep in mind that because migrations are going to access the database,
+the number of threads indicated here should be less than the pool size
+that Rails will use to connect to your database.
 
 ## Tenants on different servers
 
diff --git a/apartment.gemspec b/apartment.gemspec
index ed8d1ed6..31258534 100644
--- a/apartment.gemspec
+++ b/apartment.gemspec
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord',    '>= 5.1.0'
   s.add_dependency 'rack',            '>= 1.3.6'
   s.add_dependency 'public_suffix',   '~> 2.0.5'
+  s.add_dependency 'parallel',        '>= 0.7.1'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rake',         '~> 0.9'
diff --git a/lib/apartment.rb b/lib/apartment.rb
index a227fb7f..5bce454a 100644
--- a/lib/apartment.rb
+++ b/lib/apartment.rb
@@ -15,7 +15,7 @@ class << self
     WRITER_METHODS   = [
       :tenant_names, :database_schema_file, :excluded_models,
       :persistent_schemas, :connection_class, :tld_length, :db_migrate_tenants,
-      :seed_data_file, :default_tenant
+      :seed_data_file, :default_tenant, :parallel_migration_threads
     ]
     OTHER_METHODS    = [:tenant_resolver, :resolver_class]
 
@@ -63,6 +63,10 @@ def default_tenant
       @default_tenant || tenant_resolver.init_config
     end
 
+    def parallel_migration_threads
+      @parallel_migration_threads || 0
+    end
+
     def persistent_schemas
       @persistent_schemas || []
     end
diff --git a/lib/tasks/apartment.rake b/lib/tasks/apartment.rake
index a4187594..0485af36 100644
--- a/lib/tasks/apartment.rake
+++ b/lib/tasks/apartment.rake
@@ -1,4 +1,5 @@
 require 'apartment/migrator'
+require 'parallel'
 
 apartment_namespace = namespace :apartment do
 
@@ -17,7 +18,7 @@ apartment_namespace = namespace :apartment do
   task :migrate do
     warn_if_tenants_empty
 
-    tenants.each do |tenant|
+    each_tenant do |tenant|
       begin
         Apartment::Migrator.migrate tenant
       rescue Apartment::TenantNotFound => e
@@ -30,7 +31,7 @@ apartment_namespace = namespace :apartment do
   task :seed do
     warn_if_tenants_empty
 
-    tenants.each do |tenant|
+    each_tenant do |tenant|
       begin
         Apartment::Tenant.switch(tenant) do
           Apartment::Tenant.seed
@@ -47,7 +48,7 @@ apartment_namespace = namespace :apartment do
 
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
 
-    tenants.each do |tenant|
+    each_tenant do |tenant|
       begin
         Apartment::Migrator.rollback tenant, step
       rescue Apartment::TenantNotFound => e
@@ -64,7 +65,7 @@ apartment_namespace = namespace :apartment do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
 
-      tenants.each do |tenant|
+      each_tenant do |tenant|
         begin
           Apartment::Migrator.run :up, tenant, version
         rescue Apartment::TenantNotFound => e
@@ -80,7 +81,7 @@ apartment_namespace = namespace :apartment do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
 
-      tenants.each do |tenant|
+      each_tenant do |tenant|
         begin
           Apartment::Migrator.run :down, tenant, version
         rescue Apartment::TenantNotFound => e
@@ -101,6 +102,12 @@ apartment_namespace = namespace :apartment do
     end
   end
 
+  def each_tenant(&block)
+    Parallel.each(tenants, in_threads: Apartment.parallel_migration_threads) do |tenant|
+      block.call(tenant)
+    end
+  end
+
   def tenants
     ENV['DB'] ? ENV['DB'].split(',').map { |s| s.strip } : Apartment.tenant_names || []
   end
diff --git a/test/rake_task_test.rb b/test/rake_task_test.rb
index f5957ffc..0d9d2f36 100644
--- a/test/rake_task_test.rb
+++ b/test/rake_task_test.rb
@@ -30,7 +30,7 @@ def setup
     @tenants.each{ |t| Company.create(database: t) }
   end
 
-  def teardown 
+  def teardown
     Rake.application = nil
     Company.delete_all
 

From 2d9e7e129aa0fed87cbec836c73153e36c9812b3 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Mon, 9 Sep 2019 17:49:41 +0100
Subject: [PATCH 13/26] Don't fail when default tenant doesn't exist

---
 lib/apartment/adapters/abstract_adapter.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 29e4988c..4be84b77 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -8,6 +8,8 @@ class AbstractAdapter
 
       def initialize
         reset
+      rescue Apartment::TenantNotFound
+        puts "WARN: Unable to connect to default tenant"
       end
 
       def reset

From 57e65ef4e21e1302885e13b9a147a2d9075c0a91 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Fri, 20 Sep 2019 09:08:20 +0100
Subject: [PATCH 14/26] Fix method missing in abstract adapter

---
 lib/apartment.rb                           | 2 +-
 lib/apartment/adapters/abstract_adapter.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/apartment.rb b/lib/apartment.rb
index 5bce454a..ecf7d906 100644
--- a/lib/apartment.rb
+++ b/lib/apartment.rb
@@ -84,7 +84,7 @@ def database_schema_file
     def seed_data_file
       return @seed_data_file if defined?(@seed_data_file)
 
-      @seed_data_file = "#{Rails.root}/db/seeds.rb"
+      @seed_data_file = Rails.root.join('db', 'seeds.rb')
     end
 
     def reset
diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 4be84b77..4cfd7549 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -33,7 +33,7 @@ def create(tenant)
             difference = current_difference_from(config)
 
             if difference[:host]
-              connection_switch(config, without_keys: [:database, :schema_search_path])
+              connection_switch!(config, without_keys: [:database, :schema_search_path])
             end
 
             create_tenant!(config)
@@ -57,7 +57,7 @@ def drop(tenant)
         difference = current_difference_from(config)
 
         if difference[:host]
-          connection_switch(config, without_keys: [:database])
+          connection_switch!(config, without_keys: [:database])
         end
 
         unless database_exists?(config[:database])

From 75a68f6b7c1e9614d40c52c236206ebf7a91f1e3 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Mon, 23 Sep 2019 10:31:16 +0100
Subject: [PATCH 15/26] Fix creating tenants on other hosts

---
 lib/apartment/adapters/abstract_adapter.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 4cfd7549..12d14708 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -134,9 +134,7 @@ def current_difference_from(config)
       end
 
       def connection_switch!(config, without_keys: [])
-        config = config.dup.tap do |c|
-          c.reject{ |k, _| without_keys.include?(k) }
-        end
+        config = config.reject{ |k, _| without_keys.include?(k) }
 
         config.merge!(name: connection_specification_name(config))
 
@@ -145,7 +143,7 @@ def connection_switch!(config, without_keys: [])
         end
 
         Thread.current[:_apartment_connection_specification_name] = config[:name]
-        simple_switch(config)
+        simple_switch(config) if config[:database] || config[:schema_search_path]
       end
 
       def import_database_schema

From 184cbce42e32b4bda3a459614ad98011603e6771 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Thu, 24 Oct 2019 13:49:57 +0100
Subject: [PATCH 16/26] Use AR 5.2 migration_context

---
 apartment.gemspec         | 2 +-
 lib/apartment/migrator.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apartment.gemspec b/apartment.gemspec
index 31258534..79e7f14c 100644
--- a/apartment.gemspec
+++ b/apartment.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/influitive/apartment}
   s.licenses = ["MIT"]
 
-  s.add_dependency 'activerecord',    '>= 5.1.0'
+  s.add_dependency 'activerecord',    '>= 5.2.0'
   s.add_dependency 'rack',            '>= 1.3.6'
   s.add_dependency 'public_suffix',   '~> 2.0.5'
   s.add_dependency 'parallel',        '>= 0.7.1'
diff --git a/lib/apartment/migrator.rb b/lib/apartment/migrator.rb
index 3d14f342..5af2cda2 100644
--- a/lib/apartment/migrator.rb
+++ b/lib/apartment/migrator.rb
@@ -10,7 +10,7 @@ def migrate(database)
       Tenant.switch(database) do
         version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
 
-        ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, version) do |migration|
+        ActiveRecord::Base.connection.migration_context.migrate(version) do |migration|
           ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
         end
       end
@@ -19,14 +19,14 @@ def migrate(database)
     # Migrate up/down to a specific version
     def run(direction, database, version)
       Tenant.switch(database) do
-        ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_paths, version)
+        ActiveRecord::Base.connection.migration_context.run(direction, version)
       end
     end
 
     # rollback latest migration `step` number of times
     def rollback(database, step = 1)
       Tenant.switch(database) do
-        ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
+        ActiveRecord::Base.connection.migration_context.rollback(step)
       end
     end
   end

From 89db3a088a773a4f3326b417e4348120241ab931 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Tue, 18 Aug 2020 11:56:52 +0100
Subject: [PATCH 17/26] Fix unrecoverable invalid tenant loop

When the initial connection is to an invalid tenant (non-existant db,
for example), the app process can never successfully reconnect to a
valid tenant.
---
 lib/apartment/adapters/abstract_adapter.rb | 4 ++--
 lib/apartment/adapters/mysql2_adapter.rb   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 12d14708..91fe6a08 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -133,12 +133,12 @@ def current_difference_from(config)
         config.select{ |k, v| current_config[k] != v }
       end
 
-      def connection_switch!(config, without_keys: [])
+      def connection_switch!(config, without_keys: [], ignore_existing_pool: false)
         config = config.reject{ |k, _| without_keys.include?(k) }
 
         config.merge!(name: connection_specification_name(config))
 
-        unless Apartment.connection_handler.retrieve_connection_pool(config[:name])
+        if ignore_existing_pool || !Apartment.connection_handler.retrieve_connection_pool(config[:name])
           Apartment.connection_handler.establish_connection(config)
         end
 
diff --git a/lib/apartment/adapters/mysql2_adapter.rb b/lib/apartment/adapters/mysql2_adapter.rb
index a38f427e..e1ef1ee2 100644
--- a/lib/apartment/adapters/mysql2_adapter.rb
+++ b/lib/apartment/adapters/mysql2_adapter.rb
@@ -9,8 +9,12 @@ def switch_tenant(config)
 
         if difference[:host]
           connection_switch!(config)
-        else
-          simple_switch(config) if difference[:database]
+        elsif difference[:database]
+          begin
+            simple_switch(config)
+          rescue TenantNotFound
+            connection_switch!(config, ignore_existing_pool: true)
+          end
         end
       end
 

From 84fa47747b32d586b6a2bb39ca42a89429edb337 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Tue, 18 Aug 2020 13:24:07 +0100
Subject: [PATCH 18/26] Ensure even resetting doesn't fail

Ludicrous amount of rescues.
---
 lib/apartment/adapters/abstract_adapter.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 91fe6a08..99899668 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -22,7 +22,15 @@ def switch(tenant = nil)
 
         yield
       ensure
-        switch!(previous_tenant) rescue reset
+        begin
+          switch!(previous_tenant)
+        rescue
+          begin
+            reset
+          rescue => e
+            puts "WARN: Unable to switch back to previous tenant, or reset"
+          end
+        end
       end
 
       def create(tenant)

From eaa572e166a0609e6a3c8947ad81e9f2abb1c144 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Tue, 18 Aug 2020 17:32:20 +0100
Subject: [PATCH 19/26] Try to only reconnect if broken connection

---
 lib/apartment/adapters/abstract_adapter.rb | 9 +++++----
 lib/apartment/adapters/mysql2_adapter.rb   | 9 +++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 99899668..57d8efe9 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -24,7 +24,7 @@ def switch(tenant = nil)
       ensure
         begin
           switch!(previous_tenant)
-        rescue
+        rescue => e
           begin
             reset
           rescue => e
@@ -141,12 +141,13 @@ def current_difference_from(config)
         config.select{ |k, v| current_config[k] != v }
       end
 
-      def connection_switch!(config, without_keys: [], ignore_existing_pool: false)
+      def connection_switch!(config, without_keys: [], reconnect: false)
         config = config.reject{ |k, _| without_keys.include?(k) }
-
         config.merge!(name: connection_specification_name(config))
 
-        if ignore_existing_pool || !Apartment.connection_handler.retrieve_connection_pool(config[:name])
+        Apartment.connection_handler.remove_connection(config[:name]) if reconnect
+
+        unless Apartment.connection_handler.retrieve_connection_pool(config[:name])
           Apartment.connection_handler.establish_connection(config)
         end
 
diff --git a/lib/apartment/adapters/mysql2_adapter.rb b/lib/apartment/adapters/mysql2_adapter.rb
index e1ef1ee2..7918c976 100644
--- a/lib/apartment/adapters/mysql2_adapter.rb
+++ b/lib/apartment/adapters/mysql2_adapter.rb
@@ -12,8 +12,13 @@ def switch_tenant(config)
         elsif difference[:database]
           begin
             simple_switch(config)
-          rescue TenantNotFound
-            connection_switch!(config, ignore_existing_pool: true)
+          rescue TenantNotFound => e
+            if !e.message.match?("Unknown database '#{config[:database]}'")
+              # borked connection, remove it and reconnect the connection
+              connection_switch!(config, reconnect: true)
+            else
+              raise e
+            end
           end
         end
       end

From 1ff7849f7e74c62dbd367c37f1864e8060b07903 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Tue, 18 Aug 2020 18:01:32 +0100
Subject: [PATCH 20/26] Tidy up logic ...

---
 lib/apartment/adapters/abstract_adapter.rb |  5 ++++-
 lib/apartment/adapters/mysql2_adapter.rb   | 20 ++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 57d8efe9..9e98c76f 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -152,7 +152,10 @@ def connection_switch!(config, without_keys: [], reconnect: false)
         end
 
         Thread.current[:_apartment_connection_specification_name] = config[:name]
-        simple_switch(config) if config[:database] || config[:schema_search_path]
+
+        if (config[:database] || config[:schema_search_path]) && !reconnect
+          simple_switch(config)
+        end
       end
 
       def import_database_schema
diff --git a/lib/apartment/adapters/mysql2_adapter.rb b/lib/apartment/adapters/mysql2_adapter.rb
index 7918c976..6e8eef30 100644
--- a/lib/apartment/adapters/mysql2_adapter.rb
+++ b/lib/apartment/adapters/mysql2_adapter.rb
@@ -10,16 +10,7 @@ def switch_tenant(config)
         if difference[:host]
           connection_switch!(config)
         elsif difference[:database]
-          begin
-            simple_switch(config)
-          rescue TenantNotFound => e
-            if !e.message.match?("Unknown database '#{config[:database]}'")
-              # borked connection, remove it and reconnect the connection
-              connection_switch!(config, reconnect: true)
-            else
-              raise e
-            end
-          end
+          simple_switch(config)
         end
       end
 
@@ -29,8 +20,13 @@ def create_tenant!(config)
 
       def simple_switch(config)
         Apartment.connection.execute("use `#{config[:database]}`")
-      rescue ActiveRecord::StatementInvalid => exception
-        raise_connect_error!(config[:database], exception)
+      rescue ActiveRecord::StatementInvalid => e
+        if !e.message.match?("Unknown database '#{config[:database]}'")
+          # borked connection, remove it and reconnect the connection
+          connection_switch!(config, reconnect: true)
+        else
+          raise_connect_error!(config[:database], e)
+        end
       end
 
       def connection_specification_name(config)

From da67f09a0b249913fc9b4fab5db3d2220027c207 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Mon, 31 Aug 2020 16:03:07 +0100
Subject: [PATCH 21/26] A switch should never totally fail

If it does, we lose the consistency of @current, which seems to be
what's happening.
---
 lib/apartment/adapters/abstract_adapter.rb | 12 +++++-------
 lib/apartment/adapters/mysql2_adapter.rb   |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 9e98c76f..4d65248e 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -9,7 +9,7 @@ class AbstractAdapter
       def initialize
         reset
       rescue Apartment::TenantNotFound
-        puts "WARN: Unable to connect to default tenant"
+        Rails.logger.warn "Unable to connect to default tenant"
       end
 
       def reset
@@ -24,11 +24,11 @@ def switch(tenant = nil)
       ensure
         begin
           switch!(previous_tenant)
-        rescue => e
+        rescue
           begin
             reset
-          rescue => e
-            puts "WARN: Unable to switch back to previous tenant, or reset"
+          rescue
+            Rails.logger.error "Unable to switch back to previous tenant, or reset"
           end
         end
       end
@@ -91,11 +91,9 @@ def switch!(tenant)
             switch_tenant(config)
           end
 
-          @current = tenant
-
           Apartment.connection.clear_query_cache
 
-          tenant
+          @current = tenant
         end
       end
 
diff --git a/lib/apartment/adapters/mysql2_adapter.rb b/lib/apartment/adapters/mysql2_adapter.rb
index 6e8eef30..4dcfdffa 100644
--- a/lib/apartment/adapters/mysql2_adapter.rb
+++ b/lib/apartment/adapters/mysql2_adapter.rb
@@ -9,7 +9,7 @@ def switch_tenant(config)
 
         if difference[:host]
           connection_switch!(config)
-        elsif difference[:database]
+        else
           simple_switch(config)
         end
       end

From ebeb824f541609d0f3cf31c886592420cfc18c6d Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Mon, 31 Aug 2020 18:20:03 +0100
Subject: [PATCH 22/26] Turn logging up to 10...

---
 lib/apartment/adapters/abstract_adapter.rb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 4d65248e..0e948416 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -24,11 +24,20 @@ def switch(tenant = nil)
       ensure
         begin
           switch!(previous_tenant)
-        rescue
+        rescue => e
+          Rails.logger.error "Failed to switch back to previous tenant: #{previous_tenant}"
+          Rails.logger.error e.message
+          e.backtrace.each do |bt|
+            Rails.logger.error bt
+          end
           begin
             reset
-          rescue
-            Rails.logger.error "Unable to switch back to previous tenant, or reset"
+          rescue => e
+            Rails.logger.error "Unable to switch back to previous tenant, or reset to default tenant: #{Apartment.default_tenant}"
+            Rails.logger.error e.message
+            e.backtrace.each do |bt|
+              Rails.logger.error bt
+            end
           end
         end
       end

From 7b00853edb25079a21c03761e767e29deb08b21a Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Mon, 31 Aug 2020 20:04:38 +0100
Subject: [PATCH 23/26] Make connection switching resilient

---
 lib/apartment/adapters/abstract_adapter.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 0e948416..f9ca7938 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -158,10 +158,17 @@ def connection_switch!(config, without_keys: [], reconnect: false)
           Apartment.connection_handler.establish_connection(config)
         end
 
-        Thread.current[:_apartment_connection_specification_name] = config[:name]
+        begin
+          previous = Thread.current[:_apartment_connection_specification_name]
+          Thread.current[:_apartment_connection_specification_name] = config[:name]
+
+          if (config[:database] || config[:schema_search_path]) && !reconnect
+            simple_switch(config)
+          end
+        rescue
+          Thread.current[:_apartment_connection_specification_name] = previous
 
-        if (config[:database] || config[:schema_search_path]) && !reconnect
-          simple_switch(config)
+          raise
         end
       end
 

From 4730352c5d3c1ef8d1d1b1f6b3721f713088ce3d Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Wed, 2 Sep 2020 09:55:55 +0100
Subject: [PATCH 24/26] Prevent invalid tenant names from getting through

---
 lib/apartment/adapters/abstract_adapter.rb | 4 +++-
 lib/apartment/adapters/mysql2_adapter.rb   | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index f9ca7938..a4ff55ba 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -90,7 +90,9 @@ def drop(tenant)
 
       def switch!(tenant)
         run_callbacks :switch do
-          return reset if tenant.nil?
+          unless valid_tenant?(tenant)
+            raise_connect_error!(tenant, ApartmentError.new("Invalid tenant!"))
+          end
 
           config = config_for(tenant)
 
diff --git a/lib/apartment/adapters/mysql2_adapter.rb b/lib/apartment/adapters/mysql2_adapter.rb
index 4dcfdffa..869eae6d 100644
--- a/lib/apartment/adapters/mysql2_adapter.rb
+++ b/lib/apartment/adapters/mysql2_adapter.rb
@@ -47,6 +47,12 @@ def database_exists?(database)
           SQL
           result.present? && result['exists'] == 1
         end
+
+        def valid_tenant?(tenant)
+          db = tenant.is_a?(Hash) ? tenant[:database] : tenant
+
+          db && db.bytes.size <= 64 && db.match?(/[^\.\\\/]+/)
+        end
     end
   end
 end

From c79c8a4c5e6fc6a294fdc6aa308fe81cd92ab6a1 Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Wed, 2 Sep 2020 13:28:32 +0100
Subject: [PATCH 25/26] Access config with_indifferent_access

---
 lib/apartment/adapters/mysql2_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/apartment/adapters/mysql2_adapter.rb b/lib/apartment/adapters/mysql2_adapter.rb
index 869eae6d..4f24a76c 100644
--- a/lib/apartment/adapters/mysql2_adapter.rb
+++ b/lib/apartment/adapters/mysql2_adapter.rb
@@ -49,7 +49,7 @@ def database_exists?(database)
         end
 
         def valid_tenant?(tenant)
-          db = tenant.is_a?(Hash) ? tenant[:database] : tenant
+          db = tenant.is_a?(Hash) ? tenant.with_indifferent_access[:database] : tenant
 
           db && db.bytes.size <= 64 && db.match?(/[^\.\\\/]+/)
         end

From 8405fa7b2d94eae1fb6579005a4add52bdf1496f Mon Sep 17 00:00:00 2001
From: Mike Campbell <mike.campbell@cpoms.co.uk>
Date: Wed, 23 Sep 2020 14:29:13 +0100
Subject: [PATCH 26/26] Re-establish the Apartment base state on fork

When the process is forked or a new thread is started, set-up our
ActiveRecord connection_specification_name overrides again because
programs like Passenger will now call
`ActiveRecord::Base.establish_connection` when they spawn new app
processes, which in turn cause
`ActiveRecord::Base.connection_specification_name` to be reset to
whatever is specified in database.yml (or :primary as default).

I can't see that this could have any adverse affects. If the app sets
`connection_specification_name` on anything other than
`Apartment.connection_class` (`ActiveRecord::Base` by default) that
should be unaffected and preserved.

This is a more generic solution that hooking into some
Passenger-specific after-spawn hook.
---
 lib/apartment/tenant.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/apartment/tenant.rb b/lib/apartment/tenant.rb
index d6ed3350..7a971505 100644
--- a/lib/apartment/tenant.rb
+++ b/lib/apartment/tenant.rb
@@ -36,7 +36,10 @@ def adapter
           raise AdapterNotFound, "The adapter `#{adapter_name}` is not yet supported"
         end
 
-        adapter_class.new
+        adapter_class.new.tap do |adapter|
+          adapter.setup_connection_specification_name
+          adapter.process_excluded_models
+        end
       end
     end