Pass 3: Add catalog to all tables (always null), add more columns to
table, schemata, columns