RaduBerinde Merge pull request #13703 from RaduBerinde/order-dup-render

sql: be consistent when mapping ordering columns to render columns