Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions packages/core/src/database/v1-migration.bun.ts
Original file line number Diff line number Diff line change
Expand Up @@ -648,12 +648,15 @@ export function run(options: Options = {}): Effect.Effect<RunResult, never, Data
.set({ ...transformed.session, time_updated: next.time_updated })
.where(eq(SessionTable.id, next.id))
.run()
const event = yield* tx.get<{ seq: number | null }>(
sql`SELECT MAX(seq) AS seq FROM event WHERE aggregate_id = ${next.id}`,
)
yield* tx
.insert(EventSequenceTable)
.values({ aggregate_id: next.id, seq: transformed.watermark })
.values({ aggregate_id: next.id, seq: Math.max(transformed.watermark, event?.seq ?? -1) })
.onConflictDoUpdate({
target: EventSequenceTable.aggregate_id,
set: { seq: transformed.watermark, owner_id: null },
set: { seq: Math.max(transformed.watermark, event?.seq ?? -1), owner_id: null },
})
.run()
}),
Expand Down Expand Up @@ -809,12 +812,15 @@ function importNextDatabase(
})
.run(),
)
const event = yield* tx.get<{ seq: number | null }>(
sql`SELECT MAX(seq) AS seq FROM event WHERE aggregate_id = ${session.id}`,
)
yield* tx
.insert(EventSequenceTable)
.values({ aggregate_id: session.id, seq: messages.at(-1)?.seq ?? -1 })
.values({ aggregate_id: session.id, seq: Math.max(messages.at(-1)?.seq ?? -1, event?.seq ?? -1) })
.onConflictDoUpdate({
target: EventSequenceTable.aggregate_id,
set: { seq: messages.at(-1)?.seq ?? -1, owner_id: null },
set: { seq: Math.max(messages.at(-1)?.seq ?? -1, event?.seq ?? -1), owner_id: null },
})
.run()
}),
Expand Down
28 changes: 28 additions & 0 deletions packages/core/test/v1-migration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,34 @@ describe("V1Migration database workflow", () => {
)
})

test("rebuilding a projection does not lower its event sequence", async () => {
await database(
Effect.gen(function* () {
const { db } = yield* Database.Service
yield* db.run(
sql`INSERT INTO project (id, worktree, time_created, time_updated, sandboxes) VALUES ('global', '/tmp/test', 1, 2, '[]')`,
)
yield* db.run(sql`INSERT INTO session (
id, project_id, slug, directory, title, version, cost, time_created, time_updated
) VALUES ('ses_test', 'global', 'test', '/tmp/test', 'Test', '1', 0, 1, 2)`)
const source = user("msg_000000000040aaaaaaaaaaaaaa")
yield* db.run(
sql`INSERT INTO message (id, session_id, time_created, time_updated, data) VALUES (${source.id}, 'ses_test', 10, 11, ${source.data})`,
)
yield* db.run(sql`INSERT INTO event_sequence (aggregate_id, seq) VALUES ('ses_test', 9)`)
yield* db.run(
sql`INSERT INTO event (id, aggregate_id, seq, created, type, data) VALUES ('event_existing', 'ses_test', 9, 1, 'session.renamed.1', '{}' )`,
)
yield* db.run(
sql`INSERT INTO kv (key, value, time_created, time_updated) VALUES ('migration.v1-v2', '{"phase":"sessions"}', 1, 1)`,
)

expect(yield* V1Migration.run()).toEqual({ status: "completed" })
expect(yield* db.get(sql`SELECT seq FROM event_sequence WHERE aggregate_id = 'ses_test'`)).toEqual({ seq: 9 })
}),
)
})

test("rolls back one session atomically and resumes from the committed cursor", async () => {
await database(
Effect.gen(function* () {
Expand Down
Loading