From ccd13457d02b2a1d19d43f915315825563061209 Mon Sep 17 00:00:00 2001
From: Andrew White <andrew.white@unboxed.co>
Date: Mon, 9 Apr 2018 22:22:16 +0100
Subject: [PATCH] Allow Active Record 5.2 to be used

Also bump the Ruby versions tested against.
---
 .travis.yml                       | 83 +++++++++++++++++--------------
 delayed_job_active_record.gemspec |  2 +-
 gemfiles/mysql2/5-2.gemfile       | 21 ++++++++
 gemfiles/postgresql/5-2.gemfile   | 21 ++++++++
 gemfiles/sqlite3/5-2.gemfile      | 21 ++++++++
 5 files changed, 109 insertions(+), 39 deletions(-)
 create mode 100644 gemfiles/mysql2/5-2.gemfile
 create mode 100644 gemfiles/postgresql/5-2.gemfile
 create mode 100644 gemfiles/sqlite3/5-2.gemfile

diff --git a/.travis.yml b/.travis.yml
index 43331b10..6934a736 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,16 +15,19 @@ gemfile: # Supported
   - gemfiles/mysql2/4-2.gemfile
   - gemfiles/mysql2/5-0.gemfile
   - gemfiles/mysql2/5-1.gemfile
+  - gemfiles/mysql2/5-2.gemfile
   - gemfiles/postgresql/4-2.gemfile
   - gemfiles/postgresql/5-0.gemfile
   - gemfiles/postgresql/5-1.gemfile
+  - gemfiles/postgresql/5-2.gemfile
   - gemfiles/sqlite3/4-2.gemfile
   - gemfiles/sqlite3/5-0.gemfile
   - gemfiles/sqlite3/5-1.gemfile
+  - gemfiles/sqlite3/5-2.gemfile
 rvm: # Supported
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
   - jruby-9.1.8.0
 
 jdk: oraclejdk8
@@ -42,82 +45,86 @@ matrix:
     # https://github.com/jruby/activerecord-jdbc-adapter/issues/700
     - rvm: jruby-9.1.8.0
       gemfile: gemfiles/mysql2/5-1.gemfile
+    - rvm: jruby-9.1.8.0
+      gemfile: gemfiles/mysql2/5-2.gemfile
     - rvm: jruby-9.1.8.0
       gemfile: gemfiles/postgresql/5-1.gemfile
+    - rvm: jruby-9.1.8.0
+      gemfile: gemfiles/postgresql/5-2.gemfile
 
   include:
     #
     # Rubocop
     #
-    - rvm: 2.5.0
+    - rvm: 2.5.1
       gemfile: Gemfile
       env:
         - COMMAND=rubocop
     #
     # The future
     #
-    # MRI 2.5.0
-    - rvm: 2.5.0
-      gemfile: gemfiles/mysql2/5-1.gemfile
-    - rvm: 2.5.0
-      gemfile: gemfiles/postgresql/5-1.gemfile
-    - rvm: 2.5.0
-      gemfile: gemfiles/sqlite3/5-1.gemfile
+    # MRI 2.5.1
+    - rvm: 2.5.1
+      gemfile: gemfiles/mysql2/5-2.gemfile
+    - rvm: 2.5.1
+      gemfile: gemfiles/postgresql/5-2.gemfile
+    - rvm: 2.5.1
+      gemfile: gemfiles/sqlite3/5-2.gemfile
     # Active Record head
-    - gemfile: gemfiles/mysql2/master.gemfile
-      rvm: 2.4.3
-    - gemfile: gemfiles/postgresql/master.gemfile
-      rvm: 2.4.3
-    - gemfile: gemfiles/sqlite3/master.gemfile
-      rvm: 2.4.3
+    - rvm: 2.5.1
+      gemfile: gemfiles/mysql2/master.gemfile
+    - rvm: 2.5.1
+      gemfile: gemfiles/postgresql/master.gemfile
+    - rvm: 2.5.1
+      gemfile: gemfiles/sqlite3/master.gemfile
     # MRI Ruby head
     - rvm: ruby-head
-      gemfile: gemfiles/mysql2/5-1.gemfile
+      gemfile: gemfiles/mysql2/5-2.gemfile
     - rvm: ruby-head
-      gemfile: gemfiles/postgresql/5-1.gemfile
+      gemfile: gemfiles/postgresql/5-2.gemfile
     - rvm: ruby-head
-      gemfile: gemfiles/sqlite3/5-1.gemfile
+      gemfile: gemfiles/sqlite3/5-2.gemfile
     # JRuby head
     - rvm: jruby-head
-      gemfile: gemfiles/mysql2/5-1.gemfile
+      gemfile: gemfiles/mysql2/5-2.gemfile
     - rvm: jruby-head
-      gemfile: gemfiles/postgresql/5-1.gemfile
+      gemfile: gemfiles/postgresql/5-2.gemfile
     - rvm: jruby-head
