> The "everything" also includes the query_text. > > This makes me wonder then if all it takes is just adding this to PortalDrop > (proposed earlier in the thread by Frédéric):
One thing I did not like about that approach is that we will need to save the current debug_query_string inside PortalDrop before temporarily setting it to the one from the about to be dropped portal, and then set it back to the saved one before exiting. Otherwise, we might end up logging the wrong query in some cases (although I could not find a test case that proves my worry). With v12, drop_unnamed_portal sets the debug_query_string of the portal, and we know right after drop_unnamed_portal is completed the debug_query_string is set to the current query. -- Sami
