ros-apartment 2.9.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f31fef7b2332c76bce3bff4823754c145b7a049bbf845ce29bb22b65b29585e4
-  data.tar.gz: 657b9a8bf128f912894e03bd2331b2e2201bf9f43f38515117e434ef65694341
+  metadata.gz: 6182f5dcd4e369e6f497295705079b3d0b20d644d8006c5a256d8618eff1a2c3
+  data.tar.gz: 351be335f73230dd83df3020ba77b33f8e33e297f67c5256210f3e0c0c12e749
 SHA512:
-  metadata.gz: d35580a7ed02ea8423251e0e7ed555d002fe34f4d2705cb16b982e5211a5f79fd8f078b97c7ac633f8b1bb605c9ada8176a6c082c0d1ad00591ba4b079acb7b4
-  data.tar.gz: fa77558d5731e0a99c8ff1f8611c5353e633a5bbcd37fe94c64fe310414f8f724177d6fa7121ca88031315638990087546892a7411fd7477e37362de52682e31
+  metadata.gz: 7714a5182a47cefc6a95d85118278263bf4d326c5441184005a3ef48cf10368cd123602a0e5635547233c12ecb587e107dc72c0a117423dd774054f19767e3ce
+  data.tar.gz: 6b4247215b4754d031ce248f6e457d1c509157d310964e74cc72f05e8f896215b29341cd892515c9e9803a2f0db6528f180474b0c14cf03384ee1ac4f9693164

data/.circleci/config.yml

@@ -1,8 +1,5 @@
 version: 2.1
 
-orbs:
-  rubocop: hanachin/rubocop@0.0.6
-
 jobs:
   build:
     docker:
@@ -61,7 +58,10 @@ jobs:
 
       - run:
           name: Run tests
-          command: bundle exec rspec
+          command: bundle exec rspec --format progress --format RspecJunitFormatter -o ~/test-results/rspec/rspec.xml
+
+      - store_test_results:
+          path: ~/test-results/rspec/
 
 workflows:
   tests:
@@ -69,10 +69,10 @@ workflows:
       - build:
           matrix:
             parameters:
-              ruby_version: ["ruby:2.6-buster", "ruby:2.7-buster"]
-              gemfile: ["gemfiles/rails_5_2.gemfile", "gemfiles/rails_6_0.gemfile", "gemfiles/rails_6_1.gemfile"]
-
-  rubocop:
-    jobs:
-      - rubocop/rubocop:
-          version: 0.88.0
+              ruby_version: ["ruby:2.6-buster", "ruby:2.7-buster", "ruby:3.0-buster"]
+              gemfile: ["gemfiles/rails_5_2.gemfile", "gemfiles/rails_6_0.gemfile", "gemfiles/rails_6_1.gemfile", "gemfiles/rails_7_0.gemfile"]
+            exclude:
+              - ruby_version: "ruby:3.0-buster"
+                gemfile: "gemfiles/rails_5_2.gemfile"
+              - ruby_version: "ruby:2.6-buster"
+                gemfile: "gemfiles/rails_7_0.gemfile"

data/.github/workflows/reviewdog.yml

@@ -0,0 +1,22 @@
+name: reviewdog
+on: [push, pull_request]
+jobs:
+  rubocop:
+    name: runner / rubocop
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Read ruby version
+        run: echo ::set-output name=RUBY_VERSION::$(cat .ruby-version | cut -f 1,2 -d .)
+        id: rv
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "${{ steps.rv.outputs.RUBY_VERSION }}"
+      - uses: reviewdog/action-rubocop@v1
+        with:
+          filter_mode: nofilter
+          reporter: github-check
+          rubocop_version: 0.93.1
+          github_token: ${{ secrets.github_token }}
+          rubocop_extensions: rubocop-performance:1.10.2 rubocop-rails:2.9.1 rubocop-rspec:1.44.1

data/.rubocop.yml

@@ -1,96 +1,32 @@
 inherit_from: .rubocop_todo.yml
 