-      gemfile: gemfiles/sqlite3/5-1.gemfile
+      gemfile: gemfiles/sqlite3/5-2.gemfile
     #
     # The past
     #
     # EOL Active Record
     - gemfile: gemfiles/mysql2/3-0.gemfile
-      rvm: 2.2.9
+      rvm: 2.2.10
     - gemfile: gemfiles/mysql2/3-1.gemfile
-      rvm: 2.2.9
+      rvm: 2.2.10
     - gemfile: gemfiles/mysql2/3-2.gemfile
-      rvm: 2.2.9
+      rvm: 2.2.10
     - gemfile: gemfiles/mysql2/4-0.gemfile
-      rvm: 2.3.6
+      rvm: 2.3.7
     - gemfile: gemfiles/mysql2/4-1.gemfile
-      rvm: 2.3.6
+      rvm: 2.3.7
     - gemfile: gemfiles/postgresql/3-0.gemfile
-      rvm: 2.2.9
+      rvm: 2.2.10
     - gemfile: gemfiles/postgresql/3-1.gemfile
-      rvm: 2.2.9
+      rvm: 2.2.10
     - gemfile: gemfiles/postgresql/3-2.gemfile
-      rvm: 2.2.9
+      rvm: 2.2.10
     - gemfile: gemfiles/postgresql/4-0.gemfile
-      rvm: 2.3.6
+      rvm: 2.3.7
     - gemfile: gemfiles/postgresql/4-1.gemfile
-      rvm: 2.3.6
+      rvm: 2.3.7
     - gemfile: gemfiles/sqlite3/3-0.gemfile
-      rvm: 2.2.9
+      rvm: 2.2.10
     - gemfile: gemfiles/sqlite3/3-1.gemfile
-      rvm: 2.2.9
+      rvm: 2.2.10
     - gemfile: gemfiles/sqlite3/3-2.gemfile
-      rvm: 2.2.9
+      rvm: 2.2.10
     - gemfile: gemfiles/sqlite3/4-0.gemfile
-      rvm: 2.3.6
+      rvm: 2.3.7
     - gemfile: gemfiles/sqlite3/4-1.gemfile
-      rvm: 2.3.6
+      rvm: 2.3.7
     #
     # The parallel dimension
     #
diff --git a/delayed_job_active_record.gemspec b/delayed_job_active_record.gemspec
index 4e3ed6d1..05d178e7 100644
--- a/delayed_job_active_record.gemspec
+++ b/delayed_job_active_record.gemspec
@@ -1,5 +1,5 @@
 Gem::Specification.new do |spec|
-  spec.add_dependency "activerecord", [">= 3.0", "< 5.2"]
+  spec.add_dependency "activerecord", [">= 3.0", "< 6.0"]
   spec.add_dependency "delayed_job",  [">= 3.0", "< 5"]
   spec.authors        = ["Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
   spec.description    = "ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke"
diff --git a/gemfiles/mysql2/5-2.gemfile b/gemfiles/mysql2/5-2.gemfile
new file mode 100644
index 00000000..e3161f4c
--- /dev/null
+++ b/gemfiles/mysql2/5-2.gemfile
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+
+group :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcmysql-adapter'
+  end
+
+  platforms :ruby, :mswin, :mingw do
+    gem 'mysql2'
+  end
+
+  gem 'coveralls', :require => false
+  gem 'rspec', '>= 2.11'
+  gem 'simplecov', :require => false
+
+  gem 'activerecord', "~> 5.2.0"
+end
+
+gemspec :path => "../../"
diff --git a/gemfiles/postgresql/5-2.gemfile b/gemfiles/postgresql/5-2.gemfile
new file mode 100644
index 00000000..c396113e
--- /dev/null
+++ b/gemfiles/postgresql/5-2.gemfile
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+
+group :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcpostgresql-adapter'
+  end
+
+  platforms :ruby, :mswin, :mingw do
+    gem 'pg', "~> 0.18"
+  end
+
+  gem 'coveralls', :require => false
+  gem 'rspec', '>= 2.11'
+  gem 'simplecov', :require => false
+
+  gem 'activerecord', "~> 5.2.0"
+end
+
+gemspec :path => "../../"
diff --git a/gemfiles/sqlite3/5-2.gemfile b/gemfiles/sqlite3/5-2.gemfile
new file mode 100644
index 00000000..6b42d469
--- /dev/null
+++ b/gemfiles/sqlite3/5-2.gemfile
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+
+group :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
+
+  platforms :ruby, :mswin, :mingw do
+    gem 'sqlite3'
+  end
+
+  gem 'coveralls', :require => false
+  gem 'rspec', '>= 2.11'
+  gem 'simplecov', :require => false
+
+  gem 'activerecord', "~> 5.2.0"
+end
+
+gemspec :path => "../../"