bug fix to support DATABASE_URL with option '-U'
Revert "bug fixing on formation of ordering columns"

This reverts commit e9fd6345e63a344a4365cb9752e371d3f60babb0.

Conflicts:
	lib/dialects/abstract/query-generator.js