Merge pull request #199 from PikachuEXE/feature/run-specific-migration-only

JonathanTron · web-flow · commit dbe8b1c533b4 · 2023-11-08T08:16:29.000+01:00
Update CI to run against rails 7.1 &amp; ruby 3.2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, feature/run-specific-migration-only ]
   pull_request:
     branches: ['**']
 
@@ -39,35 +39,41 @@ jobs:
       fail-fast: false
       matrix:
         rails:
-          - "5.2"
-          - "6.0"
           - "6.1"
           - "7.0"
+          - "7.1"
         sequel:
           - "~> 5.0"
         ruby:
           - "2.6"
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
           # - "jruby"
-        exclude:
-          - ruby: "2.7"
-            rails: "5.2"
-          - ruby: "3.0"
-            rails: "5.2"
-          - ruby: "3.1"
+        include:
+          - ruby: "2.6"
             rails: "5.2"
-          - ruby: "3.0"
+            sequel: "~> 5.0"
+          - ruby: "2.6"
             rails: "6.0"
-          - ruby: "3.1"
+            sequel: "~> 5.0"
+          - ruby: "2.7"
             rails: "6.0"
+            sequel: "~> 5.0"
+        exclude:
           - ruby: "3.1"
             rails: "6.1"
+          - ruby: "3.2"
+            rails: "6.1"
           - ruby: "2.6"
             rails: "7.0"
           - ruby: "jruby"
             rails: "7.0"
+          - ruby: "2.6"
+            rails: "7.1"
+          - ruby: "jruby"
+            rails: "7.1"
     name: Rails ${{ matrix.rails }}, Sequel ${{ matrix.sequel }}, Ruby ${{ matrix.ruby }}
 
     env:
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'actionpack'
-gem 'fakefs', '0.5.3', :require => 'fakefs/safe'
+gem 'fakefs', '>= 1.8.0', :require => 'fakefs/safe'
 
 gem 'pry'
 
diff --git a/ci/rails-5.2.gemfile b/ci/rails-5.2.gemfile
@@ -8,7 +8,7 @@ gemspec :path => '../'
 
 gem 'sequel', "#{ENV['SEQUEL']}"
 
-gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
+gem 'fakefs', '>= 1.8.0', :require => 'fakefs/safe'
 
 gem 'rspec-rails', '~> 5.0'
 
diff --git a/ci/rails-6.0.gemfile b/ci/rails-6.0.gemfile
@@ -8,7 +8,7 @@ gemspec :path => '../'
 
 gem 'sequel', "#{ENV['SEQUEL']}"
 
-gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
+gem 'fakefs', '>= 1.8.0', :require => 'fakefs/safe'
 
 gem 'rspec-rails', '~> 5.0'
 
diff --git a/ci/rails-6.1.gemfile b/ci/rails-6.1.gemfile
@@ -8,7 +8,7 @@ gemspec :path => '../'
 
 gem 'sequel', "#{ENV['SEQUEL']}"
 
-gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
+gem 'fakefs', '>= 1.8.0', :require => 'fakefs/safe'
 
 gem 'rspec-rails', '~> 5.0'
 
diff --git a/ci/rails-7.0.gemfile b/ci/rails-7.0.gemfile
@@ -8,7 +8,7 @@ gemspec :path => '../'
 
 gem 'sequel', "#{ENV['SEQUEL']}"
 
-gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
+gem 'fakefs', '>= 1.8.0', :require => 'fakefs/safe'
 
 gem 'rspec-rails', '~> 5.0'
 
diff --git a/ci/rails-7.1.gemfile b/ci/rails-7.1.gemfile
@@ -0,0 +1,27 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 7.1.0'
+gem 'activemodel', '~> 7.1.0'
+gem 'actionpack', '~> 7.1.0'
+
+gemspec :path => '../'
+
+gem 'sequel', "#{ENV['SEQUEL']}"
+
+gem 'fakefs', '>= 1.8.0', :require => 'fakefs/safe'
+
+gem 'rspec-rails', '~> 5.0'
+
+# MRI/Rubinius Adapter Dependencies
+platform :ruby do
+  gem 'pg'
+  gem 'mysql2'
+  gem 'sqlite3'
+end
+
+# JRuby Adapter Dependencies
+platform :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
+end
diff --git a/spec/internal/Rakefile b/spec/internal/Rakefile
@@ -6,5 +6,10 @@ end
 Bundler.require :default, :development, :test
 
 Combustion.path = ''
-Combustion.initialize! 'sequel_rails'
+Combustion.initialize! 'sequel_rails' do
+  if Rails.gem_version >= Gem::Version.new('7.1.0')
+    # Suppress warning about `cache_format_version`
+    config.active_support.cache_format_version = 7.1
+  end
+end
 Combustion::Application.load_tasks
