Merge 3c50b4c into 2120025

.github/workflows/test.yml

@@ -23,17 +23,15 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - "2.7"
-          - "3.0"
-          - "3.1"
+          - "2.7.6"
+          - "3.0.4"
+          - "3.1.2"
         env:
           - MYSQL56=1
           - MYSQL57=1
           - MYSQL80=1
           - POSTGRESQL=1
         gemfile:
-          - gemfiles/activerecord_5.1.gemfile
-          - gemfiles/activerecord_5.2.gemfile
           - gemfiles/activerecord_6.0.gemfile
           - gemfiles/activerecord_6.1.gemfile
           - gemfiles/activerecord_7.0.gemfile

Appraisals

@@ -1,22 +1,13 @@
 # frozen_string_literal: true
 
-appraise 'activerecord-5.1' do
-  gem 'activerecord', '~> 5.1.0'
-end
-
-appraise 'activerecord-5.2' do
-  gem 'activerecord', '~> 5.2.0'
-  gem 'mysql2', '~> 0.4.4'
-end
-
 appraise 'activerecord-6.0' do
-  gem 'activerecord', '~> 6.0.0'
+  gem 'activerecord', '~> 6.0.6'
 end
 
 appraise 'activerecord-6.1' do
-  gem 'activerecord', '~> 6.1.0'
+  gem 'activerecord', '~> 6.1.7'
 end
 
 appraise 'activerecord-7.0' do
-  gem 'activerecord', '~> 7.0.0'
+  gem 'activerecord', '~> 7.0.4'
 end

docker-compose.yml

@@ -1,19 +1,19 @@
 version: "3.8"
 services:
   mysql:
-    image: "mysql:5.6"
+    image: "mysql:5.6.51"
     ports:
       - "13316:3306"
     environment:
       MYSQL_ROOT_PASSWORD: password
   mysql57:
-    image: "mysql:5.7"
+    image: "mysql:5.7.39"
     ports:
       - "13317:3306"
     environment:
       MYSQL_ROOT_PASSWORD: password
   mysql80:
-    image: "mysql:8.0"
+    image: "mysql:8.0.30"
     ports:
       - "13318:3306"
     environment:

gemfiles/activerecord_6.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.0"
+gem "activerecord", "~> 6.0.6"
 
 gemspec path: "../"

gemfiles/activerecord_6.1.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.1.0"
+gem "activerecord", "~> 6.1.7"
 
 gemspec path: "../"

gemfiles/activerecord_7.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.0.4"
 
 gemspec path: "../"

spec/mysql/_migrate/migrate_change_table_option_spec.rb

@@ -18,9 +18,9 @@
       erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade, <%= i cond(">= 6.1", { charset: "ascii" }, { options: "ENGINE=InnoDB DEFAULT CHARSET=ascii" }) %> do |t|
           t.date   "birth_date", null: false
-          t.string "first_name", limit: 14, null: false, <%= i cond('>= 5.2', collation: "utf8_general_ci") %>
-          t.string "last_name", limit: 16, null: false, <%= i cond('>= 5.2', collation: "utf8_general_ci") %>
-          t.string "gender", limit: 1, null: false, <%= i cond('>= 5.2', collation: "utf8_general_ci") %>
+          t.string "first_name", limit: 14, null: false, collation: "utf8_general_ci"
+          t.string "last_name", limit: 16, null: false, collation: "utf8_general_ci"
+          t.string "gender", limit: 1, null: false, collation: "utf8_general_ci"
           t.date   "hire_date", null: false
         end
       ERB
@@ -34,7 +34,7 @@
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_ruby expected_dsl
+      expect(subject.dump.gsub('utf8mb3_general_ci', 'utf8_general_ci')).to match_ruby expected_dsl
     }
   end
 end

spec/mysql/collation/collation_spec.rb

@@ -54,7 +54,7 @@
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
-          t.text    "text", null: false
+          t.text    "text", null: false, collation: nil
         end
       ERB
     end
@@ -67,7 +67,7 @@
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_ruby expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl.gsub(', collation: nil', '') # for AR 7.0.4
     end
   end
 
@@ -137,13 +137,6 @@
 
           opts = ['--dump-without-table-options']
           out, status = run_ridgepole('--diff', "'#{JSON.dump(conn_spec)}'", f.path, *opts)
