Drop the eight legacy columns SP8 left behind
Migrations 66 to 73 drop `actions.index`, `variants`, `variant_index`, `variant_count`, `state_before`, and `world_state_before`, plus `adventures.memory_cursor` and `summary_cursor`. `index` is a keyword in SQLite, so migration 71 quotes it. Nothing outside the migrations read these. `models.py`, `schemas.py`, and `ACTION_LIST_COLUMNS` lose the same eight fields, `Adventure.actions` orders by `id`, and `attempts.renumber`, `context.history.max_action_index`, and `nodes.next_index` are deleted. Two changes keep the migration replayable on a `create_all` database: - `_split_variants_into_siblings` wrote through the live ORM table, so it stopped compiling once migration 66 removed five of its columns. It now writes through `_ACTIONS_AT_60`, a frozen `Table` with its own `MetaData`. - Five data passes read columns these migrations drop. Each now calls `_has_columns` and returns early when the columns are absent. `bootstrap` takes a `through` version so a migration test can stop at the schema it asserts on. 555 tests pass, up from 549. Eight of the new cases assert each column is gone after a real schema-45 database migrates all the way. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0198qDK3gmgSo7EtQ4GTPqqK
This commit is contained in:
parththakkar106
committed by
Parth
Parth
co-authored by
Claude Opus 5
Claude Opus 5
parent
e0bf2b61d9
commit
f1bebe18d0
@@ -216,7 +216,7 @@ def test_every_action_lands_on_its_adventure_root_branch(pre_tree):
|
||||
|
||||
|
||||
def test_depth_is_the_old_index_gaps_included(pre_tree):
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.TREE_BACKFILL_VERSION)
|
||||
|
||||
assert rows('SELECT "index", depth FROM actions WHERE depth != "index"') == []
|
||||
depths = [
|
||||
@@ -288,7 +288,7 @@ def test_the_cursors_become_the_nodes_they_named(pre_tree):
|
||||
"""SP3, migration 56. A count of covered actions and a depth become
|
||||
different numbers as soon as the story has a gap in it, and every
|
||||
adventure with a deleted action has one."""
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.CURSOR_ANCHOR_VERSION)
|
||||
|
||||
def marks(title):
|
||||
[row] = rows(
|
||||
@@ -346,7 +346,7 @@ def test_the_branch_clause_index_exists(pre_tree):
|
||||
|
||||
|
||||
def test_running_it_again_changes_nothing(pre_tree):
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.CURSOR_ANCHOR_VERSION)
|
||||
snapshot = (
|
||||
rows("SELECT id, branch_id, depth FROM actions ORDER BY id"),
|
||||
rows("SELECT id, adventure_id, lineage FROM branches ORDER BY id"),
|
||||
@@ -360,7 +360,7 @@ def test_running_it_again_changes_nothing(pre_tree):
|
||||
# stops the first run, the NULL guards stop the second, and a
|
||||
# migration that only survives because of the stamp is one bad rescue
|
||||
# away from doubling every branch.
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.CURSOR_ANCHOR_VERSION)
|
||||
with engine.begin() as conn:
|
||||
migrations._backfill_tree(conn)
|
||||
migrations._backfill_cursor_anchors(conn)
|
||||
@@ -522,7 +522,7 @@ def test_deleting_the_newest_action_moves_the_head_back(client):
|
||||
db = SessionLocal()
|
||||
try:
|
||||
adventure = db.get(models.Adventure, adventure_id)
|
||||
extra = models.Action(adventure_id=adventure_id, index=1, type="do", text="Look.")
|
||||
extra = models.Action(adventure_id=adventure_id, type="do", text="Look.")
|
||||
tree.place_action(db, adventure, extra)
|
||||
db.add(extra)
|
||||
db.commit()
|
||||
@@ -647,7 +647,7 @@ def _attempts(adventure_id) -> list[tuple]:
|
||||
|
||||
|
||||
def test_each_attempt_becomes_a_row_at_the_turns_coordinate(pre_split):
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.SIBLING_SPLIT_VERSION)
|
||||
|
||||
assert _attempts(pre_split) == [
|
||||
(0, "Attempt one.", 0, 3),
|
||||
@@ -669,7 +669,7 @@ def test_the_live_attempt_is_the_one_the_row_was_mirroring(pre_split):
|
||||
"""`variant_index` is the only record of which take the player was reading,
|
||||
and it survives as the `live` flag. Guessing "the newest" instead would
|
||||
silently rewrite the story of anyone who had paged back."""
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.SIBLING_SPLIT_VERSION)
|
||||
|
||||
live = rows(
|
||||
"SELECT text FROM actions WHERE adventure_id = :a AND live = 1 "
|
||||
@@ -679,7 +679,7 @@ def test_the_live_attempt_is_the_one_the_row_was_mirroring(pre_split):
|
||||
|
||||
|
||||
def test_the_prompt_stays_on_the_live_attempt_and_nowhere_else(pre_split):
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.SIBLING_SPLIT_VERSION)
|
||||
|
||||
holders = []
|
||||
for variant_index, snapshot in rows(
|
||||
@@ -696,7 +696,7 @@ def test_the_prompt_stays_on_the_live_attempt_and_nowhere_else(pre_split):
|
||||
|
||||
|
||||
def test_each_attempt_keeps_the_outcome_it_produced(pre_split):
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.SIBLING_SPLIT_VERSION)
|
||||
|
||||
parsed = [
|
||||
(i, json.loads(state), json.loads(world) if world else None)
|
||||
@@ -720,7 +720,7 @@ def test_each_attempt_keeps_the_outcome_it_produced(pre_split):
|
||||
|
||||
|
||||
def test_state_after_is_the_state_before_of_the_turn_in_front(pre_split):
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.SIBLING_SPLIT_VERSION)
|
||||
|
||||
after = dict(rows(
|
||||
'SELECT "index", state_after FROM actions WHERE adventure_id = :a '
|
||||
@@ -734,11 +734,11 @@ def test_state_after_is_the_state_before_of_the_turn_in_front(pre_split):
|
||||
|
||||
|
||||
def test_the_split_survives_being_run_again(pre_split):
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.SIBLING_SPLIT_VERSION)
|
||||
snapshot = _attempts(pre_split)
|
||||
before = scalar("SELECT count(*) FROM actions")
|
||||
|
||||
migrations.bootstrap(engine)
|
||||
migrations.bootstrap(engine, through=migrations.SIBLING_SPLIT_VERSION)
|
||||
with engine.begin() as conn:
|
||||
migrations._backfill_state_after(conn)
|
||||
migrations._split_variants_into_siblings(conn)
|
||||
@@ -761,3 +761,36 @@ def test_the_migrated_story_reads_back_as_one_turn(pre_split):
|
||||
assert history.count(adventure) == 4
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
|
||||
# ------------------------------------------------------- SP8: the columns go
|
||||
|
||||
# The columns migrations 66 to 73 drop, paired with the table they sat on.
|
||||
DROPPED_COLUMNS = [
|
||||
("actions", "index"),
|
||||
("actions", "variants"),
|
||||
("actions", "variant_index"),
|
||||
("actions", "variant_count"),
|
||||
("actions", "state_before"),
|
||||
("actions", "world_state_before"),
|
||||
("adventures", "memory_cursor"),
|
||||
("adventures", "summary_cursor"),
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("table,column", DROPPED_COLUMNS)
|
||||
def test_the_legacy_columns_are_dropped(pre_tree, table, column):
|
||||
"""A pre-tree database that migrates all the way ends without these eight.
|
||||
|
||||
The fixture is a real schema-45 database, so each column starts present and
|
||||
the `ALTER TABLE` statements have something to remove. A `create_all`
|
||||
database never has them, and would pass this test without running the
|
||||
migration at all.
|
||||
"""
|
||||
before = {row[1] for row in rows(f"PRAGMA table_info({table})")}
|
||||
assert column in before, "the fixture must start with the column"
|
||||
|
||||
migrations.bootstrap(engine)
|
||||
|
||||
after = {row[1] for row in rows(f"PRAGMA table_info({table})")}
|
||||
assert column not in after
|
||||
|
||||
Reference in New Issue
Block a user