ros-apartment 2.11.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6182f5dcd4e369e6f497295705079b3d0b20d644d8006c5a256d8618eff1a2c3
-  data.tar.gz: 351be335f73230dd83df3020ba77b33f8e33e297f67c5256210f3e0c0c12e749
+  metadata.gz: 0f06dfaa8f3dfb2df11cb16ee69a9d93a6d2d29ea212f8c836aa3df90065beb3
+  data.tar.gz: 3c6c900bfc6227c6725c6b92366460a1949c6f9e3a166971adf4b98a3b5de37f
 SHA512:
-  metadata.gz: 7714a5182a47cefc6a95d85118278263bf4d326c5441184005a3ef48cf10368cd123602a0e5635547233c12ecb587e107dc72c0a117423dd774054f19767e3ce
-  data.tar.gz: 6b4247215b4754d031ce248f6e457d1c509157d310964e74cc72f05e8f896215b29341cd892515c9e9803a2f0db6528f180474b0c14cf03384ee1ac4f9693164
+  metadata.gz: 26b9175fc8f056ad74ef2a29d163793b1de9da857d77fe7236458688aec5313501aace5eb78a8ab3583483624c873b9684d083102f3e1defbe54a8385f728fa4
+  data.tar.gz: 6984614b40488003a64d0ffc45bf16ae68d8f348d1771797cb45085c0fcf57a41d05f62661070bcb1ecf3259db2d2fbc8edf998bdc96f23758704efaebb36e25

data/.rubocop.yml

@@ -7,6 +7,7 @@ require:
 
 AllCops:
   Exclude:
+    - vendor/bundle/**/*
     - gemfiles/**/*.gemfile
     - gemfiles/vendor/**/*
     - spec/dummy_engine/dummy_engine.gemspec
@@ -30,3 +31,6 @@ Rails/ApplicationRecord:
 
 Rails/Output:
   Enabled: false
+
+Style/Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,24 +1,92 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-06-26 03:25:28 UTC using RuboCop version 0.93.1.
+# on 2024-05-07 18:57:21 UTC using RuboCop version 1.63.4.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/DeprecatedAttributeAssignment:
+  Exclude:
+    - 'ros-apartment.gemspec'
+
+# Offense count: 20
+# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# SupportedStyles: Gemfile, gems.rb, gemspec
+# Include: **/*.gemspec, **/Gemfile, **/gems.rb
+Gemspec/DevelopmentDependencies:
+  Exclude:
+    - 'ros-apartment.gemspec'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequireMFA:
+  Exclude:
+    - 'ros-apartment.gemspec'
+
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'spec/dummy/config/initializers/backtrace_silencers.rb'
+    - 'spec/dummy/config/initializers/inflections.rb'
+    - 'spec/dummy/config/initializers/mime_types.rb'
+    - 'spec/dummy_engine/test/dummy/config/initializers/backtrace_silencers.rb'
+    - 'spec/dummy_engine/test/dummy/config/initializers/inflections.rb'
+    - 'spec/dummy_engine/test/dummy/config/initializers/mime_types.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
+Layout/LeadingCommentSpace:
+  Exclude:
+    - 'ros-apartment.gemspec'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/LineEndStringConcatenationIndentation:
+  Exclude:
+    - 'lib/apartment/custom_console.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Layout/SpaceBeforeComment:
+  Exclude:
+    - 'ros-apartment.gemspec'
+
 # Offense count: 1
 Lint/MixedRegexpCaptureTypes:
   Exclude:
     - 'lib/apartment/elevators/domain.rb'
 
-# Offense count: 3
-# Configuration parameters: IgnoredMethods.
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'spec/support/config.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Lint/RedundantDirGlobSort:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 28
 
-# Offense count: 5
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
-# ExcludedMethods: refine
+# Offense count: 4
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
+# AllowedMethods: refine
 Metrics/BlockLength:
   Max: 83
 
