various command fixes in postgres example Upstream-commit: b048e9dffcbab35ed684f031f7ca874ea5a9325e Component: engine