pg_upgrade:  use CTE query rather than temp table

Now that 8.3 is not supported, we can use a CTE and not temp tables.
This allows for auto-oid assignment protection in a future patch.
rename macro isTempOrToastNamespace to isTempOrTempToastNamespace

Done for clarity