@@ -28,26 +96,51 @@ Metrics/ClassLength:
   Max: 151
 
 # Offense count: 6
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 24
+  Max: 23
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, BlockForwardingName.
+# SupportedStyles: anonymous, explicit
+Naming/BlockForwarding:
+  Exclude:
+    - 'lib/apartment/adapters/abstract_adapter.rb'
+    - 'lib/apartment/log_subscriber.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Performance/RedundantBlockCall:
+  Exclude:
+    - 'lib/apartment/tasks/task_helper.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Performance/StringIdentifierArgument:
+  Exclude:
+    - 'lib/apartment/railtie.rb'
 
 # Offense count: 3
 RSpec/AnyInstance:
   Exclude:
     - 'spec/unit/migrator_spec.rb'
 
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/BeEq:
+  Exclude:
+    - 'spec/adapters/sqlite3_adapter_spec.rb'
+    - 'spec/unit/elevators/first_subdomain_spec.rb'
+
 # Offense count: 2
 RSpec/BeforeAfterAll:
   Exclude:
-    - 'spec/spec_helper.rb'
-    - 'spec/rails_helper.rb'
-    - 'spec/support/**/*.rb'
     - 'spec/adapters/sqlite3_adapter_spec.rb'
     - 'spec/tasks/apartment_rake_spec.rb'
 
 # Offense count: 18
-# Configuration parameters: Prefixes.
+# Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
@@ -58,18 +151,19 @@ RSpec/ContextWording:
     - 'spec/tasks/apartment_rake_spec.rb'
     - 'spec/tenant_spec.rb'
 
-# Offense count: 4
+# Offense count: 5
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
   Exclude:
     - 'spec/integration/apartment_rake_integration_spec.rb'
+    - 'spec/integration/connection_handling_spec.rb'
     - 'spec/integration/query_caching_spec.rb'
     - 'spec/integration/use_within_an_engine_spec.rb'
     - 'spec/tasks/apartment_rake_spec.rb'
 
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: SkipBlocks, EnforcedStyle.
+# Offense count: 6
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
   Exclude:
@@ -79,25 +173,21 @@ RSpec/DescribedClass:
     - 'spec/unit/migrator_spec.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 RSpec/EmptyLineAfterFinalLet:
   Exclude:
     - 'spec/adapters/sqlite3_adapter_spec.rb'
     - 'spec/examples/schema_adapter_examples.rb'
 
 # Offense count: 14
-# Configuration parameters: Max.
+# Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Exclude:
-    - 'spec/examples/generic_adapter_custom_configuration_example.rb'
-    - 'spec/examples/generic_adapter_examples.rb'
-    - 'spec/examples/schema_adapter_examples.rb'
-    - 'spec/integration/query_caching_spec.rb'
-    - 'spec/tenant_spec.rb'
+  Max: 12
 
-# Offense count: 60
-# Cop supports --auto-correct.
-# Configuration parameters: CustomTransform, IgnoredWords.
+# Offense count: 58
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: CustomTransform, IgnoredWords, DisallowedExamples.
+# DisallowedExamples: works
 RSpec/ExampleWording:
   Exclude:
     - 'spec/adapters/sqlite3_adapter_spec.rb'
@@ -111,8 +201,9 @@ RSpec/ExampleWording:
     - 'spec/tasks/apartment_rake_spec.rb'
     - 'spec/tenant_spec.rb'
 
-# Offense count: 13
-# Configuration parameters: CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Offense count: 12
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
     - 'spec/adapters/mysql2_adapter_spec.rb'
@@ -129,7 +220,7 @@ RSpec/FilePath:
     - 'spec/unit/migrator_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, each, example
 RSpec/HookArgument:
@@ -137,13 +228,20 @@ RSpec/HookArgument:
     - 'spec/support/setup.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 RSpec/HooksBeforeExamples:
   Exclude:
     - 'spec/adapters/sqlite3_adapter_spec.rb'
     - 'spec/examples/schema_adapter_examples.rb'
 