-AllCops:
-  Exclude:
-    - 'gemfiles/**/*.gemfile'
-    - 'gemfiles/vendor/**/*'
-    - 'spec/dummy_engine/dummy_engine.gemspec'
-
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'ros-apartment.gemspec'
+require:
+  - rubocop-rails
+  - rubocop-performance
+  - rubocop-rspec
 
-Style/WordArray:
+AllCops:
   Exclude:
+    - gemfiles/**/*.gemfile
+    - gemfiles/vendor/**/*
+    - spec/dummy_engine/dummy_engine.gemspec
     - spec/schemas/**/*.rb
 
-Style/NumericLiterals:
-  Exclude:
-    - spec/schemas/**/*.rb
+  NewCops: enable
 
-Layout/EmptyLineAfterMagicComment:
+Gemspec/RequiredRubyVersion:
   Exclude:
-    - spec/schemas/**/*.rb
+    - 'ros-apartment.gemspec'
 
 Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb
 
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-
-Lint/DuplicateElsifCondition:
-  Enabled: true
-
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-
-Lint/RaiseException:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-Style/AccessorGrouping:
-  Enabled: true
-
-Style/ArrayCoercion:
-  Enabled: true
-
-Style/BisectedAttrAccessor:
-  Enabled: true
-
-Style/CaseLikeIf:
-  Enabled: true
-
-Style/ExponentialNotation:
-  Enabled: true
-
-Style/HashAsLastArrayItem:
-  Enabled: true
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashLikeCase:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-Style/RedundantAssignment:
-  Enabled: true
-
-Style/RedundantFetchBlock:
-  Enabled: true
-
-Style/RedundantFileExtensionInRequire:
-  Enabled: true
-
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
+Rails/RakeEnvironment:
+  Enabled: false
 
-Style/RedundantRegexpEscape:
-  Enabled: true
+Rails/ApplicationRecord:
+  Enabled: false
 
-Style/SlicingWithRange:
-  Enabled: true
+Rails/Output:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-07-16 04:15:41 UTC using RuboCop version 0.88.0.
+# on 2021-06-26 03:25:28 UTC using RuboCop version 0.93.1.
 # 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
@@ -11,22 +11,16 @@ Lint/MixedRegexpCaptureTypes:
   Exclude:
     - 'lib/apartment/elevators/domain.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Lint/NonDeterministicRequireOrder:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
-# Offense count: 7
+# Offense count: 3
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 33
+  Max: 28
 
-# Offense count: 3
+# Offense count: 5
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 102
+  Max: 83
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
@@ -38,6 +32,188 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Max: 24
 
