ruby2_keyword removal step#4

Author: CharlesDelannoy

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

@@ -10,22 +10,20 @@ module BlockingActivityLogger
     include Helpers::StatementsHelper
 
     RETRIABLE_SCHEMA_STATEMENTS.each do |method|
-      define_method method do |*args, &block|
+      define_method method do |*args, **options, &block|
         log_context = lambda do
           break unless SafePgMigrations.config.sensitive_logger
 
-          options = args.last.is_a?(Hash) ? args.last : {}
-
           Helpers::Logger.say "Executing #{SafePgMigrations.current_migration.name}",
                               sensitive: true, warn_sensitive_logs: false
           Helpers::Logger.say_method_call method, *args, **options, sensitive: true, warn_sensitive_logs: false
         end
 
         log_blocking_queries_after_lock(log_context) do
-          super(*args, &block)
+          super(*args, **options, &block)
         end
       end
-      ruby2_keywords method
+      method
     end
 
     %i[add_index remove_index].each do |method|

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

@@ -18,7 +18,7 @@ def add_index(table_name, column_name, **options)
       super
     end
 
-    def add_column(table_name, column_name, type, *)
+    def add_column(table_name, column_name, type, **options)
       if column_exists?(table_name, column_name) && !column_exists?(table_name, column_name, type)
         error_message = "/!\\ Column '#{column_name}' already exists in '#{table_name}' with a different type"
         raise error_message
@@ -47,8 +47,7 @@ def remove_index(table_name, column_name = nil, **options)
       log_message("/!\\ Index '#{index_name}' not found on table '#{table_name}'. Skipping statement.")
     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)
       sub_options = options.slice(:name, :column)
       return super unless foreign_key_exists?(from_table, sub_options.present? ? nil : to_table, **sub_options)
 

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

@@ -5,10 +5,10 @@ module StatementRetrier
     include Helpers::StatementsHelper
 
     RETRIABLE_SCHEMA_STATEMENTS.each do |method|
-      define_method method do |*args, &block|
-        retry_if_lock_timeout { super(*args, &block) }
+      define_method method do |*args, **options, &block|
+        retry_if_lock_timeout { super(*args, **options, &block) }
       end
-      ruby2_keywords method
+      method
     end
 
     private

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

@@ -54,12 +54,12 @@ def strong_migration_available?
     ].freeze
 
     SAFE_METHODS.each do |method|
-      define_method method do |*args|
-        return super(*args) unless respond_to?(:safety_assured)
+      define_method method do |*args, **options|
+        return super(*args, **options) unless respond_to?(:safety_assured)
 
-        safety_assured { super(*args) }
+        safety_assured { super(*args, **options) }
       end
-      ruby2_keywords method
+      method
     end
 
     ruby2_keywords def add_column(table_name, *args)

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

@@ -21,8 +21,7 @@ def remove_index(table_name, column_name = nil, **options)
       super
     end
 
-    def add_foreign_key(*args)
-      options = args.last.is_a?(Hash) ? args.last : {}
+    def add_foreign_key(from_table, to_table, **options)
       if options[:validate] == false
         UselessStatementsLogger.warn_useless '`validate: :false`', 'https://github.com/doctolib/safe-pg-migrations#safe_add_foreign_key'
       end