fix: merge multiple db heads

[eschutho]

SUMMARY

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

TESTING INSTRUCTIONS

ADDITIONAL INFORMATION

• Has associated issue:
• Required feature flags:
• Changes UI
• Includes DB Migration (follow approval process in SIP-59)
  • Migration is atomic, supports rollback & is backwards-compatible
  • Confirm DB migration upgrade and downgrade tested
  • Runtime estimates and downtime expectations provided
• Introduces new feature or API
• Removes existing feature or API

[codecov]

Codecov Report

Merging #19577 (97d654b) into master (350f21d) will increase coverage by 17.11%.
The diff coverage is n/a.

❗ Current head 97d654b differs from pull request most recent head b3fc5a6. Consider uploading reports for the commit b3fc5a6 to get more accurate results

@@             Coverage Diff             @@
##           master   #19577       +/-   ##
===========================================
+ Coverage   49.37%   66.49%   +17.11%     
===========================================
  Files        1680     1680               
  Lines       64271    64271               
  Branches     6564     6564               
===========================================
+ Hits        31735    42734    +10999     
+ Misses      30834    19835    -10999     
  Partials     1702     1702               

Flag	Coverage Δ
mysql	81.90% <ø> (?)
postgres	81.95% <ø> (?)
python	82.04% <ø> (+34.83%)	⬆️
sqlite	81.73% <ø> (?)
unit	?

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

Impacted Files	Coverage Δ
superset/config.py	91.41% <0.00%> (+0.66%)	⬆️
superset/initialization/__init__.py	91.31% <0.00%> (+0.69%)	⬆️
superset/views/database/views.py	31.36% <0.00%> (+0.90%)	⬆️
superset/charts/schemas.py	99.35% <0.00%> (+1.94%)	⬆️
superset/extensions/__init__.py	98.82% <0.00%> (+2.35%)	⬆️
superset/utils/feature_flag_manager.py	96.29% <0.00%> (+3.70%)	⬆️
superset/utils/logging_configurator.py	85.18% <0.00%> (+3.70%)	⬆️
superset/utils/date_parser.py	96.63% <0.00%> (+3.84%)	⬆️
superset/sql_parse.py	97.38% <0.00%> (+3.92%)	⬆️
superset/views/sql_lab.py	60.26% <0.00%> (+3.97%)	⬆️
... and 292 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 350f21d...b3fc5a6. Read the comment docs.