+# Offense count: 3
+RSpec/AnyInstance:
+  Exclude:
+    - 'spec/unit/migrator_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.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/adapters/sqlite3_adapter_spec.rb'
+    - 'spec/examples/generic_adapter_custom_configuration_example.rb'
+    - 'spec/examples/schema_adapter_examples.rb'
+    - 'spec/support/contexts.rb'
+    - 'spec/tasks/apartment_rake_spec.rb'
+    - 'spec/tenant_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/integration/apartment_rake_integration_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.
+# SupportedStyles: described_class, explicit
+RSpec/DescribedClass:
+  Exclude:
+    - 'spec/apartment_spec.rb'
+    - 'spec/tenant_spec.rb'
+    - 'spec/unit/elevators/host_hash_spec.rb'
+    - 'spec/unit/migrator_spec.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+RSpec/EmptyLineAfterFinalLet:
+  Exclude:
+    - 'spec/adapters/sqlite3_adapter_spec.rb'
+    - 'spec/examples/schema_adapter_examples.rb'
+
+# Offense count: 14
+# Configuration parameters: Max.
+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'
+
+# Offense count: 60
+# Cop supports --auto-correct.
+# Configuration parameters: CustomTransform, IgnoredWords.
+RSpec/ExampleWording:
+  Exclude:
+    - 'spec/adapters/sqlite3_adapter_spec.rb'
+    - 'spec/apartment_spec.rb'
+    - 'spec/examples/connection_adapter_examples.rb'
+    - 'spec/examples/generic_adapter_custom_configuration_example.rb'
+    - 'spec/examples/generic_adapter_examples.rb'
+    - 'spec/examples/schema_adapter_examples.rb'
+    - 'spec/integration/apartment_rake_integration_spec.rb'
+    - 'spec/integration/use_within_an_engine_spec.rb'
+    - 'spec/tasks/apartment_rake_spec.rb'
+    - 'spec/tenant_spec.rb'
+
+# Offense count: 13
+# Configuration parameters: CustomTransform, IgnoreMethods, SpecSuffixOnly.
+RSpec/FilePath:
+  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: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, each, example
+RSpec/HookArgument:
+  Exclude:
+    - 'spec/support/setup.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+RSpec/HooksBeforeExamples:
+  Exclude:
+    - 'spec/adapters/sqlite3_adapter_spec.rb'
+    - 'spec/examples/schema_adapter_examples.rb'
+
+# Offense count: 18
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'spec/examples/generic_adapter_examples.rb'
+    - 'spec/examples/schema_adapter_examples.rb'
+    - 'spec/integration/apartment_rake_integration_spec.rb'
+    - '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
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  Exclude:
+    - 'spec/examples/generic_adapter_custom_configuration_example.rb'
+    - 'spec/integration/apartment_rake_integration_spec.rb'
+    - 'spec/integration/use_within_an_engine_spec.rb'
+    - 'spec/tasks/apartment_rake_spec.rb'
+    - 'spec/unit/elevators/domain_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: 29
+RSpec/MultipleExpectations:
+  Max: 4
+
+# Offense count: 47
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/adapters/mysql2_adapter_spec.rb'
+    - 'spec/adapters/sqlite3_adapter_spec.rb'
+    - 'spec/support/contexts.rb'
+    - 'spec/support/requirements.rb'
+    - 'spec/tenant_spec.rb'
+
+# Offense count: 24
+RSpec/NestedGroups:
+  Max: 5
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: and_return, block
+RSpec/ReturnFromStub:
+  Exclude:
+    - 'spec/integration/apartment_rake_integration_spec.rb'
+    - 'spec/unit/migrator_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/integration/apartment_rake_integration_spec.rb'
+    - 'spec/unit/elevators/first_subdomain_spec.rb'
+
 # Offense count: 17
 Style/Documentation:
   Exclude:
@@ -52,15 +228,6 @@ Style/Documentation:
     - 'lib/apartment/migrator.rb'
     - 'lib/apartment/model.rb'
     - 'lib/apartment/railtie.rb'
-    - 'lib/apartment/reloader.rb'
     - 'lib/apartment/tasks/enhancements.rb'
     - 'lib/apartment/tasks/task_helper.rb'
     - 'lib/generators/apartment/install/install_generator.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'Rakefile'
-    - 'lib/apartment.rb'
-    - 'lib/apartment/tenant.rb'

data/.ruby-version

@@ -0,0 +1 @@
+2.7.5

data/Appraisals

@@ -1,29 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-5-0' do
-  gem 'rails', '~> 5.0.0'
-  platforms :ruby do
-    gem 'pg', '< 1.0.0'
-  end
-  platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 50.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 50.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 50.0'
-  end
-end
-
-appraise 'rails-5-1' do
-  gem 'rails', '~> 5.1.0'
-  platforms :ruby do
-    gem 'pg', '< 1.0.0'
-  end
-  platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 51.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 51.0'
-  end
-end
-
 appraise 'rails-5-2' do
   gem 'rails', '~> 5.2.0'
   platforms :jruby do
@@ -57,6 +33,18 @@ appraise 'rails-6-1' do
   end
 end
 
+appraise 'rails-7-0' do
+  gem 'rails', '~> 7.0.0'
+  platforms :ruby do
+    gem 'sqlite3', '~> 1.4'
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 61.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
+  end
+end
+
 appraise 'rails-master' do
   gem 'rails', git: 'https://github.com/rails/rails.git'
   platforms :ruby do

data/Gemfile

@@ -3,11 +3,3 @@
 source 'http://rubygems.org'
 
 gemspec
-
-gem 'rails', '>= 3.1.2'
-gem 'rubocop'
-
-group :local do
-  gem 'guard-rspec', '~> 4.2'
-  gem 'pry'
-end

