Change form of query which used "DISTINCT ON" to help support primary keys.

We still have an internal limit in the ODBC code of 8 columns per key,
 but this should lay the groundwork for resolving that.
Includes reformulated query from Tom Lane.