Removes check of rails 6.1 or above for tests and use **options as default where possible

Author: CharlesDelannoy

lib/safe-pg-migrations/plugins/idempotent_statements.rb

@@ -65,13 +65,12 @@ def remove_foreign_key(from_table, to_table = nil, **options)
       log_message("/!\\ Foreign key '#{from_table}' -> '#{reference_name}' does not exist. Skipping statement.")
     end
 
-    def create_table(table_name, *args)
-      options = args.last.is_a?(Hash) ? args.last : {}
+    def create_table(table_name, **options)
       return super if options[:force] || !table_exists?(table_name)
 
       Helpers::Logger.say "/!\\ Table '#{table_name}' already exists.", sub_item: true
 
-      td = create_table_definition(table_name, *args)
+      td = create_table_definition(table_name, **options)
 
       yield td if block_given?
 

lib/safe-pg-migrations/plugins/statement_insurer.rb

@@ -30,8 +30,7 @@ def validate_foreign_key(*, **)
       without_statement_timeout { super }
     end
 
-    def add_foreign_key(from_table, to_table, *args)
-      options = args.last.is_a?(Hash) ? args.last : {}
+    def add_foreign_key(from_table, to_table, **options)
       validate_present = options.key?(:validate)
       options[:validate] = false unless validate_present
 
@@ -53,9 +52,7 @@ def create_table(*)
       end
     end
 
-    def add_index(table_name, column_name, *args_options)
-      options = args_options.last.is_a?(Hash) ? args_options.last : {}
-
+    def add_index(table_name, column_name, **options)
       if options[:algorithm] == :default
         options.delete :algorithm
       else

safe-pg-migrations.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
 
   s.version = SafePgMigrations::VERSION
 
-  s.authors  = ['Matthieu Prat', 'Romain Choquet', 'Thomas Hareau']
+  s.authors  = ['Matthieu Prat', 'Romain Choquet', 'Thomas Hareau', 'Charles Delannoy']
   s.homepage = 'https://github.com/doctolib/safe-pg-migrations'
 
   s.metadata = {

test/IdempotentStatements/add_check_constraint_test.rb

@@ -7,8 +7,6 @@ class AddCheckConstraintTest < Minitest::Test
     def setup
       super
 
-      skip_if_unmet_requirements
-
       @connection.create_table(:users) { |t| t.string :email }
       @connection.execute "INSERT INTO users (id, email) VALUES (default, '[email protected]');"
     end
@@ -108,11 +106,5 @@ def assert_skipping_validation(calls)
     def refute_skipping_validation(calls)
       refute_calls_include calls, "/!\\ Constraint 'new_constraint' already validated. Skipping statement."
     end
-
-    def skip_if_unmet_requirements
-      return if Gem::Requirement.new('>6.1').satisfied_by?(Gem::Version.new(::ActiveRecord::VERSION::STRING))
-
-      skip "validate_check_constraint does not exist on ActiveRecord#{::ActiveRecord::VERSION::STRING}"
-    end
   end
 end

test/IdempotentStatements/add_column_test.rb

@@ -97,10 +97,7 @@ def change_column_null_skipped_call
     end
 
     def skip_if_unmet_requirements!
-      if Gem::Requirement.new('>6.1').satisfied_by?(Gem::Version.new(::ActiveRecord::VERSION::STRING)) &&
-         SafePgMigrations.get_pg_version_num(ActiveRecord::Base.connection) >= 120_000
-        return
-      end
+      return if SafePgMigrations.get_pg_version_num(ActiveRecord::Base.connection) >= 120_000
 
       skip "validate_check_constraint does not exist on ActiveRecord#{::ActiveRecord::VERSION::STRING}"
     end

test/IdempotentStatements/change_column_null_test.rb

@@ -58,10 +58,7 @@ def change
     end
 
     def skip_if_unmet_requirements
-      if Gem::Requirement.new('>6.1').satisfied_by?(Gem::Version.new(::ActiveRecord::VERSION::STRING)) &&
-         SafePgMigrations.get_pg_version_num(ActiveRecord::Base.connection) >= 120_000
-        return
-      end
+      return if SafePgMigrations.get_pg_version_num(ActiveRecord::Base.connection) >= 120_000
 
       skip "validate_check_constraint does not exist on ActiveRecord#{::ActiveRecord::VERSION::STRING}"
     end

test/StatementInsurer/add_check_constraint_test.rb

@@ -7,8 +7,6 @@ class AddCheckConstraintTest < Minitest::Test
     def setup
       super
 
-      skip_if_unmet_requirements!
-
       @connection.create_table(:users) { |t| t.string :email }
       @connection.execute("INSERT INTO users (id, email) VALUES (default, '[email protected]');")
     end
@@ -66,13 +64,5 @@ def change
 
       ], calls
     end
-
-    private
-
-    def skip_if_unmet_requirements!
-      return if Gem::Requirement.new('>6.1').satisfied_by?(Gem::Version.new(::ActiveRecord::VERSION::STRING))
-
-      skip "validate_check_constraint does not exist on ActiveRecord#{::ActiveRecord::VERSION::STRING}"
-    end
   end
 end

test/StatementInsurer/add_column_test.rb

@@ -264,10 +264,7 @@ def change
     private
 
     def skip_if_unmet_requirements!
-      if Gem::Requirement.new('>6.1').satisfied_by?(Gem::Version.new(::ActiveRecord::VERSION::STRING)) &&
-         SafePgMigrations.get_pg_version_num(ActiveRecord::Base.connection) >= 120_000
-        return
-      end
+      return if SafePgMigrations.get_pg_version_num(ActiveRecord::Base.connection) >= 120_000
 
       skip "validate_check_constraint does not exist on ActiveRecord#{::ActiveRecord::VERSION::STRING}"
     end

test/StatementInsurer/change_column_null_test.rb

@@ -126,8 +126,7 @@ def skip_if_unmet_requirements!
     end
 
     def met_requirements?
-      Gem::Requirement.new('>6.1').satisfied_by?(Gem::Version.new(::ActiveRecord::VERSION::STRING)) &&
-        SafePgMigrations.get_pg_version_num(ActiveRecord::Base.connection) >= 120_000
+      SafePgMigrations.get_pg_version_num(ActiveRecord::Base.connection) >= 120_000
     end
   end
 end