ros-apartment 2.8.1.rc1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f446466c85cecc098b1fec480bd1400bc849ea49ea4f7b5607c1bb3bd46ab6b6
-  data.tar.gz: ed713631a71b9b9948f942f25f6cb5dba586a41dcdebe40f14fdef6effccf25c
+  metadata.gz: 9729bd0cd46375da3b48c1aad59bd2de396f90e9a7cd92d24dafee964988cbc4
+  data.tar.gz: 1e0b6a955a15691edcbbb680657d1a65c75c7b49cd93e342d4df7212d29313c5
 SHA512:
-  metadata.gz: a7bf926bd676c7025c1567063b1b97eb01993e7d6f4821ff8e103e9b1057791712a8590247191070764fdbbfd17dc70cc54848fee5c5a7e5379315eda4554cb5
-  data.tar.gz: 86375a0c10ce05b3a2e9c217c9c0e574a643725fcba1f98631165d7e8682f9d840d152238d24370ebc55d2713989ff47d633e35fd7c2cdde171443cbcbc3dd07
+  metadata.gz: 9f12f51635a20b87a5a8bddcd00eceac5ccd355699e2932947689a929695b1ad4337528da976a7905c31ed91413ee41eddc6f2ce7aed1d79f7643073b50053fa
+  data.tar.gz: 617c702d5f698a3a8b81649f10bb91373ff9fabab4755270ffc2289a44ea7b48b814f939c4363bb23d45a378f1f444963188980ea0acc1e5b76cd7d28207e3f3

data/.circleci/config.yml

@@ -0,0 +1,76 @@
+version: 2.1
+
+jobs:
+  build:
+    docker:
+      - image: circleci/<< parameters.ruby_version >>
+      - image: circleci/postgres:9.6.2-alpine
+      - image: circleci/mysql:5.7
+        environment:
+          MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+    parameters:
+      ruby_version:
+        type: string
+      gemfile:
+        type: string
+    environment:
+      BUNDLE_GEMFILE: << parameters.gemfile >>
+    steps:
+      - checkout
+      # Restore Cached Dependencies
+      # - restore_cache:
+      #     keys:
+      #       - gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "<< parameters.gemfile >>.lock" }}
+      #       - gem-cache-v1-{{ arch }}-{{ .Branch }}
+      #       - gem-cache-v1
+
+      - run: bundle install --path vendor/bundle
+
+      # - save_cache:
+      #     key: gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "<< parameters.gemfile >>.lock" }}
+      #     paths:
+      #       - vendor/bundle
+
+      - run:
+          name: Install postgres client
+          command: sudo apt install -y postgresql-client
+
+      - run:
+          name: Install mysql client
+          command: sudo apt install -y default-mysql-client
+
+      - run:
+          name: Configure config database.yml
+          command: bundle exec rake db:copy_credentials
+
+      - run:
+          name: wait for postgresql
+          command: dockerize -wait tcp://localhost:5432 -timeout 1m
+
+      - run:
+          name: wait for mysql
+          command: dockerize -wait tcp://localhost:3306 -timeout 1m
+
+      - run:
+          name: Database Setup
+          command: |
+            bundle exec rake db:test:prepare
+
+      - run:
+          name: Run tests
+          command: bundle exec rspec --format progress --format RspecJunitFormatter -o ~/test-results/rspec/rspec.xml
+
+      - store_test_results:
+          path: ~/test-results/rspec/
+
+workflows:
+  tests:
+    jobs:
+      - build:
+          matrix:
+            parameters:
+              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"]
+            exclude:
+              - ruby_version: "ruby:3.0-buster"
+                gemfile: "gemfiles/rails_5_2.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,91 +1,32 @@
 inherit_from: .rubocop_todo.yml
 