diff --git a/spec/internal/db/migrate/1365762738_add_display_name_to_users.rb b/spec/internal/db/migrate/1365762738_add_display_name_to_users.rb
@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table :users do
+      add_column :display_name, String, :text => true
+    end
+  end
+end
diff --git a/spec/internal/db/migrate/1365762739_add_github_username_to_users.rb b/spec/internal/db/migrate/1365762739_add_github_username_to_users.rb
@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table :users do
+      add_column :github_username, String, :text => true
+    end
+  end
+end
diff --git a/spec/lib/sequel_rails/railties/database_rake_spec.rb b/spec/lib/sequel_rails/railties/database_rake_spec.rb
@@ -25,28 +25,36 @@
     it 'append the migration schema information if any' do
       Dir.chdir app_root do
         `rake db:migrate db:schema:dump`
-        sql = Sequel::Model.db.from(
-          :schema_migrations
-        ).insert_sql(:filename => '1273253849_add_twitter_handle_to_users.rb')
+        sqls = [
+          Sequel::Model.db.from(
+            :schema_migrations
+          ).insert_sql(:filename => '1273253849_add_twitter_handle_to_users.rb'),
+          Sequel::Model.db.from(
+            :schema_migrations
+          ).insert_sql(:filename => '1365762738_add_display_name_to_users.rb'),
+          Sequel::Model.db.from(
+            :schema_migrations
+          ).insert_sql(:filename => '1365762739_add_github_username_to_users.rb')
+        ]
         content = if ENV['TEST_ADAPTER'] == 'postgresql'
-                    <<-EOS.strip_heredoc
+                    <<-EOS
                       Sequel.migration do
                         change do
                           self << "SET search_path TO \\"$user\\", public"
-                          self << #{sql.inspect}
+                          #{sqls.map { |sql| "self << #{sql.inspect}" }.join("\n")}
                         end
                       end
                     EOS
                   else
-                    <<-EOS.strip_heredoc
+                    <<-EOS
                       Sequel.migration do
                         change do
-                          self << #{sql.inspect}
+                          #{sqls.map { |sql| "self << #{sql.inspect}" }.join("\n")}
                         end
                       end
                     EOS
-                  end
-        expect(File.read(schema)).to include content
+                  end.gsub(/^\s+/, '').strip
+        expect(File.read(schema).gsub(/^\s+/, '')).to include content
       end
     end
   end
@@ -74,19 +82,80 @@
   end
 
   describe 'db:rollback' do
+    let(:version) { nil }
+    let(:rake_task_call) do
+      if version
+        proc { `rake db:rollback VERSION=#{version}` }
+      else
+        proc { `rake db:rollback` }
+      end
+    end
+
     it 'revert latest migration' do
       Dir.chdir app_root do
         begin
           expect do
-            `rake db:rollback`
+            rake_task_call.call
           end.to change { SequelRails::Migrations.current_migration }.from(
-            '1273253849_add_twitter_handle_to_users.rb'
-          ).to(nil)
+            '1365762739_add_github_username_to_users.rb'
+          ).to('1365762738_add_display_name_to_users.rb')
         ensure
           SequelRails::Migrations.migrate_up!
         end
       end
     end
+
+    context 'when version supplied' do
+      context 'same as current version' do
+        let(:version) { '1365762739' }
+
+        it 'does not revert' do
+          Dir.chdir app_root do
+            begin
+              expect do
+                rake_task_call.call
+              end.not_to change { SequelRails::Migrations.current_migration }
+            ensure
+              SequelRails::Migrations.migrate_up!
+            end
+          end
+        end
+      end
+      context 'same as last version' do
+        let(:version) { '1365762738' }
+
+        it 'revert latest migration' do
+          Dir.chdir app_root do
+            begin
+              expect do
+                rake_task_call.call
+              end.to change { SequelRails::Migrations.current_migration }.from(
+                '1365762739_add_github_username_to_users.rb'
+              ).to('1365762738_add_display_name_to_users.rb')
+            ensure
+              SequelRails::Migrations.migrate_up!
+            end
+          end
+        end
+      end
+      context 'smaller than last version' do
+        let(:version) { '1273253849' }
+
+        it 'revert until migration specified by version' do
+          Dir.chdir app_root do
+            begin
+              expect do
+                rake_task_call.call
+              end.to change { SequelRails::Migrations.current_migration }.from(
+                '1365762739_add_github_username_to_users.rb'
+              ).to('1273253849_add_twitter_handle_to_users.rb')
+            ensure
+              SequelRails::Migrations.migrate_up!
+            end
+          end
+        end
+      end
+    end
   end
 
   describe 'db:migrate:redo' do
diff --git a/spec/lib/sequel_rails/railties/log_subscriber_spec.rb b/spec/lib/sequel_rails/railties/log_subscriber_spec.rb
@@ -24,7 +24,7 @@ def set_logger(logger) # rubocop:disable AccessorMethodName
 
   it 'does not log query when logger level is not debug, but track runtime and count' do
     expect(described_class.count).to eq 0
-    @logger.level = :info
+    @logger.level = defined?(Logger::Severity) ? Logger::Severity::INFO : :info
     User.all
     wait
     expect(@logger.logged(:debug).size).to eq 0