-# Offense count: 18
+# Offense count: 4
+# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
+RSpec/IndexedLet:
+  Exclude:
+    - 'spec/examples/schema_adapter_examples.rb'
+    - 'spec/support/contexts.rb'
+
+# Offense count: 16
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -153,18 +251,13 @@ RSpec/InstanceVariable:
     - 'spec/integration/use_within_an_engine_spec.rb'
     - 'spec/tasks/apartment_rake_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-RSpec/LeadingSubject:
-  Exclude:
-
 # Offense count: 2
 RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/examples/generic_adapters_callbacks_examples.rb'
     - 'spec/unit/elevators/generic_spec.rb'
 
-# Offense count: 35
+# Offense count: 27
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -180,12 +273,22 @@ RSpec/MessageSpies:
     - 'spec/unit/elevators/subdomain_spec.rb'
     - 'spec/unit/migrator_spec.rb'
 
-# Offense count: 29
+# Offense count: 11
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: hash, symbol
+RSpec/MetadataStyle:
+  Exclude:
+    - 'spec/examples/schema_adapter_examples.rb'
+    - 'spec/support/contexts.rb'
+
+# Offense count: 27
 RSpec/MultipleExpectations:
-  Max: 4
+  Max: 6
 
-# Offense count: 47
-# Configuration parameters: IgnoreSharedExamples.
+# Offense count: 46
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
     - 'spec/adapters/mysql2_adapter_spec.rb'
@@ -194,31 +297,69 @@ RSpec/NamedSubject:
     - 'spec/support/requirements.rb'
     - 'spec/tenant_spec.rb'
 
-# Offense count: 24
+# Offense count: 22
+# Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 5
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: and_return, block
-RSpec/ReturnFromStub:
+# Offense count: 1
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
+RSpec/NoExpectationExample:
   Exclude:
-    - 'spec/integration/apartment_rake_integration_spec.rb'
+    - 'spec/tenant_spec.rb'
+
+# Offense count: 12
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - 'spec/adapters/mysql2_adapter_spec.rb'
+    - 'spec/adapters/postgresql_adapter_spec.rb'
+    - 'spec/adapters/sqlite3_adapter_spec.rb'
+    - 'spec/tenant_spec.rb'
+    - 'spec/unit/config_spec.rb'
+    - 'spec/unit/elevators/domain_spec.rb'
+    - 'spec/unit/elevators/first_subdomain_spec.rb'
+    - 'spec/unit/elevators/generic_spec.rb'
+    - 'spec/unit/elevators/host_hash_spec.rb'
+    - 'spec/unit/elevators/host_spec.rb'
+    - 'spec/unit/elevators/subdomain_spec.rb'
     - 'spec/unit/migrator_spec.rb'
 
-# Offense count: 4
+# Offense count: 2
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/integration/apartment_rake_integration_spec.rb'
     - 'spec/unit/elevators/first_subdomain_spec.rb'
 
-# Offense count: 17
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Rails/IndexWith:
+  Exclude:
+    - 'lib/apartment.rb'
+    - 'spec/unit/config_spec.rb'
+
+# Offense count: 7
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/Pluck:
+  Exclude:
+    - 'spec/adapters/jdbc_mysql_adapter_spec.rb'
+    - 'spec/adapters/jdbc_postgresql_adapter_spec.rb'
+    - 'spec/adapters/mysql2_adapter_spec.rb'
+    - 'spec/adapters/postgresql_adapter_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Security/IoMethods:
+  Exclude:
+    - 'spec/support/config.rb'
+
+# Offense count: 16
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
     - 'lib/apartment/adapters/jdbc_mysql_adapter.rb'
     - 'lib/apartment/adapters/postgis_adapter.rb'
     - 'lib/apartment/adapters/postgresql_adapter.rb'
@@ -231,3 +372,65 @@ Style/Documentation:
     - 'lib/apartment/tasks/enhancements.rb'
     - 'lib/apartment/tasks/task_helper.rb'
     - 'lib/generators/apartment/install/install_generator.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedVars.
