ros-apartment 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2494257d1e615c2ef2e79647f3d5b62762dec8c51af19f2c5fe352b01572e752
-  data.tar.gz: 23b24db12c93d35cf10e34e1c71455a6fe05c9afe162dca6de5115212cb052b7
+  metadata.gz: e7acbb6c519fef676bdf05370eb1de788bf262a30f83040fcb2455b3a950ad58
+  data.tar.gz: c078d989df4e11e7d519bcb0c30c0a99cd8f692adc995407a6a7fdecbd5d6e2a
 SHA512:
-  metadata.gz: e13fe607631fe0953b16ec42a64ba162deb3fc1522b70ac09b152acbc47b6bebd63a25cc35a6873a3190304de40166f89e9782ceced0259932116739890526f2
-  data.tar.gz: 035b1b87cdf43f463a6895981d63100a238a2a8b3ad0e0b529d74fa261f6138005e0f5aecd425e857d9ba10ee11c613cb8d6b3002cd35484b34b58f4df367e9a
+  metadata.gz: 9ef24485b251bf0d68f1e2af3a6cb82312b25f457383ed4bff1eadf50ee2cacba8af21330cd03853186ee117b07e3454f9224485d81079c687b69fadc9fabbea
+  data.tar.gz: 64c3423beb74472af3f84ad21152eed840162a6bf7d567b360f0a7216314545f7e1ca5eb5af9fb20b753fd681a4d40582478da6335ab69cc8e8795812362d74a

data/.rubocop.yml

@@ -1,11 +1,5 @@
-inherit_from: .rubocop_todo.yml
-
-require:
-  - rubocop-rails
-  - rubocop-performance
-  - rubocop-rspec
-
 AllCops:
+  NewCops: enable
   Exclude:
     - vendor/bundle/**/*
     - gemfiles/**/*.gemfile
@@ -13,12 +7,20 @@ AllCops:
     - spec/dummy_engine/dummy_engine.gemspec
     - spec/schemas/**/*.rb
 
-  NewCops: enable
+require:
+  - rubocop-rails
+  - rubocop-performance
+  - rubocop-thread_safety
+  - rubocop-rake
+  - rubocop-rspec
 
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'ros-apartment.gemspec'
 
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
 Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb
@@ -33,4 +35,45 @@ Rails/Output:
   Enabled: false
 
 Style/Documentation:
-  Enabled: false
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
+Style/InlineComment:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  Exclude:
+    - Gemfile
+
+Style/MethodCallWithArgsParentheses:
+  Enabled: true
+  EnforcedStyle: require_parentheses
+  AllowedPatterns:
+    - 'puts'
+    - 'info'
+    - 'warn'
+    - 'debug'
+    - 'error'
+    - 'fatal'
+    - 'fail'
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: nested
+  AutoCorrect: true
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'detect'
+    find_all: 'select'

data/.ruby-version

@@ -1 +1 @@
-3.3.1
+3.3.6

data/Appraisals

@@ -1,50 +1,130 @@
 # frozen_string_literal: true
 
-appraise 'rails-6-1' do
+appraise 'rails-6-1-postgresql' do
   gem 'rails', '~> 6.1.0'
-  platforms :ruby do
-    gem 'sqlite3', '~> 1.4'
+  gem 'pg', '~> 1.5'
+end
+
+appraise 'rails-6-1-mysql' do
+  gem 'rails', '~> 6.1.0'
+  gem 'mysql2', '~> 0.5'
+end
+
+appraise 'rails-6-1-sqlite3' do
+  gem 'rails', '~> 6.1.0'
+  gem 'sqlite3', '~> 1.4'
+end
+
+appraise 'rails-6-1-jdbc-postgresql' do
+  gem 'rails', '~> 6.1.0'
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 61.3'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 61.3'
+    gem 'jdbc-postgres'
   end
+end
+
+appraise 'rails-6-1-jdbc-mysql' do
+  gem 'rails', '~> 6.1.0'
   platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 61.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
+    gem 'activerecord-jdbc-adapter', '~> 61.3'
+    gem 'activerecord-jdbcmysql-adapter', '~> 61.3'
+    gem 'jdbc-mysql'
   end
 end
 
