Force ORDER BY clause on primary keys if option is undefined