-AllCops:
-  Exclude:
-    - 'gemfiles/**/*.gemfile'
-    - 'gemfiles/vendor/**/*'
+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,193 @@ 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'
+    - 'spec/unit/reloader_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'
+    - 'spec/unit/reloader_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:
+    - 'spec/unit/reloader_spec.rb'
+
+# 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'
+    - 'spec/unit/reloader_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'
+    - 'spec/unit/reloader_spec.rb'
+
 # Offense count: 17
 Style/Documentation:
   Exclude:
@@ -56,11 +237,3 @@ Style/Documentation:
     - '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.3

data/Appraisals

@@ -45,14 +45,26 @@ appraise 'rails-6-0' do
   end
 end
 
+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', '~> 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
     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
 end

data/CHANGELOG.md

@@ -9,6 +9,7 @@
 **Fixed bugs:**
 
 - New version raises an error with ActiveSupport::LogSubscriber [#128](https://github.com/rails-on-services/apartment/issues/128)
+- Weird logs when tenant fails to create [#127](<https://github.com/rails-on-services/apartment/issues/127>)
 
 **Closed issues:**
 

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.
@@ -351,7 +361,7 @@ Please note that our custom logger inherits from `ActiveRecord::LogSubscriber` s
 
 ```ruby
 Apartment.configure do |config|
-  active_record_log = true
+  config.active_record_log = true
 end
 ```
 

data/Rakefile

@@ -47,9 +47,9 @@ namespace :db do
     rails_db_file = 'spec/dummy/config/database.yml'
 
     unless File.exist?(apartment_db_file)
-      FileUtils.copy(apartment_db_file + '.sample', apartment_db_file, verbose: true)
+      FileUtils.copy("#{apartment_db_file}.sample", apartment_db_file, verbose: true)
     end
-    FileUtils.copy(rails_db_file + '.sample', rails_db_file, verbose: true) unless File.exist?(rails_db_file)
+    FileUtils.copy("#{rails_db_file}.sample", rails_db_file, verbose: true) unless File.exist?(rails_db_file)
   end
 end
 
@@ -65,6 +65,7 @@ namespace :postgres do
     params << "-U#{pg_config['username']}"
     params << "-h#{pg_config['host']}" if pg_config['host']
     params << "-p#{pg_config['port']}" if pg_config['port']
+
     begin
       `createdb #{params.join(' ')}`
     rescue StandardError

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+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"
+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/lib/apartment/adapters/abstract_adapter.rb

@@ -201,11 +201,13 @@ module Apartment
       #   @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
+      # rubocop:disable Style/OptionalBooleanParameter
       def multi_tenantify(tenant, with_database = true)
         db_connection_config(tenant).tap do |config|
           multi_tenantify_with_tenant_db_name(config, tenant) if with_database
         end
       end
+      # rubocop:enable Style/OptionalBooleanParameter
 
       def multi_tenantify_with_tenant_db_name(config, tenant)
         config[:database] = environmentify(tenant)

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

@@ -72,11 +72,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
 
         # When the PostgreSQL version is < 9.3,
@@ -98,7 +96,7 @@ module Apartment
 
       def create_tenant_command(conn, tenant)
         # NOTE: This was causing some tests to fail because of the database strategy for rspec
-        if ActiveRecord::Base.connection.open_transactions > 0
+        if ActiveRecord::Base.connection.open_transactions.positive?
           conn.execute(%(CREATE SCHEMA "#{tenant}"))
         else
           schema = %(BEGIN;
@@ -113,7 +111,7 @@ module Apartment
       end
 
       def rollback_transaction(conn)
-        conn.execute("ROLLBACK;")
+        conn.execute('ROLLBACK;')
       end
 
       #   Generate the final search path to set including persistent_schemas
@@ -149,6 +147,12 @@ module Apartment
           c.remove_instance_variable :@sequence_name if c.instance_variable_defined?(:@sequence_name)
         end
       end
+
+      def schema_exists?(schemas)
+        return true unless Apartment.tenant_presence_check
+
+        Array(schemas).all? { |schema| Apartment.connection.schema_exists?(schema.to_s) }
+      end
     end
 
     # Another Adapter for Postgresql when using schemas and SQL
@@ -158,6 +162,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 +229,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 +240,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,9 +1,10 @@
 # frozen_string_literal: true
 
-# A workaraound to get `reload!` to also call Apartment::Tenant.init
+# 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
 
@@ -13,6 +14,7 @@ def reload!(print = true)
   Apartment::Tenant.init
   true
 end
+# rubocop:enable Style/OptionalBooleanParameter
 
 def st(schema_name = nil)
   if schema_name.nil?

data/lib/apartment/log_subscriber.rb

@@ -3,10 +3,14 @@
 require 'active_record/log_subscriber'
 
 module Apartment
+  # Custom Log subscriber to include database name and schema name in sql logs
   class LogSubscriber < ActiveRecord::LogSubscriber
+    # NOTE: for some reason, if the method definition is not here, then the custom debug method is not called
+    # rubocop:disable Lint/UselessMethodDefinition
     def sql(event)
       super(event)
     end
+    # rubocop:enable Lint/UselessMethodDefinition
 
     private
 
@@ -17,7 +21,7 @@ module Apartment
     end
 
     def apartment_log
-      database = color("[#{Apartment.connection.current_database}] ", ActiveSupport::LogSubscriber::MAGENTA, true)
+      database = color("[#{Apartment.connection.raw_connection.db}] ", ActiveSupport::LogSubscriber::MAGENTA, true)
       schema = nil
       unless Apartment.connection.schema_search_path.nil?
         schema = color("[#{Apartment.connection.schema_search_path.tr('"', '')}] ",

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

@@ -6,7 +6,6 @@ require 'apartment/reloader'
 
 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
@@ -27,13 +26,14 @@ module Apartment
     end
 
     #   Hook into ActionDispatch::Reloader to ensure Apartment is properly initialized
-    #   Note that this doens't entirely work as expected in Development, because this is called before classes are reloaded
+    #   Note that this doesn'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.
     #
     config.to_prepare do
       next if ARGV.any? { |arg| arg =~ /\Aassets:(?:precompile|clean)\z/ }
-      next if ARGV.any? { |arg| arg == 'webpacker:compile' }
-      next if ENV["APARTMENT_DISABLE_INIT"]
+      next if ARGV.any?('webpacker:compile')
+      next if ENV['APARTMENT_DISABLE_INIT']
 
       begin
         Apartment.connection_class.connection_pool.with_connection do
@@ -45,7 +45,7 @@ module Apartment
       end
     end
 
-    config.after_initialize do |app|
+    config.after_initialize do
       # NOTE: Load the custom log subscriber if enabled
       if Apartment.active_record_log
         ActiveSupport::Notifications.unsubscribe 'sql.active_record'
@@ -72,7 +72,8 @@ module Apartment
         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
+      # 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'
       end

data/lib/apartment/tasks/task_helper.rb

@@ -36,5 +36,17 @@ module Apartment
     rescue Apartment::TenantExists => e
       puts "Tried to create already existing tenant: #{e}"
     end
+
+    def self.migrate_tenant(tenant_name)
+      strategy = Apartment.db_migrate_tenant_missing_strategy
+      create_tenant(tenant_name) if strategy == :create_tenant
+
+      puts("Migrating #{tenant_name} tenant")
+      Apartment::Migrator.migrate tenant_name
+    rescue Apartment::TenantNotFound => e
+      raise e if strategy == :raise_exception
+
+      puts e.message
+    end
   end
 end

data/lib/apartment/tenant.rb

@@ -10,8 +10,7 @@ module Apartment
     extend Forwardable
 
     def_delegators :adapter, :create, :drop, :switch, :switch!, :current, :each,
-                   :reset, :init, :set_callback, :seed, :current_tenant,
-                   :default_tenant, :environmentify
+                   :reset, :init, :set_callback, :seed, :default_tenant, :environmentify
 
     attr_writer :config
 
@@ -24,9 +23,10 @@ module Apartment
         adapter_method = "#{config[:adapter]}_adapter"
 
         if defined?(JRUBY_VERSION)
-          if config[:adapter] =~ /mysql/
+          case config[:adapter]
+          when /mysql/
             adapter_method = 'jdbc_mysql_adapter'
-          elsif config[:adapter] =~ /postgresql/
+          when /postgresql/
             adapter_method = 'jdbc_postgresql_adapter'
           end
         end

data/lib/apartment/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apartment
-  VERSION = '2.8.1.rc1'
+  VERSION = '2.10.0'
 end

data/lib/apartment.rb

@@ -27,7 +27,7 @@ module Apartment
 
     WRITER_METHODS = %i[tenant_names database_schema_file excluded_models
                         persistent_schemas connection_class
-                        db_migrate_tenants seed_data_file
+                        db_migrate_tenants db_migrate_tenant_missing_strategy seed_data_file
                         parallel_migration_threads pg_excluded_names].freeze
 
     attr_accessor(*ACCESSOR_METHODS)
@@ -72,6 +72,21 @@ module Apartment
       @db_migrate_tenants = true
     end
 
+    # How to handle tenant missing on db:migrate
+    # defaults to :rescue_exception
+    # available options: rescue_exception, raise_exception, create_tenant
+    def db_migrate_tenant_missing_strategy
+      valid = %i[rescue_exception raise_exception create_tenant]
+      value = @db_migrate_tenant_missing_strategy || :rescue_exception
+
+      return value if valid.include?(value)
+
+      key_name  = 'config.db_migrate_tenant_missing_strategy'
+      opt_names = valid.join(', ')
+
+      raise ApartmentError, "Option #{value} not valid for `#{key_name}`. Use one of #{opt_names}"
+    end
+
     # Default to empty array
     def excluded_models
       @excluded_models || []
@@ -92,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
 
@@ -30,13 +28,7 @@ apartment_namespace = namespace :apartment do
   task :migrate do
     Apartment::TaskHelper.warn_if_tenants_empty
     Apartment::TaskHelper.each_tenant do |tenant|
-      begin
-        Apartment::TaskHelper.create_tenant(tenant)
-        puts("Migrating #{tenant} tenant")
-        Apartment::Migrator.migrate tenant
-      rescue Apartment::TenantNotFound => e
-        puts e.message
-      end
+      Apartment::TaskHelper.migrate_tenant(tenant)
     end
   end
 
@@ -45,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
 
@@ -64,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
 
@@ -82,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
 
@@ -99,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', '< 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_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.8.1.rc1
+  version: 2.10.0
 platform: ruby
 authors:
 - Ryan Brunner
 - Brad Robertson
 - Rui Baltazar
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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
@@ -228,15 +312,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 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"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -251,6 +337,7 @@ files:
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - gemfiles/rails_master.gemfile
 - lib/apartment.rb
 - lib/apartment/active_record/connection_handling.rb
@@ -291,7 +378,7 @@ homepage: https://github.com/rails-on-services/apartment
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -302,12 +389,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      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/.travis.yml

@@ -1,49 +0,0 @@
-os: linux
-
-language: ruby
-services:
-  - docker
-rvm:
-  - jruby-9.2.11.0
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-  - jruby-head
-  - ruby-head
-
-branches:
-  only:
-    - master
-    - development
-
-gemfile:
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_6_0.gemfile
-  - gemfiles/rails_master.gemfile
-
-bundler_args: --without local
-before_install:
-  - sudo /etc/init.d/mysql stop
-  - sudo /etc/init.d/postgresql stop
-  - docker-compose up -d
-
-env:
-  RUBY_GC_MALLOC_LIMIT: 90000000
-  RUBY_GC_HEAP_FREE_SLOTS: 200000
-jobs:
-  include:
-  - name: Rubocop Lint
-    script: gem install rubocop
-
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - gemfile: gemfiles/rails_master.gemfile
-  exclude:
-    - rvm: 2.4.10
-      gemfile: gemfiles/rails_6_0.gemfile
-  fast_finish: true
-cache: bundler