data/README.md

@@ -101,6 +101,16 @@ switched back at the end of the block to what it was before.
 There is also `switch!` which doesn't take a block, but it's recommended to use `switch`.
 To return to the default tenant, you can call `switch` with no arguments.
 
+#### Multiple Tenants
+
+When using schemas, you can also pass in a list of schemas if desired. Any tables defined in a schema earlier in the chain will be referenced first, so this is only useful if you have a schema with only some of the tables defined:
+
+```ruby
+Apartment::Tenant.switch(['tenant_1', 'tenant_2']) do
+  # ...
+end
+```
+
 ### Switching Tenants per request
 
 You can have Apartment route to the appropriate tenant by adding some Rack middleware.
@@ -334,7 +344,7 @@ Setting this configuration value to `false` will disable the schema presence che
 
 ```ruby
 Apartment.configure do |config|
-  tenant_presence_check = false
+  config.tenant_presence_check = false
 end
 ```
 

data/gemfiles/rails_5_2.gemfile

@@ -3,12 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 5.2.0"
-gem "rubocop"
-
-group :local do
-  gem "guard-rspec", "~> 4.2"
-  gem "pry"
-end
 
 platforms :jruby do
   gem "activerecord-jdbc-adapter", "~> 52.0"

data/gemfiles/rails_6_0.gemfile

@@ -3,12 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 6.0.0"
-gem "rubocop"
-
-group :local do
-  gem "guard-rspec", "~> 4.2"
-  gem "pry"
-end
 
 platforms :ruby do
   gem "sqlite3", "~> 1.4"

data/gemfiles/rails_6_1.gemfile

@@ -3,12 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 6.1.0"
-gem "rubocop"
-
-group :local do
-  gem "guard-rspec", "~> 4.2"
-  gem "pry"
-end
 
 platforms :ruby do
   gem "sqlite3", "~> 1.4"

data/gemfiles/rails_7_0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.4"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter", "~> 61.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
+  gem "activerecord-jdbcmysql-adapter", "~> 61.0"
+end
+
+gemspec path: "../"

data/gemfiles/rails_master.gemfile

@@ -3,21 +3,15 @@
 source "http://rubygems.org"
 
 gem "rails", git: "https://github.com/rails/rails.git"
-gem "rubocop"
-
-group :local do
-  gem "guard-rspec", "~> 4.2"
-  gem "pry"
-end
 
 platforms :ruby do
   gem "sqlite3", "~> 1.4"
 end
 
 platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 52.0"
-  gem "activerecord-jdbcpostgresql-adapter", "~> 52.0"
-  gem "activerecord-jdbcmysql-adapter", "~> 52.0"
+  gem "activerecord-jdbc-adapter", "~> 61.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
+  gem "activerecord-jdbcmysql-adapter", "~> 61.0"
 end
 
 gemspec path: "../"

data/lib/apartment/active_record/postgresql_adapter.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+
+# NOTE: This patch is meant to remove any schema_prefix appart from the ones for
+# excluded models. The schema_prefix would be resolved by apartment's setting
+# of search path
+module Apartment::PostgreSqlAdapterPatch
+  def default_sequence_name(table, _column)
+    res = super
+    schema_prefix = "#{Apartment::Tenant.current}."
+    default_tenant_prefix = "#{Apartment::Tenant.default_tenant}."
+
+    # NOTE: Excluded models should always access the sequence from the default
+    # tenant schema
+    if excluded_model?(table)
+      res.sub!(schema_prefix, default_tenant_prefix) if schema_prefix != default_tenant_prefix
+      return res
+    end
+
+    res.delete_prefix!(schema_prefix) if res&.starts_with?(schema_prefix)
+
+    res
+  end
+
+  private
+
+  def excluded_model?(table)
+    Apartment.excluded_models.any? { |m| m.constantize.table_name == table }
+  end
+end
+
+require 'active_record/connection_adapters/postgresql_adapter'
+
+# NOTE: inject this into postgresql adapters
+class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+  include Apartment::PostgreSqlAdapterPatch
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/lib/apartment/adapters/jdbc_postgresql_adapter.rb

