Fix tests for 7.1 (keeping retrocompatibility with v6)

Author: CharlesDelannoy

Gemfile.lock

@@ -8,21 +8,32 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activerecord (7.0.7.2)
-      activemodel (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activesupport (7.0.7.2)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activerecord (7.1.2)
+      activemodel (= 7.1.2)
+      activesupport (= 7.1.2)
+      timeout (>= 0.4.0)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.4)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
+    drb (2.2.0)
+      ruby2_keywords
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
@@ -31,6 +42,7 @@ GEM
     minitest (5.18.1)
     mocha (2.0.4)
       ruby2_keywords (>= 0.0.5)
+    mutex_m (0.2.0)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
@@ -64,6 +76,7 @@ GEM
     ruby2_keywords (0.0.5)
     strong_migrations (1.4.3)
       activerecord (>= 5.2)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)

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

@@ -23,8 +23,8 @@ def add_column(table_name, column_name, type, **options)
         error_message = "/!\\ Column '#{column_name}' already exists in '#{table_name}' with a different type"
         raise error_message
       end
-
-      return super unless column_exists?(table_name, column_name, type)
+      options_without_default_value_backfill = options.except(:default_value_backfill)
+      return super(table_name, column_name, type, **options_without_default_value_backfill) unless column_exists?(table_name, column_name, type)
 
       log_message(<<~MESSAGE.squish
         /!\\ Column '#{column_name}' already exists in '#{table_name}' with the same type (#{type}).
@@ -79,8 +79,9 @@ def create_table(table_name, *args)
     end
 
     def add_check_constraint(table_name, expression, **options)
+      options_without_validate = options.except(:validate)
       constraint_definition = check_constraint_for table_name,
-                                                   **check_constraint_options(table_name, expression, options)
+                                                   **check_constraint_options(table_name, expression, options_without_validate)
 
       return super if constraint_definition.nil?
 

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

@@ -6,6 +6,8 @@ module AddColumn
       def add_column(table_name, column_name, type, **options)
         return super if should_keep_default_implementation?(**options)
 
+        options.delete(:default_value_backfill)
+
         raise <<~ERROR unless backfill_column_default_safe?(table_name)
           Table #{table_name} has more than #{SafePgMigrations.config.default_value_backfill_threshold} rows.
           Backfilling the default value for column #{column_name} on table #{table_name} would take too long.

test/StatementInsurer/change_column_null_test.rb

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