Update deps versions, generalize SQL query for postgresql compatibility, fix test expectations.

[sittim]

Making a big assumption that tested function performs correctly, but expected string needs an update, the assumption is explained here.