From c43cbe190a745c997ba808d3f81c24141123db75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Bu=C5=82at?= <bartek.bulat@gmail.com>
Date: Fri, 27 Jul 2018 15:15:53 +0200
Subject: [PATCH] Adjust adapter gem versions to required versions in Rails

It was impossible to run tests on Travis CI due too lose requirements
on gem versions. Bundler was loading version too new for specific
Rails version.
---
 Appraisals                         | 23 +++++++++++++++++------
 Gemfile                            |  2 --
 gemfiles/activerecord_3.2.gemfile  | 10 +++++-----
 gemfiles/activerecord_4.0.gemfile  | 10 +++++-----
 gemfiles/activerecord_4.2.gemfile  | 10 +++++-----
 gemfiles/activerecord_5.0.gemfile  |  6 +++---
 gemfiles/activerecord_5.1.gemfile  |  4 ++--
 gemfiles/activerecord_edge.gemfile | 10 +++++-----
 8 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/Appraisals b/Appraisals
index 2a17237..591a977 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,28 +1,39 @@
 appraise "activerecord-3.2" do
   gem "activerecord", "~> 3.2.0"
-  gem "mysql", "~> 2.9.1"
-  gem "mysql2", "~> 0.3.11"
+  gem "mysql", "~> 2.8"
+  gem "mysql2", "~> 0.3.10"
+  gem 'pg', '~> 0.11'
+  gem "sqlite3", "~> 1.3.5"
 end
 
 appraise "activerecord-4.0" do
   gem "activerecord", "~> 4.0.0"
-  gem "mysql", "~> 2.9.1"
-  gem "mysql2", "~> 0.3.11"
+  gem "mysql", "~> 2.8"
+  gem "mysql2", "~> 0.3.10"
+  gem 'pg', '~> 0.11'
+  gem "sqlite3", "~> 1.3.6"
+
 end
 
 appraise "activerecord-4.2" do
   gem "activerecord", "~> 4.2.0"
-  gem "mysql", "~> 2.9.1"
-  gem "mysql2", "~> 0.3.11"
+  gem 'mysql', '~> 2.9'
+  gem 'mysql2', '>= 0.3.13', '< 0.5'
+  gem 'pg', '~> 0.15'
+  gem "sqlite3", "~> 1.3.6"
 end
 
 appraise "activerecord-5.0" do
   gem "activerecord", "~> 5.0.0"
   gem "mysql2", "~> 0.4.4"
+  gem "pg", ">= 0.18", "< 2.0"
+  gem "sqlite3", "~> 1.3.6"
 end
 
 appraise "activerecord-edge" do
   gem "arel", github: "rails/arel"
   gem "activerecord", github: "rails/rails"
   gem "mysql2", "~> 0.3.11"
+  gem "pg", ">= 0.18", "< 2.0"
+  gem "sqlite3", "~> 1.3.6"
 end
diff --git a/Gemfile b/Gemfile
index 2ec5bc0..fe3d015 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,6 +10,4 @@ end
 group :test do
   gem 'rake', '~> 10.0'
   gem 'rspec', '~> 2.14.0'
-  gem 'pg', '>= 0.15.1'
-  gem 'sqlite3', '>= 1.3.7'
 end
diff --git a/gemfiles/activerecord_3.2.gemfile b/gemfiles/activerecord_3.2.gemfile
index 68dfdc7..6ccf6c0 100644
--- a/gemfiles/activerecord_3.2.gemfile
+++ b/gemfiles/activerecord_3.2.gemfile
@@ -3,8 +3,10 @@
 source "http://rubygems.org"
 
 gem "activerecord", "~> 3.2.0"
-gem "mysql", "~> 2.9.1"
-gem "mysql2", "~> 0.3.11"
+gem "mysql", "~> 2.8"
+gem "mysql2", "~> 0.3.10"
+gem "pg", "~> 0.11"
+gem "sqlite3", "~> 1.3.5"
 
 group :development do
   gem "appraisal"
