chore: review

Author: Baptiste Perbos

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

@@ -79,7 +79,10 @@ def log_blocking_queries
       if queries.empty?
         SafePgMigrations.say 'Could not find any blocking query.', true
       else
-
+        SafePgMigrations.say(
+          "Statement was being blocked by the following #{'query'.pluralize(queries.size)}:", true
+        )
+        SafePgMigrations.say '', true
         output_blocking_queries(queries)
         SafePgMigrations.say(
           'Beware, some of those queries might run in a transaction. In this case the locking query might be '\
@@ -94,20 +97,16 @@ def log_blocking_queries
 
     def output_blocking_queries(queries)
       if SafePgMigrations.config.blocking_activity_logger_verbose
-        SafePgMigrations.say(
-          "Statement was being blocked by the following #{'query'.pluralize(queries.size)}:", true
-        )
-        SafePgMigrations.say '', true
-        queries.each do |query, start_time|
-          SafePgMigrations.say "#{format_start_time start_time}:  #{query}", true
-        end
+        queries.each { |query, start_time| SafePgMigrations.say "#{format_start_time start_time}:  #{query}", true }
       else
         queries.each do |start_time, locktype, mode, pid, transactionid|
-          SafePgMigrations.say format_start_time(start_time), true
-          SafePgMigrations.say "lock type: #{locktype || 'null'}", true
-          SafePgMigrations.say "lock mode: #{mode || 'null'}", true
-          SafePgMigrations.say "lock pid: #{pid || 'null'}", true
-          SafePgMigrations.say "lock transactionid: #{transactionid || 'null'}", true
+          SafePgMigrations.say(
+            "#{format_start_time(start_time)}: lock type: #{locktype || 'null'}, " \
+              "lock mode: #{mode || 'null'}, " \
+              "lock pid: #{pid || 'null'}, " \
+              "lock transactionid: #{transactionid || 'null'}",
+            true,
+          )
         end
       end
     end

test/safe_pg_migrations_test.rb

@@ -60,7 +60,6 @@ def test_blocking_activity_logger_filtered
     assert_includes calls, 'lock mode: AccessExclusiveLock'
     assert_includes calls, 'lock pid:'
     assert_includes calls, 'lock transactionid: null'
-    refute_includes calls, 'Statement was being blocked by the following query'
   end
 
   def test_statement_retry