@@ -38,11 +38,9 @@ module Apartment
       #
       def connect_to_new(tenant = nil)
         return reset if tenant.nil?
+        raise ActiveRecord::StatementInvalid, "Could not find schema #{tenant}" unless schema_exists?(tenant)
 
-        tenant = tenant.to_s
-        raise ActiveRecord::StatementInvalid, "Could not find schema #{tenant}" unless tenant_exists?(tenant)
-
-        @current = tenant
+        @current = tenant.is_a?(Array) ? tenant.map(&:to_s) : 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}"

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'apartment/adapters/abstract_adapter'
+require 'apartment/active_record/postgresql_adapter'
 
 module Apartment
   module Tenant
@@ -41,7 +42,6 @@ module Apartment
       def reset
         @current = default_tenant
         Apartment.connection.schema_search_path = full_search_path
-        reset_sequence_names
       end
 
       def init
@@ -72,20 +72,17 @@ module Apartment
       #
       def connect_to_new(tenant = nil)
         return reset if tenant.nil?
+        raise ActiveRecord::StatementInvalid, "Could not find schema #{tenant}" unless schema_exists?(tenant)
 
-        tenant = tenant.to_s
-        raise ActiveRecord::StatementInvalid, "Could not find schema #{tenant}" unless tenant_exists?(tenant)
-
-        @current = tenant
+        @current = tenant.is_a?(Array) ? tenant.map(&:to_s) : tenant.to_s
         Apartment.connection.schema_search_path = full_search_path
 
         # When the PostgreSQL version is < 9.3,
         # there is a issue for prepared statement with changing search_path.
         # https://www.postgresql.org/docs/9.3/static/sql-prepare.html
         Apartment.connection.clear_cache! if postgresql_version < 90_300
-        reset_sequence_names
-      rescue *rescuable_exceptions
-        raise TenantNotFound, "One of the following schema(s) is invalid: \"#{tenant}\" #{full_search_path}"
+      rescue *rescuable_exceptions => e
+        raise_schema_connect_to_new(tenant, e)
       end
 
       private
@@ -132,22 +129,17 @@ module Apartment
         Apartment.connection.send(:postgresql_version)
       end
 
-      def reset_sequence_names
-        # sequence_name contains the schema, so it must be reset after switch
-        # There is `reset_sequence_name`, but that method actually goes to the database
-        # to find out the new name. Therefore, we do this hack to only unset the name,
-        # and it will be dynamically found the next time it is needed
-        descendants_to_unset = ActiveRecord::Base.descendants
-                                                 .select { |c| c.instance_variable_defined?(:@sequence_name) }
-                                                 .reject do |c|
-                                                   c.instance_variable_defined?(:@explicit_sequence_name) &&
-                                                     c.instance_variable_get(:@explicit_sequence_name)
-                                                 end
-        descendants_to_unset.each do |c|
-          # NOTE: due to this https://github.com/rails-on-services/apartment/issues/81
-          # unreproduceable error we're checking before trying to remove it
-          c.remove_instance_variable :@sequence_name if c.instance_variable_defined?(:@sequence_name)
-        end
+      def schema_exists?(schemas)
+        return true unless Apartment.tenant_presence_check
+
+        Array(schemas).all? { |schema| Apartment.connection.schema_exists?(schema.to_s) }
+      end
+
+      def raise_schema_connect_to_new(tenant, exception)
+        raise TenantNotFound, <<~EXCEPTION_MESSAGE
+          Could not set search path to schemas, they may be invalid: "#{tenant}" #{full_search_path}.
+          Original error: #{exception.class}: #{exception}
+        EXCEPTION_MESSAGE
       end
     end
 
@@ -158,6 +150,7 @@ module Apartment
         /SET lock_timeout/i,                          # new in postgresql 9.3
         /SET row_security/i,                          # new in postgresql 9.5
         /SET idle_in_transaction_session_timeout/i,   # new in postgresql 9.6
+        /SET default_table_access_method/i,           # new in postgresql 12
         /CREATE SCHEMA public/i,
         /COMMENT ON SCHEMA public/i
 
