diff --git a/.rubocop.yml b/.rubocop.yml
index e0c29084..48e569cc 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -93,9 +93,6 @@ Style/Semicolon:
 Style/SingleLineBlockParams:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
-  Enabled: false
-
 Style/WordArray:
   Enabled: false
 
diff --git a/gemfiles/mysql2/3-0.gemfile b/gemfiles/mysql2/3-0.gemfile
index cfb19837..836d9985 100644
--- a/gemfiles/mysql2/3-0.gemfile
+++ b/gemfiles/mysql2/3-0.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'activerecord-mysql2-adapter'
+  gem "activerecord-mysql2-adapter"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 3.0.0"
+  gem "activerecord", "~> 3.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/3-1.gemfile b/gemfiles/mysql2/3-1.gemfile
index 69b939a6..5eb7ed81 100644
--- a/gemfiles/mysql2/3-1.gemfile
+++ b/gemfiles/mysql2/3-1.gemfile
@@ -1,14 +1,13 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
-gem 'mysql2', '~> 0.3.10'
+gem "mysql2", "~> 0.3.10"
 
-gem 'coveralls', :require => false
-gem 'rspec', '>= 2.11'
-gem 'simplecov', :require => false
+gem "coveralls", require: false
+gem "rspec", ">= 2.11"
+gem "simplecov", require: false
 
-gem 'activerecord', "~> 3.1.0"
+gem "activerecord", "~> 3.1.0"
 
-
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/3-2.gemfile b/gemfiles/mysql2/3-2.gemfile
index 588cea79..2fd7011f 100644
--- a/gemfiles/mysql2/3-2.gemfile
+++ b/gemfiles/mysql2/3-2.gemfile
@@ -1,13 +1,13 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
-gem 'mysql2', '~> 0.3.10'
+gem "mysql2", "~> 0.3.10"
 
-gem 'coveralls', :require => false
-gem 'rspec', '>= 2.11'
-gem 'simplecov', :require => false
+gem "coveralls", require: false
+gem "rspec", ">= 2.11"
+gem "simplecov", require: false
 
-gem 'activerecord', "~> 3.2.0"
+gem "activerecord", "~> 3.2.0"
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/4-0.gemfile b/gemfiles/mysql2/4-0.gemfile
index d862c5fc..a7720eb1 100644
--- a/gemfiles/mysql2/4-0.gemfile
+++ b/gemfiles/mysql2/4-0.gemfile
@@ -1,13 +1,13 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
-gem 'mysql2', '~> 0.3.10'
+gem "mysql2", "~> 0.3.10"
 
-gem 'coveralls', :require => false
-gem 'rspec', '>= 2.11'
-gem 'simplecov', :require => false
+gem "coveralls", require: false
+gem "rspec", ">= 2.11"
+gem "simplecov", require: false
 
-gem 'activerecord', "~> 4.0.0"
+gem "activerecord", "~> 4.0.0"
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/4-1.gemfile b/gemfiles/mysql2/4-1.gemfile
index 7ab5d3ed..6f204a0e 100644
--- a/gemfiles/mysql2/4-1.gemfile
+++ b/gemfiles/mysql2/4-1.gemfile
@@ -1,13 +1,13 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
-gem 'mysql2', '~> 0.3.13'
+gem "mysql2", "~> 0.3.13"
 
-gem 'coveralls', :require => false
-gem 'rspec', '>= 2.11'
-gem 'simplecov', :require => false
+gem "coveralls", require: false
+gem "rspec", ">= 2.11"
+gem "simplecov", require: false
 
-gem 'activerecord', "~> 4.1.0"
+gem "activerecord", "~> 4.1.0"
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/4-2.gemfile b/gemfiles/mysql2/4-2.gemfile
index 4e79750f..7e633d79 100644
--- a/gemfiles/mysql2/4-2.gemfile
+++ b/gemfiles/mysql2/4-2.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', '< 50.0'
+    gem "activerecord-jdbcmysql-adapter", "< 50.0"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'mysql2', '>= 0.3.13', '< 0.5'
+    gem "mysql2", ">= 0.3.13", "< 0.5"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 4.2.0"
+  gem "activerecord", "~> 4.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/5-0.gemfile b/gemfiles/mysql2/5-0.gemfile
index 935f581e..4c7d7d7d 100644
--- a/gemfiles/mysql2/5-0.gemfile
+++ b/gemfiles/mysql2/5-0.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
+    gem "activerecord-jdbcmysql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'mysql2'
+    gem "mysql2"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 5.0.0"
+  gem "activerecord", "~> 5.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/5-1.gemfile b/gemfiles/mysql2/5-1.gemfile
index a1c52315..249d3d2e 100644
--- a/gemfiles/mysql2/5-1.gemfile
+++ b/gemfiles/mysql2/5-1.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
+    gem "activerecord-jdbcmysql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'mysql2'
+    gem "mysql2"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 5.1.0"
+  gem "activerecord", "~> 5.1.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/5-2.gemfile b/gemfiles/mysql2/5-2.gemfile
index e3161f4c..ff77e119 100644
--- a/gemfiles/mysql2/5-2.gemfile
+++ b/gemfiles/mysql2/5-2.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
+    gem "activerecord-jdbcmysql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'mysql2'
+    gem "mysql2"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 5.2.0"
+  gem "activerecord", "~> 5.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/master.gemfile b/gemfiles/mysql2/master.gemfile
index af7553b5..65659451 100644
--- a/gemfiles/mysql2/master.gemfile
+++ b/gemfiles/mysql2/master.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
+    gem "activerecord-jdbcmysql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'mysql2'
+    gem "mysql2"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', github: 'rails'
+  gem "activerecord", github: "rails"
 end
 