@@ -14,8 +16,6 @@ end
 group :test do
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.14.0"
-  gem "pg", ">= 0.15.1"
-  gem "sqlite3", ">= 1.3.7"
 end
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/activerecord_4.0.gemfile b/gemfiles/activerecord_4.0.gemfile
index e31e047..14ebda4 100644
--- a/gemfiles/activerecord_4.0.gemfile
+++ b/gemfiles/activerecord_4.0.gemfile
@@ -3,8 +3,10 @@
 source "http://rubygems.org"
 
 gem "activerecord", "~> 4.0.0"
-gem "mysql", "~> 2.9.1"
-gem "mysql2", "~> 0.3.11"
+gem "mysql", "~> 2.8"
+gem "mysql2", "~> 0.3.10"
+gem "pg", "~> 0.11"
+gem "sqlite3", "~> 1.3.6"
 
 group :development do
   gem "appraisal"
@@ -14,8 +16,6 @@ end
 group :test do
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.14.0"
-  gem "pg", ">= 0.15.1"
-  gem "sqlite3", ">= 1.3.7"
 end
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/activerecord_4.2.gemfile b/gemfiles/activerecord_4.2.gemfile
index 21fef6e..2eda5f6 100644
--- a/gemfiles/activerecord_4.2.gemfile
+++ b/gemfiles/activerecord_4.2.gemfile
@@ -3,8 +3,10 @@
 source "http://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
-gem "mysql", "~> 2.9.1"
-gem "mysql2", "~> 0.3.11"
+gem "mysql", "~> 2.9"
+gem "mysql2", ">= 0.3.13", "< 0.5"
+gem "pg", "~> 0.15"
+gem "sqlite3", "~> 1.3.6"
 
 group :development do
   gem "appraisal"
@@ -14,8 +16,6 @@ end
 group :test do
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.14.0"
-  gem "pg", ">= 0.15.1"
-  gem "sqlite3", ">= 1.3.7"
 end
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/activerecord_5.0.gemfile b/gemfiles/activerecord_5.0.gemfile
index 2993144..1b19dfd 100644
--- a/gemfiles/activerecord_5.0.gemfile
+++ b/gemfiles/activerecord_5.0.gemfile
@@ -4,6 +4,8 @@ source "http://rubygems.org"
 
 gem "activerecord", "~> 5.0.0"
 gem "mysql2", "~> 0.4.4"
+gem "pg", ">= 0.18", "< 2.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :development do
   gem "appraisal"
@@ -13,8 +15,6 @@ end
 group :test do
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.14.0"
-  gem "pg", ">= 0.15.1"
-  gem "sqlite3", ">= 1.3.7"
 end
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/activerecord_5.1.gemfile b/gemfiles/activerecord_5.1.gemfile
index e1464b2..6b8977d 100644
--- a/gemfiles/activerecord_5.1.gemfile
+++ b/gemfiles/activerecord_5.1.gemfile
@@ -13,8 +13,8 @@ end
 group :test do
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.14.0"
-  gem "pg", ">= 0.15.1"
-  gem "sqlite3", ">= 1.3.7"
+  gem "pg", ">= 0.18", "< 2.0"
+  gem "sqlite3", "~> 1.3.6"
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/activerecord_edge.gemfile b/gemfiles/activerecord_edge.gemfile
index 5dea8e4..7f97cd4 100644
--- a/gemfiles/activerecord_edge.gemfile
+++ b/gemfiles/activerecord_edge.gemfile
@@ -2,9 +2,11 @@
 
 source "http://rubygems.org"
 
-gem "arel", :github => "rails/arel"
-gem "activerecord", :github => "rails/rails"
+gem "arel", github: "rails/arel"
+gem "activerecord", github: "rails/rails"
 gem "mysql2", "~> 0.3.11"
+gem "pg", ">= 0.18", "< 2.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :development do
   gem "appraisal"
@@ -14,8 +16,6 @@ end
 group :test do
   gem "rake", "~> 10.0"
   gem "rspec", "~> 2.14.0"
-  gem "pg", ">= 0.15.1"
-  gem "sqlite3", ">= 1.3.7"
 end
 
-gemspec :path => "../"
+gemspec path: "../"