Merge pull request #160 from doctolib/Final_fix_for_nil_start_date

Fix format_start_time implementation

Author: CharlesDelannoy

lib/safe-pg-migrations/helpers/blocking_activity_formatter.rb

@@ -41,7 +41,7 @@ def output_confidentially_blocking_queries(queries)
         queries.each do |start_time, locktype, mode, pid, transactionid|
           Logger.say <<~MESSAGE.squish, sub_item: true, sensitive: true
             Query with pid #{pid || 'null'}
-            started #{start_time ? format_start_time(start_time) : 'unknown'}:
+            started #{format_start_time(start_time)}:
             lock type: #{locktype || 'null'},
             lock mode: #{mode || 'null'},
             lock transactionid: #{transactionid || 'null'}",
@@ -50,6 +50,8 @@ def output_confidentially_blocking_queries(queries)
       end
 
       def format_start_time(start_time, reference_time = Time.now)
+        return '(unknown start time)' unless start_time
+
         start_time = Time.parse(start_time) unless start_time.is_a? Time
 
         duration = (reference_time - start_time).round

test/blocking_activity_logger_test.rb

@@ -17,6 +17,20 @@ def test_blocking_activity_logger_filtered
     refute_includes calls, 'BEGIN; SELECT 1 FROM users'
   end
 
+  def test_doenot_fail_with_unknown_start_time
+    @migration = simulate_blocking_transaction_from_another_connection
+
+    alternate_connection = SafePgMigrations.alternate_connection
+    SafePgMigrations.stubs(:alternate_connection).returns(alternate_connection)
+    alternate_connection.stubs(:query).returns([[1234, 'SELECT something FROM a_table', nil]])
+
+    calls = record_calls(@migration, :write) do
+      run_migration
+    end.join
+
+    assert_match(/Query with pid 1234 started \(unknown start time\)/, calls)
+  end
+
   def test_logger_unfiltered
     @migration = simulate_blocking_transaction_from_another_connection
     calls = record_calls(@migration, :write) { run_migration }.join