+Style/FetchEnvVar:
+  Exclude:
+    - 'lib/apartment/adapters/postgresql_adapter.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+# SupportedShorthandSyntax: always, never, either, consistent
+Style/HashSyntax:
+  Exclude:
+    - 'lib/apartment/active_record/connection_handling.rb'
+    - 'spec/integration/connection_handling_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle, Autocorrect.
+# SupportedStyles: module_function, extend_self, forbidden
+Style/ModuleFunction:
+  Exclude:
+    - 'lib/apartment/migrator.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantConstantBase:
+  Exclude:
+    - 'spec/apartment_spec.rb'
+    - 'spec/dummy/config.ru'
+    - 'spec/dummy_engine/test/dummy/config.ru'
+    - 'spec/dummy_engine/test/dummy/config/environments/production.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantParentheses:
+  Exclude:
+    - 'lib/apartment.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpArgument:
+  Exclude:
+    - 'lib/apartment/tasks/enhancements.rb'
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/apartment/migrator.rb'
+    - 'lib/tasks/apartment.rake'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperWithArgsParentheses:
+  Exclude:
+    - 'lib/apartment/adapters/sqlite3_adapter.rb'
+    - 'lib/apartment/elevators/host_hash.rb'

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.1.4

data/Appraisals

@@ -1,28 +1,19 @@
 # frozen_string_literal: true
 
-appraise 'rails-5-2' do
-  gem 'rails', '~> 5.2.0'
-  platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 52.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 52.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 52.0'
-  end
-end
-
-appraise 'rails-6-0' do
-  gem 'rails', '~> 6.0.0'
+appraise 'rails-6-1' do
+  gem 'rails', '~> 6.1.0'
   platforms :ruby do
     gem 'sqlite3', '~> 1.4'
   end
   platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 60.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 60.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 60.0'
+    gem 'activerecord-jdbc-adapter', '~> 61.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
   end
 end
 
-appraise 'rails-6-1' do
-  gem 'rails', '~> 6.1.0'
+appraise 'rails-7-0' do
+  gem 'rails', '~> 7.0.0'
   platforms :ruby do
     gem 'sqlite3', '~> 1.4'
   end
@@ -33,10 +24,10 @@ appraise 'rails-6-1' do
   end
 end
 
-appraise 'rails-7-0' do
-  gem 'rails', '~> 7.0.0'
+appraise 'rails-7-1' do
+  gem 'rails', '~> 7.1.0'
   platforms :ruby do
-    gem 'sqlite3', '~> 1.4'
+    gem 'sqlite3', '~> 1.6'
   end
   platforms :jruby do
     gem 'activerecord-jdbc-adapter', '~> 61.0'

data/CHANGELOG.md

@@ -1,8 +1,10 @@
-# Changelog
+# Changelog [DEPRECATED]
 
