26923: sql: misc pretty-printing fixes r=knz a=knz

Fixes #26920.
Fixes #26921.

Co-authored-by: Raphael 'kena' Poss <knz@cockroachlabs.com>