From 00a6f89b36f7a7de5e02db8c3a49a22e735d3203 Mon Sep 17 00:00:00 2001
From: Keenan Brock <keenan@thebrocks.net>
Date: Fri, 13 Sep 2019 16:33:35 -0400
Subject: [PATCH] Get Travis tests passing (#352)

* peg sqlite3 gems

* drop ruby 2.2 and 2.3

* tell travis to run mysql and postgres

sure, we're running both for both all 3 runs
so not perfectly optimal, but greatly simplifies the implementation

* reduce the build matrix

no reason to run so many ruby versions

* add tests for 6.0
---
 .travis.yml                       | 21 ++++++++++++---------
 Appraisals                        | 21 ++++++++++++++++++---
 gemfiles/activerecord_4.2.gemfile |  2 +-
 gemfiles/activerecord_5.0.gemfile |  2 +-
 gemfiles/activerecord_5.1.gemfile |  2 +-
 gemfiles/activerecord_6.0.gemfile | 19 +++++++++++++++++++
 6 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 gemfiles/activerecord_6.0.gemfile

diff --git a/.travis.yml b/.travis.yml
index 5b78e3e8..63f8aa98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,11 @@ cache: bundler
 sudo: false
 language: ruby
 rvm:
-  - 2.6.0
-  - 2.5.1
-  - 2.4.4
-  - 2.3.6
-  - 2.2.10
+  - 2.6.3
+  - 2.5.5
 
 gemfile:
+  - gemfiles/activerecord_6.0.gemfile
   - gemfiles/activerecord_5.2.gemfile
   - gemfiles/activerecord_5.1.gemfile
   - gemfiles/activerecord_5.0.gemfile
@@ -20,11 +18,16 @@ env:
   - DB=mysql
   - DB=postgresql
 
+services:
+  - mysql
+  - postgresql
+
 script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:all
 
 matrix:
   allow_failures:
-    - gemfile: gemfiles/activerecord_edge.gemfile
-    - rvm: jruby-head
-    - rvm: rbx
-    - rvm: 2.6.0
+  - gemfile: gemfiles/activerecord_edge.gemfile
+  - gemfile: gemfiles/activerecord_6.0.gemfile
+  exclude:
+  - rvm: 2.5.5
+    gemfile: gemfiles/activerecord_edge.gemfile
diff --git a/Appraisals b/Appraisals
index 0b783fac..bbb038a0 100644
--- a/Appraisals
+++ b/Appraisals
@@ -4,7 +4,7 @@ appraise 'activerecord-4.2' do
   platforms :ruby do
     gem 'mysql2', "< 0.5"
     gem 'pg', "~> 0.21"
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.3.13'
   end
 
   platforms :jruby do
@@ -19,7 +19,7 @@ appraise 'activerecord-5.0' do
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.3.13'
   end
 
   platforms :jruby do
@@ -34,7 +34,7 @@ appraise 'activerecord-5.1' do
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.3.13'
   end
 
   platforms :jruby do
@@ -59,6 +59,21 @@ appraise 'activerecord-5.2' do
   end
 end
 
+appraise 'activerecord-6.0' do
+  gem 'activerecord', '~> 6.0.0'
+  platforms :ruby do
+    gem 'mysql2'
+    gem 'pg'
+    gem 'sqlite3'
+  end
+
+  platforms :jruby do
+    gem 'activerecord-jdbcmysql-adapter'
+    gem 'activerecord-jdbcpostgresql-adapter'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
+end
+
 appraise 'activerecord-edge' do
   gem 'activerecord', github: 'rails/rails'
   platforms :ruby do
diff --git a/gemfiles/activerecord_4.2.gemfile b/gemfiles/activerecord_4.2.gemfile
index ba3a7fd9..c34356de 100644
--- a/gemfiles/activerecord_4.2.gemfile
+++ b/gemfiles/activerecord_4.2.gemfile
@@ -7,7 +7,7 @@ gem "activerecord", "~> 4.2.0"
 platforms :ruby do
   gem "mysql2", "< 0.5"
   gem "pg", "~> 0.21"
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.13"
 end
 
 platforms :jruby do
diff --git a/gemfiles/activerecord_5.0.gemfile b/gemfiles/activerecord_5.0.gemfile
index 933e74d7..da91aa40 100644
--- a/gemfiles/activerecord_5.0.gemfile
+++ b/gemfiles/activerecord_5.0.gemfile
@@ -7,7 +7,7 @@ gem "activerecord", "~> 5.0.0"
 platforms :ruby do
   gem "mysql2"
   gem "pg"
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.13"
 end
 
 platforms :jruby do
diff --git a/gemfiles/activerecord_5.1.gemfile b/gemfiles/activerecord_5.1.gemfile
index cbe5aea1..0b981bb6 100644
--- a/gemfiles/activerecord_5.1.gemfile
+++ b/gemfiles/activerecord_5.1.gemfile
@@ -7,7 +7,7 @@ gem "activerecord", "~> 5.1.0"
 platforms :ruby do
   gem "mysql2"
   gem "pg"
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.13"
 end
 
 platforms :jruby do
diff --git a/gemfiles/activerecord_6.0.gemfile b/gemfiles/activerecord_6.0.gemfile
new file mode 100644
index 00000000..0e0233e6
--- /dev/null
+++ b/gemfiles/activerecord_6.0.gemfile
@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+
+platforms :ruby do
+  gem "mysql2"
+  gem "pg"
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcpostgresql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+gemspec path: "../"