-gemspec :path => '../../'
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/3-0.gemfile b/gemfiles/postgresql/3-0.gemfile
index 8a554d2a..b46ce039 100644
--- a/gemfiles/postgresql/3-0.gemfile
+++ b/gemfiles/postgresql/3-0.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'pg', "~> 0.18"
+  gem "pg", "~> 0.18"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 3.0.0"
+  gem "activerecord", "~> 3.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/3-1.gemfile b/gemfiles/postgresql/3-1.gemfile
index 6f1b2642..4fb54b95 100644
--- a/gemfiles/postgresql/3-1.gemfile
+++ b/gemfiles/postgresql/3-1.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'pg', "~> 0.18"
+  gem "pg", "~> 0.18"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 3.1.0"
+  gem "activerecord", "~> 3.1.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/3-2.gemfile b/gemfiles/postgresql/3-2.gemfile
index 05a49ca8..e6ce602e 100644
--- a/gemfiles/postgresql/3-2.gemfile
+++ b/gemfiles/postgresql/3-2.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'pg', "~> 0.18"
+  gem "pg", "~> 0.18"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 3.2.0"
+  gem "activerecord", "~> 3.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/4-0.gemfile b/gemfiles/postgresql/4-0.gemfile
index 04e11bb9..31fba425 100644
--- a/gemfiles/postgresql/4-0.gemfile
+++ b/gemfiles/postgresql/4-0.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'pg', "~> 0.18"
+  gem "pg", "~> 0.18"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 4.0.0"
+  gem "activerecord", "~> 4.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/4-1.gemfile b/gemfiles/postgresql/4-1.gemfile
index 17edd17d..278501c1 100644
--- a/gemfiles/postgresql/4-1.gemfile
+++ b/gemfiles/postgresql/4-1.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'pg', "~> 0.18"
+  gem "pg", "~> 0.18"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 4.1.0"
+  gem "activerecord", "~> 4.1.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/4-2.gemfile b/gemfiles/postgresql/4-2.gemfile
index 80034acc..047833e4 100644
--- a/gemfiles/postgresql/4-2.gemfile
+++ b/gemfiles/postgresql/4-2.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcpostgresql-adapter', '< 50.0'
+    gem "activerecord-jdbcpostgresql-adapter", "< 50.0"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'pg', "~> 0.18"
+    gem "pg", "~> 0.18"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 4.2.0"
+  gem "activerecord", "~> 4.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/5-0.gemfile b/gemfiles/postgresql/5-0.gemfile
index cffcf024..3c71ef69 100644
--- a/gemfiles/postgresql/5-0.gemfile
+++ b/gemfiles/postgresql/5-0.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcpostgresql-adapter'
+    gem "activerecord-jdbcpostgresql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'pg', "~> 0.18"
+    gem "pg", "~> 0.18"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 5.0.0"
+  gem "activerecord", "~> 5.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/5-1.gemfile b/gemfiles/postgresql/5-1.gemfile
index a576221d..34e0c203 100644
--- a/gemfiles/postgresql/5-1.gemfile
+++ b/gemfiles/postgresql/5-1.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcpostgresql-adapter'
+    gem "activerecord-jdbcpostgresql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'pg', "~> 0.18"
+    gem "pg", "~> 0.18"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 5.1.0"
+  gem "activerecord", "~> 5.1.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/5-2.gemfile b/gemfiles/postgresql/5-2.gemfile
index c396113e..e95902c7 100644
--- a/gemfiles/postgresql/5-2.gemfile
+++ b/gemfiles/postgresql/5-2.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcpostgresql-adapter'
+    gem "activerecord-jdbcpostgresql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'pg', "~> 0.18"
+    gem "pg", "~> 0.18"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 5.2.0"
+  gem "activerecord", "~> 5.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/master.gemfile b/gemfiles/postgresql/master.gemfile
index 15e09860..7ac422ba 100644
--- a/gemfiles/postgresql/master.gemfile
+++ b/gemfiles/postgresql/master.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcpostgresql-adapter'
+    gem "activerecord-jdbcpostgresql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'pg', "~> 0.18"
+    gem "pg", "~> 0.18"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', github: 'rails'
+  gem "activerecord", github: "rails"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/3-0.gemfile b/gemfiles/sqlite3/3-0.gemfile
index 69ea8b24..71b10b4e 100644
--- a/gemfiles/sqlite3/3-0.gemfile
+++ b/gemfiles/sqlite3/3-0.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'sqlite3'
+  gem "sqlite3"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 3.0.0"
+  gem "activerecord", "~> 3.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/3-1.gemfile b/gemfiles/sqlite3/3-1.gemfile
index 96223244..0099efad 100644
--- a/gemfiles/sqlite3/3-1.gemfile
+++ b/gemfiles/sqlite3/3-1.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'sqlite3'
+  gem "sqlite3"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 3.1.0"
+  gem "activerecord", "~> 3.1.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/3-2.gemfile b/gemfiles/sqlite3/3-2.gemfile
index 6c3592b8..bb3394ea 100644
--- a/gemfiles/sqlite3/3-2.gemfile
+++ b/gemfiles/sqlite3/3-2.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'sqlite3'
+  gem "sqlite3"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 3.2.0"
+  gem "activerecord", "~> 3.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/4-0.gemfile b/gemfiles/sqlite3/4-0.gemfile
index 4402ee25..ba3e3327 100644
--- a/gemfiles/sqlite3/4-0.gemfile
+++ b/gemfiles/sqlite3/4-0.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'sqlite3'
+  gem "sqlite3"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 4.0.0"
+  gem "activerecord", "~> 4.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/4-1.gemfile b/gemfiles/sqlite3/4-1.gemfile
index be531ba5..94a01013 100644
--- a/gemfiles/sqlite3/4-1.gemfile
+++ b/gemfiles/sqlite3/4-1.gemfile
@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'sqlite3'
+  gem "sqlite3"
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 4.1.0"
+  gem "activerecord", "~> 4.1.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/4-2.gemfile b/gemfiles/sqlite3/4-2.gemfile
index 208944a5..a2ae2f44 100644
--- a/gemfiles/sqlite3/4-2.gemfile
+++ b/gemfiles/sqlite3/4-2.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '< 50.0'
+    gem "activerecord-jdbcsqlite3-adapter", "< 50.0"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'sqlite3'
+    gem "sqlite3"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 4.2.0"
+  gem "activerecord", "~> 4.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/5-0.gemfile b/gemfiles/sqlite3/5-0.gemfile
index 50375c24..bc6e076c 100644
--- a/gemfiles/sqlite3/5-0.gemfile
+++ b/gemfiles/sqlite3/5-0.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem "activerecord-jdbcsqlite3-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'sqlite3'
+    gem "sqlite3"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 5.0.0"
+  gem "activerecord", "~> 5.0.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/5-1.gemfile b/gemfiles/sqlite3/5-1.gemfile
index c9c33242..4c803830 100644
--- a/gemfiles/sqlite3/5-1.gemfile
+++ b/gemfiles/sqlite3/5-1.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem "activerecord-jdbcsqlite3-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'sqlite3'
+    gem "sqlite3"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 5.1.0"
+  gem "activerecord", "~> 5.1.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/5-2.gemfile b/gemfiles/sqlite3/5-2.gemfile
index 6b42d469..6dc5a0a0 100644
--- a/gemfiles/sqlite3/5-2.gemfile
+++ b/gemfiles/sqlite3/5-2.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem "activerecord-jdbcsqlite3-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'sqlite3'
+    gem "sqlite3"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', "~> 5.2.0"
+  gem "activerecord", "~> 5.2.0"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/master.gemfile b/gemfiles/sqlite3/master.gemfile
index 50c8d489..afd2bf9a 100644
--- a/gemfiles/sqlite3/master.gemfile
+++ b/gemfiles/sqlite3/master.gemfile
@@ -1,21 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem "activerecord-jdbcsqlite3-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'sqlite3'
+    gem "sqlite3"
   end
 