-appraise 'rails-7-0' do
-  gem 'rails', '~> 7.0.0'
-  platforms :ruby do
-    gem 'sqlite3', '~> 1.4'
+appraise 'rails-6-1-jdbc-sqlite3' do
+  gem 'rails', '~> 6.1.0'
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 61.3'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 61.3'
+    gem 'jdbc-sqlite3'
   end
+end
+
+appraise 'rails-7-0-postgresql' do
+  gem 'rails', '~> 7.0.0'
+  gem 'pg', '~> 1.5'
+end
+
+appraise 'rails-7-0-mysql' do
+  gem 'rails', '~> 7.0.0'
+  gem 'mysql2', '~> 0.5'
+end
+
+appraise 'rails-7-0-sqlite3' do
+  gem 'rails', '~> 7.0.0'
+  gem 'sqlite3', '~> 1.4'
+end
+
+appraise 'rails-7-0-jdbc-postgresql' do
+  gem 'rails', '~> 7.0.0'
   platforms :jruby do
     gem 'activerecord-jdbc-adapter', '~> 70.0'
     gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
+    gem 'jdbc-postgres'
   end
 end
 
-appraise 'rails-7-1' do
-  gem 'rails', '~> 7.1.0'
-  platforms :ruby do
-    gem 'sqlite3', '~> 1.6'
+appraise 'rails-7-0-jdbc-mysql' do
+  gem 'rails', '~> 7.0.0'
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 70.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
+    gem 'jdbc-mysql'
   end
+end
+
+appraise 'rails-7-0-jdbc-sqlite3' do
+  gem 'rails', '~> 7.0.0'
   platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 71.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 71.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 71.0'
+    gem 'activerecord-jdbc-adapter', '~> 70.0'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 70.0'
+    gem 'jdbc-sqlite3'
   end
 end
 
-# Install Rails from the main branch are failing
-# appraise 'rails-master' do
-#   gem 'rails', git: 'https://github.com/rails/rails.git'
-#   platforms :ruby do
-#     gem 'sqlite3', '~> 2.0'
-#   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-7-1-postgresql' do
+  gem 'rails', '~> 7.1.0'
+  gem 'pg', '~> 1.5'
+end
+
+appraise 'rails-7-1-mysql' do
+  gem 'rails', '~> 7.1.0'
+  gem 'mysql2', '~> 0.5'
+end
+
+appraise 'rails-7-1-sqlite3' do
+  gem 'rails', '~> 7.1.0'
+  gem 'sqlite3', '~> 2.1'
+end
+
+appraise 'rails-7-2-postgresql' do
+  gem 'rails', '~> 7.2.0'
+  gem 'pg', '~> 1.5'
+end
+
+appraise 'rails-7-2-mysql' do
+  gem 'rails', '~> 7.2.0'
+  gem 'mysql2', '~> 0.5'
+end
+
+appraise 'rails-7-2-sqlite3' do
+  gem 'rails', '~> 7.2.0'
+  gem 'sqlite3', '~> 2.1'
+end
+
+appraise 'rails-8-0-postgresql' do
+  gem 'rails', '~> 8.0.0'
+  gem 'pg', '~> 1.5'
+end
+
+appraise 'rails-8-0-mysql' do
+  gem 'rails', '~> 8.0.0'
+  gem 'mysql2', '~> 0.5'
+end
+
+appraise 'rails-8-0-sqlite3' do
+  gem 'rails', '~> 8.0.0'
+  gem 'sqlite3', '~> 2.1'
+end

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,71 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a safe, welcoming, and inclusive experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others’ private information, such as a physical or email address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned with this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples include using an official email address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [mauricio@campusesp.com]. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period.
+
+### 4. Permanent Ban
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 2.1, available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
+
+For answers to common questions about this code of conduct, see https://www.contributor-covenant.org/faq.

data/Gemfile

@@ -3,3 +3,18 @@
 source 'http://rubygems.org'
 
 gemspec
+
+gem 'appraisal', '~> 2.3'
+gem 'bundler', '< 3.0'
+gem 'pry', '~> 0.13'
+gem 'rake', '< 14.0'
+gem 'rspec', '~> 3.10'
+gem 'rspec_junit_formatter', '~> 0.4'
+gem 'rspec-rails', '>= 6.1.0', '< 8.1'
+gem 'rubocop', '~> 1.12'
+gem 'rubocop-performance', '~> 1.10'
+gem 'rubocop-rails', '~> 2.10'
+gem 'rubocop-rake', '~> 0.5'
+gem 'rubocop-rspec', '~> 3.1'
+gem 'rubocop-thread_safety', '~> 0.4'
+gem 'simplecov', require: false

data/README.md

@@ -1,7 +1,7 @@
 # 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)
+[![codecov](https://codecov.io/gh/rails-on-services/apartment/graph/badge.svg?token=Q4I5QL78SA)](https://codecov.io/gh/rails-on-services/apartment)
 
 *Multitenancy for Rails and ActiveRecord*
 
@@ -9,21 +9,17 @@ Apartment provides tools to help you deal with multiple tenants in your Rails
 application. If you need to have certain data sequestered based on account or company,
 but still allow some data to exist in a common tenant, Apartment can help.
 
-## Apartment drop in replacement gem
+## Apartment Fork: ros-apartment
 
-After having reached out via github issues and email directly, no replies ever
-came. Since we wanted to upgrade our application to Rails 6 we decided to fork
-and start some development to support Rails 6. Because we don't have access
-to the apartment gem itself, the solution was to release it under a different
-name but providing the exact same API as it was before.
+This gem is a fork of the original Apartment gem, which is no longer maintained. We have continued development under the name `ros-apartment` to keep the gem up-to-date and compatible with the latest versions of Rails. `ros-apartment` is designed as a drop-in replacement for the original, allowing you to seamlessly transition your application without code changes.
 
-## Help wanted
+## Community Support
 
-We were never involved with the development of Apartment gem in the first place
-and this project started out of our own needs. We will be more than happy
-to collaborate to maintain the gem alive and supporting the latest versions
-of ruby and rails, but your help is appreciated. Either by reporting bugs you
-may find or proposing improvements to the gem itself. Feel free to reach out.
+This project thrives on community support. Whether you have an idea for a new feature, find a bug, or need help with `ros-apartment`, we encourage you to participate! For questions and troubleshooting, check out our [Discussions board](https://github.com/rails-on-services/apartment/discussions) to connect with the community. You can also open issues or submit pull requests directly. We are committed to maintaining `ros-apartment` and ensuring it remains a valuable tool for Rails developers.
+
+### Maintainer Update
+
+As of May 2024, Apartment is maintained with the support of [CampusESP](https://www.campusesp.com). We continue to keep Apartment open-source under the MIT license. We also want to recognize and thank the previous maintainers for their valuable contributions to this project.
 
 ## Installation
 
@@ -47,10 +43,6 @@ Configure as needed using the docs below.
 That's all you need to set up the Apartment libraries. If you want to switch tenants
 on a per-user basis, look under "Usage - Switching tenants per request", below.
 
-> NOTE: If using [postgresql schemas](http://www.postgresql.org/docs/9.0/static/ddl-schemas.html) you must use:
->
-> * for Rails 3.1.x: _Rails ~> 3.1.2_, it contains a [patch](https://github.com/rails/rails/pull/3232) that makes prepared statements work with multiple schemas
-
 ## Usage
 
 ### Video Tutorial
@@ -630,24 +622,50 @@ $ APARTMENT_DISABLE_INIT=true DATABASE_URL=postgresql://localhost:1234/buk_devel
 # 1
 ```
 
-## Contributing
+## Contribution Guidelines
+
+We welcome and appreciate contributions to `ros-apartment`! Whether you want to report a bug, propose a new feature, or submit a pull request, your help keeps this project thriving. Please review the guidelines below to ensure a smooth collaboration process.
+
+### How to Contribute
+
+1. **Check Existing Issues and Discussions**
+   - Before opening a new issue, please check the [issue tracker](https://github.com/rails-on-services/apartment/issues) and our [Discussions board](https://github.com/rails-on-services/apartment/discussions) to see if the topic has already been reported or discussed. This helps us avoid duplication and focus on solving the issue efficiently.
+
+2. **Submitting a Bug Report**
+   - Ensure your report includes a clear description of the problem, steps to reproduce, and relevant logs or error messages.
+   - If possible, provide a minimal reproducible example or a failing test case that demonstrates the issue.
+
+3. **Proposing a Feature**
+   - For new features, open an issue to discuss your idea before starting development. This allows the maintainers and community to provide feedback and ensure the feature aligns with the project's goals.
+   - Please be as detailed as possible when describing the feature, its use case, and its potential impact on the existing functionality.
+
+4. **Submitting a Pull Request**
+   - Fork the repository and create a feature branch (`git checkout -b my-feature-branch`).
+   - Follow the existing code style and ensure your changes are well-documented and tested.
+   - Run the tests locally to verify that your changes do not introduce new issues.
+   - Use [Appraisal](https://github.com/thoughtbot/appraisal) to test against multiple Rails versions. Ensure all tests pass for supported Rails versions.
+   - Submit your pull request to the `development` branch, not `main`.
+   - Include a detailed description of your changes and reference any related issue numbers (e.g., "Fixes #123" or "Closes #456").
+
+5. **Code Review and Merging Process**
+   - The maintainers will review your pull request and may provide feedback or request changes. We appreciate your patience during this process, as we strive to maintain a high standard for code quality.
+   - Once approved, your pull request will be merged into the `development` branch. Periodically, we merge the `development` branch into `main` for official releases.
+
+6. **Testing**
+   - Ensure your code is thoroughly tested. We do not merge code changes without adequate tests. Use RSpec for unit and integration tests.
+   - If your contribution affects multiple versions of Rails, use Appraisal to verify compatibility across versions.
+   - Rake tasks (see the Rakefile) are available to help set up your test databases and run tests.
 
-* In both `spec/dummy/config` and `spec/config`, you will see `database.yml.sample` files
-  * Copy them into the same directory but with the name `database.yml`
-  * Edit them to fit your own settings
-* Rake tasks (see the Rakefile) will help you setup your dbs necessary to run tests
-* Please issue pull requests to the `development` branch. All development happens here, master is used for releases.
-* Ensure that your code is accompanied with tests. No code will be merged without tests
+### Code of Conduct
 
-* If you're looking to help, check out the TODO file for some upcoming changes I'd like to implement in Apartment.
+We are committed to providing a welcoming and inclusive environment for all contributors. Please review and adhere to our [Code of Conduct](CODE_OF_CONDUCT.md) when participating in the project.
 
-### Running bundle install
+### Questions and Support
 
-mysql2 gem in some cases fails to install.
-If you face problems running bundle install in OSX, try installing the gem running:
+If you have any questions or need support while contributing or using `ros-apartment`, visit our [Discussions board](https://github.com/rails-on-services/apartment/discussions) to ask questions and connect with the maintainer team and community.
 
-`gem install mysql2 -v '0.5.3' -- --with-ldflags=-L/usr/local/opt/openssl/lib --with-cppflags=-I/usr/local/opt/openssl/include`
+We look forward to your contributions and thank you for helping us keep `ros-apartment` a reliable and robust tool for the Rails community!
 
 ## License
 
-Apartment is released under the [MIT License](http://www.opensource.org/licenses/MIT).
+Apartment remains an open-source project under the [MIT License](http://www.opensource.org/licenses/MIT). We value open-source principles and aim to make multitenancy accessible to all Rails developers.

data/Rakefile

@@ -13,7 +13,7 @@ require 'appraisal'
 require 'rspec'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(spec: %w[db:copy_credentials db:test:prepare]) do |spec|
+RSpec::Core::RakeTask.new(spec: %w[db:load_credentials db:test:prepare]) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   # spec.rspec_opts = '--order rand:47078'
 end
@@ -37,19 +37,36 @@ task default: :spec
 
 namespace :db do
   namespace :test do
-    task prepare: %w[postgres:drop_db postgres:build_db mysql:drop_db mysql:build_db]
+    case ENV.fetch('DATABASE_ENGINE', nil)
+    when 'postgresql'
+      task prepare: %w[postgres:drop_db postgres:build_db]
+    when 'mysql'
+      task prepare: %w[mysql:drop_db mysql:build_db]
+    when 'sqlite'
+      task :prepare do
+        puts 'No need to prepare sqlite3 database'
+      end
+    else
+      task :prepare do
+        puts 'No database engine specified, skipping db:test:prepare'
+      end
+    end
   end
 
   desc "copy sample database credential files over if real files don't exist"
-  task :copy_credentials do
-    require 'fileutils'
-    apartment_db_file = 'spec/config/database.yml'
-    rails_db_file = 'spec/dummy/config/database.yml'
+  task :load_credentials do
+    # If no DATABASE_ENGINE is specified, we default to sqlite so that a db config is generated
+    db_engine = ENV.fetch('DATABASE_ENGINE', 'sqlite')
 
-    unless File.exist?(apartment_db_file)
-      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)
+    next unless db_engine && %w[postgresql mysql sqlite].include?(db_engine)
+
+    # Load and write spec db config
+    db_config_string = ERB.new(File.read("spec/config/#{db_engine}.yml.erb")).result
+    File.write('spec/config/database.yml', db_config_string)
+
+    # Load and write dummy app db config
+    db_config = YAML.safe_load(db_config_string)
+    File.write('spec/dummy/config/database.yml', { test: db_config['connections'][db_engine] }.to_yaml)
   end
 end
 
@@ -67,11 +84,11 @@ namespace :postgres do
     params << "-p#{pg_config['port']}" if pg_config['port']
 
     begin
-      `createdb #{params.join(' ')}`
+      system("createdb #{params.join(' ')}")
     rescue StandardError
       'test db already exists'
     end
-    ActiveRecord::Base.establish_connection pg_config
+    ActiveRecord::Base.establish_connection(pg_config)
     migrate
   end
 
@@ -83,7 +100,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']
-    `dropdb #{params.join(' ')}`
+    system("dropdb #{params.join(' ')}")
   end
 end
 
@@ -96,14 +113,14 @@ namespace :mysql do
     params = []
     params << "-h #{my_config['host']}" if my_config['host']
     params << "-u #{my_config['username']}" if my_config['username']
-    params << "-p#{my_config['password']}" if my_config['password']
-    params << "--port #{my_config['port']}" if my_config['port']
+    params << "-p #{my_config['password']}" if my_config['password']
+    params << "-P #{my_config['port']}" if my_config['port']
     begin
-      `mysqladmin #{params.join(' ')} create #{my_config['database']}`
+      system("mysqladmin #{params.join(' ')} create #{my_config['database']}")
     rescue StandardError
       'test db already exists'
     end
-    ActiveRecord::Base.establish_connection my_config
+    ActiveRecord::Base.establish_connection(my_config)
     migrate
   end
 
@@ -113,13 +130,12 @@ namespace :mysql do
     params = []
     params << "-h #{my_config['host']}" if my_config['host']
     params << "-u #{my_config['username']}" if my_config['username']
-    params << "-p#{my_config['password']}" if my_config['password']
-    params << "--port #{my_config['port']}" if my_config['port']
-    `mysqladmin #{params.join(' ')} drop #{my_config['database']} --force`
+    params << "-p #{my_config['password']}" if my_config['password']
+    params << "-P #{my_config['port']}" if my_config['port']
+    system("mysqladmin #{params.join(' ')} drop #{my_config['database']} --force")
   end
 end
 
-# TODO: clean this up
 def config
   Apartment::Test.config['connections']
 end
@@ -133,7 +149,9 @@ def my_config
 end
 
 def migrate
-  # 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
+  if ActiveRecord.version.release < Gem::Version.new('7.1')
+    ActiveRecord::MigrationContext.new('spec/dummy/db/migrate', ActiveRecord::SchemaMigration).migrate
+  else
+    ActiveRecord::MigrationContext.new('spec/dummy/db/migrate').migrate
+  end
 end

data/lib/apartment/active_record/connection_handling.rb

@@ -15,10 +15,10 @@ module ActiveRecord # :nodoc:
         end
       end
     else
-      def connected_to_with_tenant(role: nil, prevent_writes: false, &blk)
+      def connected_to_with_tenant(role: nil, shard: nil, prevent_writes: false, &blk)
         current_tenant = Apartment::Tenant.current
 
-        connected_to_without_tenant(role: role, prevent_writes: prevent_writes) do
+        connected_to_without_tenant(role: role, shard: shard, prevent_writes: prevent_writes) do
           Apartment::Tenant.switch!(current_tenant)
           yield(blk)
         end

data/lib/apartment/active_record/postgres/schema_dumper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# This patch prevents `create_schema` from being added to db/schema.rb as schemas are managed by Apartment
+# not ActiveRecord like they would be in a vanilla Rails setup.
+
+require 'active_record/connection_adapters/abstract/schema_dumper'
+require 'active_record/connection_adapters/postgresql/schema_dumper'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module PostgreSQL
+      class SchemaDumper
+        alias _original_schemas schemas
+        def schemas(stream)
+          _original_schemas(stream) unless Apartment.use_schemas
+        end
+      end
+    end
+  end
+end