-## [Unreleased](https://github.com/rails-on-services/apartment/tree/HEAD)
+Changes are now being tracked in the [releases](https://github.com/rails-on-services/apartment/releases) section of the repository.
 
-[Full Changelog](https://github.com/rails-on-services/apartment/compare/v2.8.0...HEAD)
+## [v2.8.1](https://github.com/rails-on-services/apartment/tree/v2.8.1) (2020-12-17)
+
+[Full Changelog](https://github.com/rails-on-services/apartment/compare/v2.8.0...v2.8.1)
 
 **Implemented enhancements:**
 

data/README.md

@@ -1,8 +1,7 @@
 # Apartment
 
-[![Gem Version](https://badge.fury.io/rb/ros-apartment.svg)](https://badge.fury.io/rb/apartment)
+[![Gem Version](https://badge.fury.io/rb/ros-apartment.svg)](https://badge.fury.io/rb/ros-apartment)
 [![Code Climate](https://api.codeclimate.com/v1/badges/b0dc327380bb8438f991/maintainability)](https://codeclimate.com/github/rails-on-services/apartment/maintainability)
-[![Build Status](https://travis-ci.org/rails-on-services/apartment.svg?branch=development)](https://travis-ci.org/rails-on-services/apartment)
 
 *Multitenancy for Rails and ActiveRecord*
 
@@ -68,7 +67,7 @@ you need to create a new tenant, you can run the following command:
 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".
+If you're using the [prepend environment](https://github.com/rails-on-services/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.
 
@@ -275,7 +274,7 @@ In the examples above, we show the Apartment middleware being appended to the Ra
 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.
+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/rails-on-services/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.
 
@@ -531,7 +530,7 @@ 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
+This just invokes `Apartment::Migrator.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

data/Rakefile

@@ -132,22 +132,8 @@ def my_config
   config['mysql']
 end
 
-def activerecord_below_5_2?
-  ActiveRecord.version.release < Gem::Version.new('5.2.0')
-end
-
-def activerecord_below_6_0?
-  ActiveRecord.version.release < Gem::Version.new('6.0.0')
-end
-
 def migrate
-  if activerecord_below_5_2?
-    ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
-  elsif activerecord_below_6_0?
-    ActiveRecord::MigrationContext.new('spec/dummy/db/migrate').migrate
-  else
-    # TODO: Figure out if there is any other possibility that can/should be
-    # passed here as the second argument for the migration context
-    ActiveRecord::MigrationContext.new('spec/dummy/db/migrate', ActiveRecord::SchemaMigration).migrate
-  end
+  # TODO: Figure out if there is any other possibility that can/should be
+  # passed here as the second argument for the migration context
+  ActiveRecord::MigrationContext.new('spec/dummy/db/migrate', ActiveRecord::SchemaMigration).migrate
 end

data/lib/apartment/active_record/connection_handling.rb

@@ -1,16 +1,27 @@
 # frozen_string_literal: true
 
-module ActiveRecord
-  # This is monkeypatching activerecord to ensure that whenever a new connection is established it
+module ActiveRecord # :nodoc:
+  # This is monkeypatching Active Record to ensure that whenever a new connection is established it
   # switches to the same tenant as before the connection switching. This problem is more evident when
   # using read replica in Rails 6
   module ConnectionHandling
-    def connected_to_with_tenant(database: nil, role: nil, prevent_writes: false, &blk)
-      current_tenant = Apartment::Tenant.current
+    if ActiveRecord.version.release <= Gem::Version.new('6.2')
+      def connected_to_with_tenant(database: nil, role: nil, prevent_writes: false, &blk)
+        current_tenant = Apartment::Tenant.current
 
-      connected_to_without_tenant(database: database, role: role, prevent_writes: prevent_writes) do
-        Apartment::Tenant.switch!(current_tenant)
-        yield(blk)
+        connected_to_without_tenant(database: database, role: role, prevent_writes: prevent_writes) do
+          Apartment::Tenant.switch!(current_tenant)
+          yield(blk)
+        end
+      end
+    else
+      def connected_to_with_tenant(role: nil, prevent_writes: false, &blk)
+        current_tenant = Apartment::Tenant.current
+
+        connected_to_without_tenant(role: role, prevent_writes: prevent_writes) do
+          Apartment::Tenant.switch!(current_tenant)
+          yield(blk)
+        end
       end
     end
 

data/lib/apartment/active_record/postgresql_adapter.rb

@@ -8,6 +8,10 @@
 module Apartment::PostgreSqlAdapterPatch
   def default_sequence_name(table, _column)
     res = super
+
+    # for JDBC driver, if rescued in super_method, trim leading and trailing quotes
+    res.delete!('"') if defined?(JRUBY_VERSION)
+
     schema_prefix = "#{Apartment::Tenant.current}."
     default_tenant_prefix = "#{Apartment::Tenant.default_tenant}."
 

data/lib/apartment/active_record/schema_migration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveRecord
-  class SchemaMigration < ActiveRecord::Base # :nodoc:
+  class SchemaMigration # :nodoc:
     class << self
       def table_exists?
         connection.table_exists?(table_name)