Fix store migration so the live database moves to the new scheme

internal/store/store.go

@@ -18,7 +18,12 @@ import (
 
 var ErrNotFound = errors.New("not found")
 
-var migrations = []string{`
+type migration struct {
+	name string
+	sql  string
+}
+
+var migrations = []migration{{"create-core-tables", `
 CREATE TABLE IF NOT EXISTS users (
 	login TEXT PRIMARY KEY,
 	display_name TEXT NOT NULL,
@@ -61,7 +66,7 @@ CREATE TABLE IF NOT EXISTS events (
 	payload TEXT NOT NULL,
 	created_at TEXT NOT NULL
 );
-`, `
+`}, {"add-agent-sessions", `
 ALTER TABLE events ADD COLUMN agent_session_id TEXT;
 
 CREATE TABLE agent_sessions (
@@ -78,7 +83,7 @@ CREATE TABLE agent_sessions (
 
 CREATE INDEX agent_sessions_task ON agent_sessions(task_id, created_at);
 CREATE INDEX agent_sessions_state ON agent_sessions(state);
-`, `
+`}, {"add-inbox", `
 CREATE TABLE inbox_items (
 	id TEXT PRIMARY KEY,
 	project_id TEXT NOT NULL REFERENCES projects(id),
@@ -113,28 +118,29 @@ CREATE TABLE inbox_responses (
 );
 
 CREATE INDEX inbox_responses_item ON inbox_responses(item_id, created_at);
-`, `
+`}, {"index-events-by-task", `
 CREATE INDEX events_task ON events(task_id, seq);
-`, `
+`}, {"add-turn-queue", `
 CREATE TABLE turn_queue (
 	session_id TEXT PRIMARY KEY REFERENCES agent_sessions(id),
 	actor TEXT NOT NULL,
 	text TEXT NOT NULL,
 	created_at TEXT NOT NULL
 );
-`, `
+`}, {"merge-response-types-into-other", `
 UPDATE inbox_responses SET type = 'other' WHERE type IN ('free_form', 'redirect', 'question');
 UPDATE inbox_items SET state = 'answered' WHERE state = 'redirected';
-`, `
-UPDATE inbox_items SET payload = json_object('text', coalesce((SELECT group_concat('- ' || value, char(10)) FROM json_each(inbox_items.payload, '$.done')), '')) WHERE kind = 'report';
-`, `
+`}, {"flatten-report-payloads-to-text", `
+UPDATE inbox_items SET payload = json_object('text', coalesce((SELECT group_concat('- ' || value, char(10)) FROM json_each(inbox_items.payload, '$.done')), ''))
+WHERE kind = 'report' AND json_type(payload, '$.done') IS NOT NULL;
+`}, {"rename-completed-tasks-to-discarded", `
 ALTER TABLE tasks RENAME COLUMN completed_at TO closed_at;
 ALTER TABLE tasks ADD COLUMN merge_commit TEXT NOT NULL DEFAULT '';
 UPDATE tasks SET status = 'discarded' WHERE status = 'completed';
-`, `
+`}, {"dismiss-inbox-of-closed-tasks", `
 UPDATE inbox_items SET state = 'dismissed', resolved_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now'), snoozed_until = NULL
 WHERE state = 'open' AND task_id IN (SELECT id FROM tasks WHERE status != 'active');
-`}
+`}}
 
 type Store struct {
 	db      *sql.DB
@@ -150,7 +156,7 @@ func Open(path string, onEvent func(api.Event)) (*Store, error) {
 		return nil, err
 	}
 
-	err = migrate(db)
+	err = migrate(db, migrations)
 	if err != nil {
 		db.Close()
 		return nil, err
@@ -159,40 +165,107 @@ func Open(path string, onEvent func(api.Event)) (*Store, error) {
 	return &Store{db: db, path: path, onEvent: onEvent}, nil
 }
 
-func migrate(db *sql.DB) error {
-	version := 0
-	err := db.QueryRow(`PRAGMA user_version`).Scan(&version)
+func migrate(db *sql.DB, migrations []migration) error {
+	err := createMigrationsTable(db, migrations)
 	if err != nil {
 		return err
 	}
 
-	for i := version; i < len(migrations); i++ {
-		tx, err := db.Begin()
-		if err != nil {
-			return err
+	applied, err := appliedMigrations(db)
+	if err != nil {
+		return err
+	}
+
+	for _, m := range migrations {
+		if applied[m.name] {
+			continue
 		}
 
-		_, err = tx.Exec(migrations[i])
+		err = applyMigration(db, m)
 		if err != nil {
-			tx.Rollback()
-			return fmt.Errorf("migration %d: %w", i, err)
-		}
-
-		_, err = tx.Exec(fmt.Sprintf(`PRAGMA user_version = %d`, i+1))
-		if err != nil {
-			tx.Rollback()
-			return fmt.Errorf("migration %d: %w", i, err)
-		}
-
-		err = tx.Commit()
-		if err != nil {
-			return fmt.Errorf("migration %d: %w", i, err)
+			return fmt.Errorf("migration %s: %w", m.name, err)
 		}
 	}
 
 	return nil
 }
 
+func createMigrationsTable(db *sql.DB, migrations []migration) error {
+	tx, err := db.Begin()
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback()
+
+	exists := 0
+	err = tx.QueryRow(`SELECT count(*) FROM sqlite_master WHERE type = 'table' AND name = 'migrations'`).Scan(&exists)
+	if err != nil {
+		return err
+	}
+	if exists > 0 {
+		return nil
+	}
+
+	_, err = tx.Exec(`CREATE TABLE migrations (name TEXT PRIMARY KEY, applied_at TEXT NOT NULL)`)
+	if err != nil {
+		return err
+	}
+
+	version := 0
+	err = tx.QueryRow(`PRAGMA user_version`).Scan(&version)
+	if err != nil {
+		return err
+	}
+
+	for _, m := range migrations[:min(version, len(migrations))] {
+		_, err = tx.Exec(`INSERT INTO migrations (name, applied_at) VALUES (?, ?)`, m.name, now())
+		if err != nil {
+			return err
+		}
+	}
+
+	return tx.Commit()
+}
+
+func appliedMigrations(db *sql.DB) (map[string]bool, error) {
+	rows, err := db.Query(`SELECT name FROM migrations`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	applied := map[string]bool{}
+	for rows.Next() {
+		name := ""
+		err = rows.Scan(&name)
+		if err != nil {
+			return nil, err
+		}
+		applied[name] = true
+	}
+	return applied, rows.Err()
+}
+
+func applyMigration(db *sql.DB, m migration) error {
+	tx, err := db.Begin()
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback()
+
+	_, err = tx.Exec(m.sql)
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec(`INSERT INTO migrations (name, applied_at) VALUES (?, ?)`, m.name, now())
+	if err != nil {
+		return err
+	}
+
+	return tx.Commit()
+}
+
 func (s *Store) Close() error {
 	return s.db.Close()
 }