@@ -224,7 +217,7 @@ module Apartment
 
       # Temporary set Postgresql related environment variables if there are in @config
       #
-      def with_pg_env(&block)
+      def with_pg_env
         pghost = ENV['PGHOST']
         pgport = ENV['PGPORT']
         pguser = ENV['PGUSER']
@@ -235,7 +228,7 @@ module Apartment
         ENV['PGUSER'] = @config[:username].to_s if @config[:username]
         ENV['PGPASSWORD'] = @config[:password].to_s if @config[:password]
 
-        block.call
+        yield
       ensure
         ENV['PGHOST'] = pghost
         ENV['PGPORT'] = pgport

data/lib/apartment/console.rb

@@ -1,21 +1,5 @@
 # frozen_string_literal: true
 
-# A workaround to get `reload!` to also call Apartment::Tenant.init
-# This is unfortunate, but I haven't figured out how to hook into the reload process *after* files are reloaded
-
-# reloads the environment
-# rubocop:disable Style/OptionalBooleanParameter
-def reload!(print = true)
-  puts 'Reloading...' if print
-
-  # This triggers the to_prepare callbacks
-  ActionDispatch::Callbacks.new(proc {}).call({})
-  # Manually init Apartment again once classes are reloaded
-  Apartment::Tenant.init
-  true
-end
-# rubocop:enable Style/OptionalBooleanParameter
-
 def st(schema_name = nil)
   if schema_name.nil?
     tenant_list.each { |t| puts t }

data/lib/apartment/model.rb

@@ -17,7 +17,9 @@ module Apartment
         cache_key = if key.is_a? String
                       "#{Apartment::Tenant.current}_#{key}"
                     else
-                      [Apartment::Tenant.current] + key
+                      # NOTE: In Rails 6.0.4 we start receiving an ActiveRecord::Reflection::BelongsToReflection
+                      # as the key, which wouldn't work well with an array.
+                      [Apartment::Tenant.current] + Array.wrap(key)
                     end
         cache = @find_by_statement_cache[connection.prepared_statements]
         cache.compute_if_absent(cache_key) { ActiveRecord::StatementCache.create(connection, &block) }

data/lib/apartment/railtie.rb

@@ -2,7 +2,6 @@
 
 require 'rails'
 require 'apartment/tenant'
-require 'apartment/reloader'
 
 module Apartment
   class Railtie < Rails::Railtie
@@ -32,7 +31,7 @@ module Apartment
     #
     config.to_prepare do
       next if ARGV.any? { |arg| arg =~ /\Aassets:(?:precompile|clean)\z/ }
-      next if ARGV.any? { |arg| arg == 'webpacker:compile' }
+      next if ARGV.any?('webpacker:compile')
       next if ENV['APARTMENT_DISABLE_INIT']
 
       begin
@@ -60,25 +59,5 @@ module Apartment
       load 'tasks/apartment.rake'
       require 'apartment/tasks/enhancements' if Apartment.db_migrate_tenants
     end
-
-    #
-    #   The following initializers are a workaround to the fact that I can't properly hook into the rails reloader
-    #   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
-      # rubocop:disable Lint/Debugger
-      console do
-        require 'apartment/console'
-      end
-      # rubocop:enable Lint/Debugger
-    end
   end
 end

data/lib/apartment/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apartment
-  VERSION = '2.9.0'
+  VERSION = '2.11.0'
 end

data/lib/apartment.rb

@@ -107,13 +107,13 @@ module Apartment
     def database_schema_file
       return @database_schema_file if defined?(@database_schema_file)
 
-      @database_schema_file = Rails.root.join('db', 'schema.rb')
+      @database_schema_file = Rails.root.join('db/schema.rb')
     end
 
     def seed_data_file
       return @seed_data_file if defined?(@seed_data_file)
 
-      @seed_data_file = Rails.root.join('db', 'seeds.rb')
+      @seed_data_file = Rails.root.join('db/seeds.rb')
     end
 
     def pg_excluded_names

data/lib/tasks/apartment.rake

