From 02aa30274e92d24d031842d9ee4a188ddd40ab04 Mon Sep 17 00:00:00 2001
From: Jared Beck <jared@jaredbeck.com>
Date: Fri, 10 May 2019 13:49:08 -0400
Subject: [PATCH] activerecord 6.0.0.rc1 requires sqlite3 ~> 1.4

This changed between 6.0.0.beta3 and 6.0.0.rc1,
in 0908184e4c2.
---
 Appraisals              | 15 +++++++++++----
 gemfiles/ar_6.0.gemfile |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Appraisals b/Appraisals
index 276a227a..9ac0a7fc 100644
--- a/Appraisals
+++ b/Appraisals
@@ -10,7 +10,8 @@
 # > https://github.com/thoughtbot/appraisal
 
 appraise "ar-4.2" do
-  gem "activerecord", [">= 4.2.11.1", "< 4.3"] # CVE-2019-5420
+  # >= 4.2.11.1 because CVE-2019-5420
+  gem "activerecord", [">= 4.2.11.1", "< 4.3"]
   gem "database_cleaner", "~> 1.6"
 
   # not compatible with mysql2 0.5
@@ -22,16 +23,22 @@ appraise "ar-4.2" do
 end
 
 appraise "ar-5.1" do
-  gem "activerecord", [">= 5.1.6.2", "< 5.2"] # CVE-2019-5420
+  # >= 5.1.6.2 because CVE-2019-5420
+  gem "activerecord", [">= 5.1.6.2", "< 5.2"]
   gem "rails-controller-testing", "~> 1.0.2"
 end
 
 appraise "ar-5.2" do
-  gem "activerecord", [">= 5.2.2.1", "< 5.3"] # CVE-2019-5420
+  # >= 5.2.2.1 because CVE-2019-5420
+  gem "activerecord", [">= 5.2.2.1", "< 5.3"]
   gem "rails-controller-testing", "~> 1.0.2"
 end
 
 appraise "ar-6.0" do
-  gem "activerecord", [">= 6.0.0.beta3", "< 6.1"] # CVE-2019-5420
+  # >= 6.0.0.beta3 because CVE-2019-5420
+  gem "activerecord", [">= 6.0.0.beta3", "< 6.1"]
   gem "rails-controller-testing", "~> 1.0.3"
+
+  # Must match `gem` call in active_record/connection_adapters/sqlite3_adapter.rb
+  gem "sqlite3", "~> 1.4"
 end
diff --git a/gemfiles/ar_6.0.gemfile b/gemfiles/ar_6.0.gemfile
index 63bb6cb2..d06b90a3 100644
--- a/gemfiles/ar_6.0.gemfile
+++ b/gemfiles/ar_6.0.gemfile
@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord", [">= 6.0.0.beta3", "< 6.1"]
 gem "rails-controller-testing", "~> 1.0.3"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"