! PostgreSQL's logic is a bit confusing at times...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! PostgreSQL doesn't like sorting by non-integer constants

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1374 from Oldiesmann/release-2.1

PostgreSQL fixes