Backport Catalog Fix to 1.7.latest

[peterallenwebb]

resolves #8846
resolves #8939

Problem

Fixes to get_catalog() identified in 1.7.0 RC1 need to get into RC2.

Solution

Cherry-pick verified fixes from main to 1.7.latest

Checklist

• I have read the contributing guide and understand what's expected of me
• I have run this code in development and it appears to resolve the stated issue
• This PR includes tests, or tests are not required/relevant for this PR
• This PR has no interface changes (e.g. macros, cli, logs, json artifacts, config files, adapter interface, etc) or this PR has already received feedback and approval from Product or DX
• This PR includes type annotations for new and modified functions

[codecov]

Codecov Report

Attention: 5 lines in your changes are missing coverage. Please review.

Comparison is base (5e13698) 86.37% compared to head (5ea963e) 86.49%.

Additional details and impacted files

@@              Coverage Diff               @@
##           1.7.latest    #8953      +/-   ##
==============================================
+ Coverage       86.37%   86.49%   +0.12%     
==============================================
  Files             177      177              
  Lines           26385    26405      +20     
==============================================
+ Hits            22789    22839      +50     
+ Misses           3596     3566      -30     

Flag	Coverage Δ
integration	83.34% <91.07%> (+0.11%)	⬆️
unit	64.80% <64.28%> (+0.21%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
core/dbt/adapters/base/impl.py	82.85% <94.59%> (+2.59%)	⬆️
core/dbt/task/generate.py	86.88% <84.21%> (-0.69%)	⬇️

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.