@@ -17,12 +17,10 @@ apartment_namespace = namespace :apartment do
   desc 'Drop all tenants'
   task :drop do
     Apartment::TaskHelper.tenants.each do |tenant|
-      begin
-        puts("Dropping #{tenant} tenant")
-        Apartment::Tenant.drop(tenant)
-      rescue Apartment::TenantNotFound, ActiveRecord::NoDatabaseError => e
-        puts e.message
-      end
+      puts("Dropping #{tenant} tenant")
+      Apartment::Tenant.drop(tenant)
+    rescue Apartment::TenantNotFound, ActiveRecord::NoDatabaseError => e
+      puts e.message
     end
   end
 
@@ -39,15 +37,13 @@ apartment_namespace = namespace :apartment do
     Apartment::TaskHelper.warn_if_tenants_empty
 
     Apartment::TaskHelper.each_tenant do |tenant|
-      begin
-        Apartment::TaskHelper.create_tenant(tenant)
-        puts("Seeding #{tenant} tenant")
-        Apartment::Tenant.switch(tenant) do
-          Apartment::Tenant.seed
-        end
-      rescue Apartment::TenantNotFound => e
-        puts e.message
+      Apartment::TaskHelper.create_tenant(tenant)
+      puts("Seeding #{tenant} tenant")
+      Apartment::Tenant.switch(tenant) do
+        Apartment::Tenant.seed
       end
+    rescue Apartment::TenantNotFound => e
+      puts e.message
     end
   end
 
@@ -58,12 +54,10 @@ apartment_namespace = namespace :apartment do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
 
     Apartment::TaskHelper.each_tenant do |tenant|
-      begin
-        puts("Rolling back #{tenant} tenant")
-        Apartment::Migrator.rollback tenant, step
-      rescue Apartment::TenantNotFound => e
-        puts e.message
-      end
+      puts("Rolling back #{tenant} tenant")
+      Apartment::Migrator.rollback tenant, step
+    rescue Apartment::TenantNotFound => e
+      puts e.message
     end
   end
 
@@ -76,12 +70,10 @@ apartment_namespace = namespace :apartment do
       raise 'VERSION is required' unless version
 
       Apartment::TaskHelper.each_tenant do |tenant|
-        begin
-          puts("Migrating #{tenant} tenant up")
-          Apartment::Migrator.run :up, tenant, version
-        rescue Apartment::TenantNotFound => e
-          puts e.message
-        end
+        puts("Migrating #{tenant} tenant up")
+        Apartment::Migrator.run :up, tenant, version
+      rescue Apartment::TenantNotFound => e
+        puts e.message
       end
     end
 
@@ -93,12 +85,10 @@ apartment_namespace = namespace :apartment do
       raise 'VERSION is required' unless version
 
       Apartment::TaskHelper.each_tenant do |tenant|
-        begin
-          puts("Migrating #{tenant} tenant down")
-          Apartment::Migrator.run :down, tenant, version
-        rescue Apartment::TenantNotFound => e
-          puts e.message
-        end
+        puts("Migrating #{tenant} tenant down")
+        Apartment::Migrator.run :down, tenant, version
+      rescue Apartment::TenantNotFound => e
+        puts e.message
       end
     end
 

data/ros-apartment.gemspec

@@ -27,17 +27,23 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/rails-on-services/apartment'
   s.licenses = ['MIT']
 
-  s.add_dependency 'activerecord',    '>= 5.0.0', '< 6.2'
-  s.add_dependency 'parallel',        '< 2.0'
-  s.add_dependency 'public_suffix',   '>= 2.0.5', '< 5.0'
-  s.add_dependency 'rack',            '>= 1.3.6', '< 3.0'
+  s.add_dependency 'activerecord', '>= 5.0.0', '< 7.1'
+  s.add_dependency 'parallel', '< 2.0'
+  s.add_dependency 'public_suffix', '>= 2.0.5', '< 5.0'
+  s.add_dependency 'rack', '>= 1.3.6', '< 3.0'
 
