Skip to content

Split 0041 into phantom-cleanup (0041) + table-view (0042) - #747

Merged
ajslater merged 1 commit into
developfrom
split-migration-0041-table-view
May 9, 2026
Merged

ajslater merged 1 commit into
developfrom
split-migration-0041-table-view

Conversation

@ajslater

@ajslater ajslater commented May 9, 2026

Copy link
Copy Markdown
Owner

Summary

Re-splits the consolidated 0041_browser_table_view.py into two migrations so develop mirrors main on the phantom-cleanup migration verbatim.

  • 0041_cleanup_phantom_comic_as_folder_rows.py — byte-identical to main's copy.
  • 0042_browser_table_view.py — depends on 0041; carries only the table-view schema work.

Why

The original consolidation was born of develop and browser-table-view both adding a migration numbered 0041 to a shared 0040 parent — the merge merged develop's standalone 0041 (phantom-Comic cleanup RunPython) into browser-table-view's schema migration to keep the history linear. Now that main has shipped its own 0041 separately, develop should match: 0041 stays as the cleanup migration (same hash as main), and the table-view schema work moves to 0042.

What changed

  • codex/migrations/0041_browser_table_view.pydeleted.
  • codex/migrations/0041_cleanup_phantom_comic_as_folder_rows.pyadded, byte-identical to main's copy. Same docstring, same helpers (_is_comic_path, _comics_fs_reachable, _stat_says_directory, _path_says_directory, _find_corrupt_comic_pks, _cleanup_phantom_comic_as_folder_rows, _noop), single RunPython operation.
  • codex/migrations/0042_browser_table_view.pyadded. Depends on 0041_cleanup_phantom_comic_as_folder_rows. Operations:
    • AddField view_mode, table_columns, table_cover_size, order_extra_keys
    • AlterField order_by with the post-table-view choice list

Test plan

  • makemigrations --check --dry-run reports no drift
  • showmigrations codex prints 0040 → 0041 → 0042 linearly
  • 193 backend pytest tests pass
  • ruff check clean
  • complexipy clean

Reviewer notes

  • The migration split is purely organizational — the combined schema state after applying 0041 + 0042 is identical to the state after the previous consolidated 0041. cmp confirms 0041 here is byte-identical to main's copy.

🤖 Generated with Claude Code

…grations

The original 0041_browser_table_view.py was a consolidation born of
develop and browser-table-view both adding a migration numbered 0041
to a shared 0040 parent — the consolidation merged the phantom-Comic
cleanup ``RunPython`` (originally develop's standalone 0041) into the
table-view schema migration to keep history linear.

Re-split now that main has shipped 0041_cleanup_phantom_comic_as_folder_rows
in its own right. develop should mirror main on 0041 verbatim, then
add the table-view operations as 0042 on top:

- 0041_cleanup_phantom_comic_as_folder_rows.py is now byte-identical
  to main's copy. Same docstring, same helpers (``_is_comic_path``,
  ``_comics_fs_reachable``, ``_stat_says_directory``,
  ``_path_says_directory``, ``_find_corrupt_comic_pks``,
  ``_cleanup_phantom_comic_as_folder_rows``, ``_noop``), and the
  single ``RunPython`` operation.
- 0042_browser_table_view.py carries only the table-view schema work:
  the four ``AddField``s (``view_mode``, ``table_columns``,
  ``table_cover_size``, ``order_extra_keys``) and the ``order_by``
  ``AlterField`` that refreshes the choice list to the post-
  table-view set. Depends on 0041_cleanup.

Verified: ``makemigrations --check --dry-run`` reports no drift,
``showmigrations`` prints 0040 → 0041 → 0042 linearly, and the full
test suite (193 tests) still passes.
@ajslater
ajslater merged commit 639f936 into develop May 9, 2026
3 checks passed
@ajslater
ajslater deleted the split-migration-0041-table-view branch May 11, 2026 00:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant