sequelize-rails 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28ba0f80f8f390c7a6e735f81466cf6de3afa6a583fa468356165dc16f6b464f
-  data.tar.gz: aea26a334f90d64997e596fa6830f204d59bb35f58616e34795b5e0edfdf06f7
+  metadata.gz: 1d9b36457ef8b9c1cfc36554adb7b76a2c6262ac93fc9e6468a0c5e4eae74a04
+  data.tar.gz: 46a4e132f2d67a1c2aab16dcf1ec7fa39bb113f1dab39dbf2bb9a0e272af33da
 SHA512:
-  metadata.gz: 10aff2b60e7c26aa6f3ae61292372689c77574e51c8aed46529b5a90989a3f013cb3661195ba83c48e98e3df4027e6afb0b18d91ba150b73f385acd05c81bbf5
-  data.tar.gz: 3ad6415360fa05680722111e912d6c13be37204c76a8410e69ad18c19c2bde2a63fb9a2adf41728b6b286ae70847f1d34bdae8ff6daf58ea7f3d51ba90a7ae4e
+  metadata.gz: 0d4ff60a438337fe2d9f9f440a74da942b8c9aad250c8a127500cab2ef6082dd5de45c15163abaa8f25e1ce26c7c6ad772fb24edf57995ac4c6c29191512bf4c
+  data.tar.gz: '08f935a29a8f038fc824d407cb8d988f0d1c0745f9465e01dbbfe870c9a4c97f021a251b3750a7b4b74e91865846d4a51121039d6aac2c2a10ddce312e72a697'

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## [Unreleased]
 
-## [0.1.0] - 2021-12-26
+## [0.4.0] - 2023-08-16
 
-- Initial release
+- Rake tasks will no longer attempt a database connection by default
+- A new `db:connection` rake task has been added for explicitly connecting to the primary database

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sequelize-rails (0.2.0)
+    sequelize-rails (0.3.0)
       activerecord (>= 6.0.0)
       rails (>= 6.0.0)
       sequel (>= 5.0.0)
@@ -9,67 +9,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.3)
-      actionpack (= 7.0.3)
-      activesupport (= 7.0.3)
+    actioncable (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.3)
-      actionpack (= 7.0.3)
-      activejob (= 7.0.3)
-      activerecord (= 7.0.3)
-      activestorage (= 7.0.3)
-      activesupport (= 7.0.3)
+    actionmailbox (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.3)
-      actionpack (= 7.0.3)
-      actionview (= 7.0.3)
-      activejob (= 7.0.3)
-      activesupport (= 7.0.3)
+    actionmailer (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.3)
-      actionview (= 7.0.3)
-      activesupport (= 7.0.3)
+    actionpack (7.0.4.3)
+      actionview (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.3)
-      actionpack (= 7.0.3)
-      activerecord (= 7.0.3)
-      activestorage (= 7.0.3)
-      activesupport (= 7.0.3)
+    actiontext (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.3)
-      activesupport (= 7.0.3)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.3)
-      activesupport (= 7.0.3)
+    activejob (7.0.4.3)
+      activesupport (= 7.0.4.3)
       globalid (>= 0.3.6)
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activerecord (7.0.3)
-      activemodel (= 7.0.3)
-      activesupport (= 7.0.3)
-    activestorage (7.0.3)
-      actionpack (= 7.0.3)
-      activejob (= 7.0.3)
-      activerecord (= 7.0.3)
-      activesupport (= 7.0.3)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activestorage (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.3)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -82,118 +82,120 @@ GEM
     ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
-    digest (3.1.0)
-    erubi (1.10.0)
-    globalid (1.0.0)
+    date (3.3.3)
+    erubi (1.12.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.0)
-    minitest-reporters (1.5.0)
+    mini_portile2 (2.8.1)
+    minitest (5.18.0)
+    minitest-reporters (1.6.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    net-imap (0.2.3)
-      digest
+    net-imap (0.3.4)
+      date
       net-protocol
-      strscan
-    net-pop (0.1.1)
-      digest
+    net-pop (0.1.2)
       net-protocol
+    net-protocol (0.2.1)
       timeout
-    net-protocol (0.1.3)
-      timeout
-    net-smtp (0.3.1)
-      digest
+    net-smtp (0.3.3)
       net-protocol
-      timeout
     nio4r (2.5.8)
-    nokogiri (1.13.6)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
-    pg (1.3.5)
-    pry (0.14.1)
+    pg (1.4.6)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (7.0.3)
-      actioncable (= 7.0.3)
-      actionmailbox (= 7.0.3)
-      actionmailer (= 7.0.3)
-      actionpack (= 7.0.3)
-      actiontext (= 7.0.3)
-      actionview (= 7.0.3)
-      activejob (= 7.0.3)
-      activemodel (= 7.0.3)
-      activerecord (= 7.0.3)
-      activestorage (= 7.0.3)
-      activesupport (= 7.0.3)
+    racc (1.6.2)
+    rack (2.2.6.4)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (7.0.4.3)
+      actioncable (= 7.0.4.3)
+      actionmailbox (= 7.0.4.3)
+      actionmailer (= 7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actiontext (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       bundler (>= 1.15.0)
-      railties (= 7.0.3)
+      railties (= 7.0.4.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (7.0.3)
-      actionpack (= 7.0.3)
-      activesupport (= 7.0.3)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rubocop (1.29.1)
+    rubocop (1.48.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.13.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    sequel (5.57.0)
-    sqlite3 (1.4.4)
-    standard (1.12.1)
-      rubocop (= 1.29.1)
-      rubocop-performance (= 1.13.3)
-    strscan (3.0.3)
+    ruby-progressbar (1.13.0)
+    sequel (5.66.0)
+    sqlite3 (1.6.1)
+      mini_portile2 (~> 2.8.0)
+    standard (1.25.3)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (~> 1.48.1)
+      rubocop-performance (~> 1.16.0)
     thor (1.2.1)
-    timeout (0.3.0)
-    tzinfo (2.0.4)
+    timeout (0.3.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,10 +1,12 @@
-# Sequelize::Rails
+# sequelize-rails
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/sequelize_rails`. To experiment with that code, run `bin/console` for an interactive prompt.
+![Gem Version](https://badge.fury.io/rb/sequelize-rails.svg)
+![Build Status](https://github.com/kenaniah/sequelize-rails/actions/workflows/ci.yml/badge.svg)
+![Code Climate](https://codeclimate.com/github/kenaniah/sequelize-rails.svg)
 
-TODO: Delete this and the text above, and describe your gem
+This gem provides support for using [Sequel](https://sequel.jeremyevans.net/) as an ORM for Rails applications by providing features that are similar to ActiveRecord's integration with Rails. It is an alternative to [sequel-rails](https://github.com/TalentBox/sequel-rails).
 
-## Installation
+## Using sequelize-rails
 
 Add this line to your application's Gemfile:
 
@@ -16,38 +18,213 @@ And then execute:
 
     $ bundle install
 
-Or install it yourself as:
+If you are looking to replace ActiveRecord entirely, you may need to either generate your Rails app using `--skip-active-record` or manually remove references to ActiveRecord in your `Gemfile`, `config/application.rb`, and `config/environments/*.rb` files.
 
-    $ gem install sequelize-rails
+## Features provided by `sequelize-rails`
 
-## Usage
+**Database Management**
 
-TODO: Write usage instructions here
+- [x] [Connectivity](#---database-connectivity) via `config/database.yml`
+- [x] [Console](#---database-console) via `rails db`
+- [x] [Migrations](#---database-migrations) via `Sequel::Migration`
+- [ ] [Migration Generators](#---migration-generators) via `rails generate migration` (not supported yet)
+- [x] [Rake tasks](#---database-rake-tasks) via `rails db:*`
 
-## Development
+**Test Suite**
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+- [x] [Minitest Helpers](#---minitest-helpers)
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+**Rake Helpers**
 
-## Contributing
+- [x] Does not connect to the primary database in Rake (tasks by default)
+- [x] Allows for explicit connection to the primary database by invoking `db:connection`
+
+## ✅ - Database Connectivity
+
+This gem will automatically use your application's `config/database.yml` file to configure the available database connection(s).
+
+### Primary Connection
+
+A connection to the "primary" database is automatically established when the application is loaded. This connection will by used by default for all model classes that do not specify a different connection.
+
+The primary connection can be referenced directly via:
+
+```ruby
+Sequel::DATABASES.first # instead of ActiveRecord::Base.connection
+```
+
+A common convention within applications that use Sequel is to store the primary connection in the `DB` constant, which can be easily done within an initializer file via the following:
+
+```ruby
+# config/initializers/sequel.rb
+DB = Sequel::DATABASES.first unless defined?(DB)
+```
+
+### Additional Connections
+
+Additional connections can be configured in your `config/database.yml` file by adding additional entries to the `databases` key. For example:
+
+```yaml
+# config/database.yml
+
+# ... snip ...
+
+production:
+  <<: *default
+  database: <%= ENV["DATABASE_URL"] %>
+
+my_replica:
+  <<: *default
+  database: <%= ENV["REPLICA_DATABASE_URL"] %>
+
+```
+
+Additional connections can be retrieved via `Sequel::Rails.connect_to`, such as within the example below:
+
+```ruby
+replica_connection = Sequel::Rails.connect_to :my_replica
+```
+
+### Database Connections in Rake Tasks
+
+By default, this gem will not connect to the primary database when running Rake tasks. This is to prevent Rake tasks from accidentally depending on a database connection when one is not necessary. If you would like to connect to the primary database within a Rake task, you can do so by invoking the `db:connection` task, or by calling `Sequel::Rails.connect_to :primary` from within your task.
+
+```ruby
+# Rakefile
+
+# no database connections are initialized by default
+task :no_db_connection do
+  Sequel::DATABASES # => []
+  Sequel::DATABASES.length # => 0
+end
+
+# connects to the primary database explicitly
+task :my_task do
+  db = Sequel::Rails.connect_to :primary
+  Sequel::DATABASES # => [db]
+  Sequel::DATABASES.length # => 1
+end
+
+# connects to the primary database via the db:connection task
+task :my_other_task => "db:connection" do
+  Sequel::DATABASES # => [<primary db connection here>]
+  Sequel::DATABASES.length # => 1
+end
+```
+
+## ✅ - Database Console
+
+You can connect directly to your database via the `rails db` command. This command is similar to the `rails console` command, but instead of loading your application, it will connect directly to the database.
+
+```bash
+# connects to the primary database
+$ rails db
+
+# connects to the database of the test environment
+$ rails db -e test
+```
+
+Please note that only the `-e` flag is supported at this time. Other flags such as `--database` are not supported.
+
+## ✅ - Database Migrations
+
+This gem provides support for using Sequel's migration system. Migrations are stored in the `db/migrate` directory and can be executed via the `rails db:migrate` command.
+
+More information about Sequel's migration system can be found in the [Sequel documentation](https://sequel.jeremyevans.net/rdoc/files/doc/migration_rdoc.html).
+
+## 🚧 - Migration Generators
+
+Rails supports the generation of migrations via the `rails generate migration` command. This gem does not currently support this feature, but pull requests are welcome.
+
+## ✅ - Database Rake Tasks
+
+This gem provides a set of rake tasks that are similar to the ActiveRecord tasks. These tasks can be used to create, drop, migrate, and seed your database.
+
+| Task                      | Description                                                                                                                                                |
+| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `rails db:create`         | Creates the database from `DATABASE_URL` or `config/database.yml` for the current `RAILS_ENV` (use `db:create:all` to create all databases in the config). |
+| `rails db:drop`           | Drops the database from `DATABASE_URL` or `config/database.yml` for the current `RAILS_ENV` (use `db:drop:all` to drop all databases in the config).       |
+| `rails db:migrate`        | Runs database migrations                                                                                                                                   |
+| `rails db:migrate:redo`   | Rolls back the last migration and re-runs it                                                                                                               |
+| `rails db:migrate:status` | Displays the status of the database migrations                                                                                                             |
+| `rails db:prepare`        | Runs `db:setup` if the database does not exist or `db:migrate` if it does                                                                                  |
+| `rails db:reset`          | Runs `db:drop`, `db:setup`                                                                                                                                 |
+| `rails db:rollback`       | Rolls back the last migration                                                                                                                              |
+| `rails db:setup`          | Runs the `db:create`, `db:migrate`, `db:seed` tasks                                                                                                        |
+
+## ✅ - Minitest Helpers
+
+### `assert_num_queries`
+
+This helper can be used to assert that a specific number of database queries are executed within the given block of code.
+
+Example:
+
+```ruby
+# asserts that exactly 2 queries are executed
+assert_num_queries(2) do
+  u = User[id: 1234]
+  u.update(name: "Random User")
+end
+
+# asserts that 0 queries are executed
+assert_num_queries(0) do
+  some_hopefully_cached_method
+end
+
+# asserts that 1 to 3 queries are executed
+assert_num_queries(1..3) do
+  u = User.find_or_create(name: "Random User")
+end
+
+# asserts that at least 3 queries are executed
+assert_num_queries(3..) do
+  stuff_here
+end
+
+# asserts that no more than 2 queries are executed
+assert_num_queries(..2) do
+  other_stuff_here
+end
+```
+
+### `assert_no_queries`
+
+This helper can be used to assert that no database queries are executed within the given block of code.
+
+Example:
+
+```ruby
+# asserts that no queries are executed
+assert_no_queries do
+  some_hopefully_cached_method
+end
+```
+
+# Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/kenaniah/sequelize-rails.
 
-## License
+This repository contains a handful of commands that can be used to facilitate this gem's development. These are:
+
+| Command                    | Description                                                                              |
+| -------------------------- | ---------------------------------------------------------------------------------------- |
+| `bin/setup`                | Installs the gem's development dependencies                                              |
+| `bin/test`                 | Runs the test suite for each supported Rails version                                     |
+| `bin/console`              | Starts an interactive console within the gem's test Rails app (located in `test/dummy/`) |
+| `bundle exec rake release` | Creates a new release of the gem (version number should be bumped first)                 |
+
+# License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
-## Roadmap
-
- - [x] Support database.yml file
- - [x] Support `rails db` console command
- - [ ] Support `rails console --sandbox` (auto rollback all transactions)
- - [ ] Support logging
- - [ ] Support db rake tasks
- - [ ] Support multiple databases
- - [ ] Support reloading (disconnect all connections)
- - [ ] Support ActiveRecord plugins / conventions (shims)
- - [ ] Support PostgreSQL custom format for dump & restore
- - [ ] Support generators (including orm)
- - [ ] Support migration generator (and parsed attributes)
+# Roadmap
+
+- [ ] Support `rails console --sandbox` (auto rollback all transactions)
+- [ ] Support logging
+- [ ] Support db rake tasks
+- [ ] Support reloading (disconnect all connections)
+- [ ] Support ActiveRecord plugins / conventions (shims)
+- [ ] Support PostgreSQL custom format for dump & restore
+- [ ] Support generators (including orm)
+- [ ] Support migration generator (and parsed attributes)

data/lib/sequel/rails/generators/application_record/application_record_generator.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sequel
+  module Rails
+    module Generators
+      class ApplicationRecordGenerator < ::Rails::Generators::Base
+        source_root File.expand_path("templates", __dir__)
+
+        def create_application_record
+          template "application_record.rb", application_record_file_name
+        end
+
+        private
+
+        def application_record_file_name
+          @application_record_file_name ||=
+            if namespaced?
+              "app/models/#{namespaced_path}/application_record.rb"
+            else
+              "app/models/application_record.rb"
+            end
+        end
+      end
+    end
+  end
+end

data/lib/sequel/rails/generators/migration/migration_generator.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Sequel
+  module Rails
+    module Generators
+      class MigrationGenerator < ::Rails::Generators::NamedBase
+        include ::Rails::Generators::Migration
+
+        source_root File.expand_path("templates", __dir__)
+
+        argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+
+        def self.next_migration_number _dirname
+          Time.now.strftime "%Y%m%d%H%M%S"
+        end
+
+        def create_migration_file
+          migration_template "migration.rb.erb", "db/migrate/#{file_name}.rb"
+        end
+      end
+    end
+  end
+end

data/lib/sequel/rails/generators/model/model_generator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Sequel
+  module Rails
+    module Generators
+      class ModelGenerator < ::Rails::Generators::NamedBase
+        source_root File.expand_path("templates", __dir__)
+      end
+    end
+  end
+end

data/lib/sequel/rails/minitest.rb

@@ -0,0 +1,24 @@
+module Minitest
+  module Assertions
+    def assert_num_queries(num, &block)
+      before = ::Sequel::Rails::Railties::LogSubscriber.count
+      res = yield
+      after = ::Sequel::Rails::Railties::LogSubscriber.count
+
+      case num
+      when Range
+        assert num.include?(after - before), "The number of database queries did not match expectations...\nExpected: #{num} (range)\n  Actual: #{after - before}"
+      when Integer
+        assert num == after - before, "The number of database queries did not match expectations...\nExpected: #{num}\n  Actual: #{after - before}"
+      else
+        raise ArgumentError, "Invalid argument passed to assert_num_queries: expected a Range or Integer value, but received #{num.inspect} instead."
+      end
+
+      res
+    end
+
+    def assert_no_queries(&block)
+      assert_num_queries(0, &block)
+    end
+  end
+end