Fix Query Shape for FlatPostgresCollection#upsert and createOrReplace for Query Plan Caching

[suddendust]

We observed that the query shape is different and because of this, the query plan isn't cached. This needs to be fixed.