-  gem 'coveralls', :require => false
-  gem 'rspec', '>= 2.11'
-  gem 'simplecov', :require => false
+  gem "coveralls", require: false
+  gem "rspec", ">= 2.11"
+  gem "simplecov", require: false
 
-  gem 'activerecord', github: 'rails'
+  gem "activerecord", github: "rails"
 end
 
-gemspec :path => "../../"
+gemspec path: "../../"
diff --git a/spec/helper.rb b/spec/helper.rb
index 89aa6afa..80f3c280 100644
--- a/spec/helper.rb
+++ b/spec/helper.rb
@@ -31,7 +31,7 @@
 db_adapter ||= gemfile && gemfile[%r{gemfiles/(.*?)/}] && $1 # rubocop:disable PerlBackrefs
 db_adapter ||= "sqlite3"
 
-config = YAML.safe_load(File.read("spec/database.yml"))
+config = YAML.load(File.read("spec/database.yml"))
 ActiveRecord::Base.establish_connection config[db_adapter]
 ActiveRecord::Base.logger = Delayed::Worker.logger
 ActiveRecord::Migration.verbose = false
@@ -75,8 +75,8 @@ def tell
     text
   end
 
-  def whatever(n, _)
-    tell * n
+  def whatever(number)
+    tell * number
   end
   default_scope { where(scoped: true) }