-
-          # v6.0.3 is the oldest version that doesn't produce any kwargs warnings with Ruby 2.7
-          if condition('< 6.0.3')
-            # https://github.com/jeremyevans/ruby-warning/blob/1.1.0/lib/warning.rb#L18
-            out = out.lines.grep_v(/: warning: (?:Using the last argument (?:for `.+' )?as keyword parameters is deprecated; maybe \*\* should be added to the call|Passing the keyword argument (?:for `.+' )?as the last hash parameter is deprecated|Splitting the last argument (?:for `.+' )?into positional and keyword parameters is deprecated|The called method (?:`.+' )?is defined here)\n\z/).join # rubocop:disable Layout/LineLength
-          end
-
           expect(out).to be_empty
           expect(status.success?).to be_truthy
         end

spec/mysql/diff/diff2_spec.rb

@@ -168,9 +168,6 @@
 
     subject { Ridgepole::Client }
 
-    # XXX: for AR 5.1
-    before { client }
-
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy

spec/mysql/diff/diff_spec.rb

@@ -142,9 +142,6 @@
 
     subject { Ridgepole::Client }
 
-    # XXX: for AR 5.1
-    before { client }
-
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy

spec/mysql/dump/dump_class_method_spec.rb

@@ -45,11 +45,7 @@
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false
-          <%- if condition('< 6.0.0.beta2') -%>
-          t.string "gender", limit: 1, null: false
-          <%- else -%>
           t.column "gender", "enum('M','F')", null: false
-          <%- end -%>
           t.date   "hire_date", null: false
         end
 

spec/mysql/dump/dump_some_tables_spec.rb

@@ -11,11 +11,7 @@
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false
-          <%- if condition('< 6.0.0.beta2') -%>
-          t.string "gender", limit: 1, null: false
-          <%- else -%>
           t.column "gender", "enum('M','F')", null: false
-          <%- end -%>
           t.date   "hire_date", null: false
         end
 
@@ -49,11 +45,7 @@
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false
-          <%- if condition('< 6.0.0.beta2') -%>
-          t.string "gender", limit: 1, null: false
-          <%- else -%>
           t.column "gender", "enum('M','F')", null: false
-          <%- end -%>
           t.date   "hire_date", null: false
         end
 

spec/mysql/dump/dump_spec.rb

@@ -45,11 +45,7 @@
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false
-          <%- if condition('< 6.0.0.beta2') -%>
-          t.string "gender", limit: 1, null: false
-          <%- else -%>
           t.column "gender", "enum('M','F')", null: false
-          <%- end -%>
           t.date   "hire_date", null: false
         end
 

spec/mysql/json/change_json_column_spec.rb

@@ -82,7 +82,7 @@
       erbh(<<-ERB)
         create_table "books", force: :cascade do |t|
           t.string  "title", null: false
-          t.json    "attrs", null: false
+          t.json    "attrs", null: false, collation: nil
           t.index ["title"], name: "index_books_on_title"
         end
       ERB
@@ -96,7 +96,7 @@
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_ruby expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl.gsub(', collation: nil', '') # for AR 7.0.4
     }
   end
 end

spec/mysql/migrate/migrate_change_column7_spec.rb

@@ -10,7 +10,7 @@
           t.integer "emp_no_bigint6", limit: 6, null: false
           t.integer "emp_no_bigint7", limit: 7, null: false
           t.integer "emp_no_bigint8", limit: 8, null: false
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end

spec/mysql/migrate/migrate_change_column_default_spec.rb

@@ -6,7 +6,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -17,7 +17,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", limit: 4, null: true
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -28,7 +28,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no"
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -52,7 +52,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -63,7 +63,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -87,7 +87,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -108,7 +108,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -119,7 +119,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", limit: 4, default: 0, null: true
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -130,7 +130,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -154,7 +154,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -165,7 +165,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
@@ -176,7 +176,7 @@
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
-          t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
+          t.float   "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end

spec/mysql/migrate/migrate_change_column_float_spec.rb

@@ -29,15 +29,7 @@
 
     it {
       delta = subject.diff(expected_dsl)
-
-      if condition('< 5.2.0.beta2')
-        expect(delta.differ?).to be_truthy
-        expect(subject.dump).to match_ruby actual_dsl
-        delta.migrate
-        expect(subject.dump).to match_ruby actual_dsl
-      else
-        expect(delta.differ?).to be_falsy
-      end
+      expect(delta.differ?).to be_falsy
     }
   end