-  s.add_development_dependency 'appraisal',    '~> 2.2'
-  s.add_development_dependency 'bundler',      '>= 1.3', '< 3.0'
-  s.add_development_dependency 'capybara',     '~> 2.0'
-  s.add_development_dependency 'rake',         '~> 13.0'
-  s.add_development_dependency 'rspec',        '~> 3.4'
-  s.add_development_dependency 'rspec-rails',  '~> 3.4'
+  s.add_development_dependency 'appraisal', '~> 2.2'
+  s.add_development_dependency 'bundler', '>= 1.3', '< 3.0'
+  s.add_development_dependency 'guard-rspec', '~> 4.2'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'rspec', '~> 3.4'
+  s.add_development_dependency 'rspec_junit_formatter'
+  s.add_development_dependency 'rspec-rails', '~> 3.4'
+  s.add_development_dependency 'rubocop', '~> 0.93'
+  s.add_development_dependency 'rubocop-performance', '~> 1.10'
+  s.add_development_dependency 'rubocop-rails', '~> 2.1'
+  s.add_development_dependency 'rubocop-rspec', '~> 1.44'
 
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'activerecord-jdbc-adapter'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Ryan Brunner
 - Brad Robertson
 - Rui Baltazar
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -121,19 +121,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +176,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +204,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.93'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.93'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.44'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.44'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -231,11 +315,13 @@ files:
 - ".circleci/config.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/workflows/changelog.yml"
+- ".github/workflows/reviewdog.yml"
 - ".gitignore"
 - ".pryrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - ".story_branch.yml"
 - Appraisals
 - CHANGELOG.md
@@ -246,16 +332,15 @@ files:
 - Rakefile
 - TODO.md
 - docker-compose.yml
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
 - gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
 - gemfiles/rails_master.gemfile
 - lib/apartment.rb
 - lib/apartment/active_record/connection_handling.rb
 - lib/apartment/active_record/internal_metadata.rb
+- lib/apartment/active_record/postgresql_adapter.rb
 - lib/apartment/active_record/schema_migration.rb
 - lib/apartment/adapters/abstract_adapter.rb
 - lib/apartment/adapters/abstract_jdbc_adapter.rb
@@ -278,7 +363,6 @@ files:
 - lib/apartment/migrator.rb
 - lib/apartment/model.rb
 - lib/apartment/railtie.rb
-- lib/apartment/reloader.rb
 - lib/apartment/tasks/enhancements.rb
 - lib/apartment/tasks/task_helper.rb
 - lib/apartment/tenant.rb
@@ -292,7 +376,7 @@ homepage: https://github.com/rails-on-services/apartment
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -307,8 +391,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy. Apartment Gem drop in replacement
 test_files: []

data/gemfiles/rails_4_2.gemfile

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-# This file was generated by Appraisal
-
-source 'http://rubygems.org'
-
-gem 'rails', '~> 4.2.0'
-
-group :local do
-  gem 'guard-rspec', '~> 4.2'
-  gem 'pry'
-end
-
-platforms :ruby do
-  gem 'mysql2', '~> 0.4.0'
-  gem 'pg', '< 1.0.0'
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbc-adapter', '~> 1.3'
-  gem 'activerecord-jdbcmysql-adapter', '~> 1.3'
-  gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3'
-end
-
-gemspec path: '../'

data/gemfiles/rails_5_0.gemfile

@@ -1,23 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 5.0.0"
-gem "rubocop"
-
-group :local do
-  gem "guard-rspec", "~> 4.2"
-  gem "pry"
-end
-
-platforms :ruby do
-  gem "pg", "< 1.0.0"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 50.0"
-  gem "activerecord-jdbcpostgresql-adapter", "~> 50.0"
-  gem "activerecord-jdbcmysql-adapter", "~> 50.0"
-end
-
-gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -1,23 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 5.1.0"
-gem "rubocop"
-
-group :local do
-  gem "guard-rspec", "~> 4.2"
-  gem "pry"
-end
-
-platforms :ruby do
-  gem "pg", "< 1.0.0"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 51.0"
-  gem "activerecord-jdbcpostgresql-adapter", "~> 51.0"
-  gem "activerecord-jdbcmysql-adapter", "~> 51.0"
-end
-
-gemspec path: "../"

data/lib/apartment/reloader.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-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