sadpandajoe opened a new pull request, #42878: URL: https://github.com/apache/superset/pull/42878
### SUMMARY Master currently has two Alembic migration heads (`4f145192b583` and `c4a1b8e2d739`), which breaks `flask db upgrade` / `superset db upgrade` on any fresh install or existing deployment picking up both changes. The two heads were introduced by unrelated PRs that both branched off the same parent revision (`1a27941d5352`) and merged to master independently, so neither author's migration graph reflected the other's new head at merge time: - `4f145192b583` — added restoring pivot-table percent-display (merges with an earlier report-retry/compare-chart merge head) - `c4a1b8e2d739` — migrates Databend connections to an explicit `sslmode` This PR adds a standard no-op Alembic merge revision joining both heads back into a single linear chain, following the same pattern as prior merge migrations in this repo (empty `upgrade`/`downgrade`). ### BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF N/A — migration-only change. ### TESTING INSTRUCTIONS 1. `flask db heads` on master (before this PR) reports two heads: `4f145192b583` and `c4a1b8e2d739`. 2. With this PR applied, `flask db heads` reports a single head: `d7cecc48bd55`. 3. `flask db upgrade` runs cleanly through the merged chain (the merge revision is a no-op, so both prior migrations' `upgrade()`/`downgrade()` are unaffected). ### ADDITIONAL INFORMATION - [ ] Has associated issue: - [ ] Required feature flags: - [ ] Changes UI - [x] Includes DB Migration (follow approval process in [SIP-59](https://github.com/apache/superset/issues/13351)) - [x] Migration is atomic, supports rollback & is backwards-compatible - [x] Confirm DB migration upgrade and downgrade tested - [x] Runtime estimates and downtime expectations provided (no-op merge revision; no schema or data changes, negligible runtime) - [ ] Introduces new feature or API - [ ] Removes existing feature or API -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
