Re: [PROPOSAL] new diagnostic items for the dynamic sql

+set_errcurrent_query (const char *query)

You can remove the space prior to (.

I wonder if the new field can be named current_err_query because that's what the setter implies.

current_query may give the impression that the field can store normal query (which doesn't cause exception).

The following code implies that only one of internalquery and current_query would be set.

+               if (estate->cur_error->internalquery)
+                   exec_assign_c_string(estate, var, estate->cur_error->internalquery);
+               else
+                   exec_assign_c_string(estate, var, estate->cur_error->current_query);

Cheers