1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/error_tracking.rb b/lib/gitlab/error_tracking.rb
index 38ac5d9af74..e91488c7c27 100644
--- a/lib/gitlab/error_tracking.rb
+++ b/lib/gitlab/error_tracking.rb
@@ -146,6 +146,9 @@ module Gitlab
         else
           inject_context_for_exception(event, ex.cause) if ex.cause.present?
         end
+      # This should only happen on PostgreSQL v12 queries
+      rescue PgQuery::ParseError
+        event.extra[:sql] = ex.sql.to_s
       end
     end
   end