Migration refactor

AGENTS.md

@@ -10,7 +10,6 @@
 ## Crates
 
 - `v-api` - Dropshot endpoint, context, authentication, and authorization framework for the v-api service.
-- `v-api-installer` - Embedded Diesel migration runner for installing the v-model Postgres schema.
 - `v-api-param` - Configuration parameter helpers for inline strings or file-backed secret values.
 - `v-api-permission-derive` - Procedural macro for deriving v-api permission traits on application enums.
 - `v-model` - Shared data models, Diesel schema, migrations, storage traits, and Postgres implementations.

Cargo.toml

@@ -1,7 +1,6 @@
 [workspace]
 members = [
   "v-api",
-  "v-api-installer",
   "v-api-param",
   "v-api-permission-derive",
   "v-model",

README.md

@@ -14,7 +14,7 @@ The crate assumes that the hosting application is using a Postgres database or c
 connection to one. Want a different backend? Please contribute, it will be gladly welcome.
 
 The `v-model` crate contains [diesel](https://diesel.rs/) migrations for initializing the necessary
-tables in a database. `v-model-installer` exposes embedded migrations via [diesel_migrations](https://docs.rs/diesel_migrations/latest/diesel_migrations/).
+tables in a database. `v-model` exposes embedded migrations via [diesel_migrations](https://docs.rs/diesel_migrations/latest/diesel_migrations/).
 
 To add the endpoints in to the hosting server:
 

v-model/Cargo.toml

@@ -16,6 +16,7 @@ async-trait = { workspace = true }
 bb8 = { workspace = true }
 chrono = { workspace = true, features = ["serde"] }
 diesel = { workspace = true, features = ["chrono", "uuid", "serde_json"] }
+diesel_migrations = { workspace = true, features = ["postgres"] }
 mockall = { workspace = true, optional = true }
 newtype-uuid = { workspace = true }
 partial-struct = { workspace = true }
@@ -28,6 +29,4 @@ tracing = { workspace = true }
 uuid = { workspace = true, features = ["v4", "serde"]  }
 
 [dev-dependencies]
-diesel_migrations = { version = "2.3.2", features = ["postgres"] }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
-v-api-installer = { path = "../v-api-installer" }

v-api-installer/build.rs → v-model/build.rs

@@ -3,5 +3,6 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 fn main() {
-    println!("cargo:rerun-if-changed=../v-model/migrations");
+    println!("cargo:rerun-if-changed=migrations");
+    println!("cargo:rerun-if-changed=src/saga/migrations");
 }

v-model/src/lib.rs

@@ -22,6 +22,7 @@ use std::{
 use thiserror::Error;
 
 pub mod db;
+pub mod migrations;
 pub mod permissions;
 #[cfg(feature = "sagas")]
 pub mod saga;

v-model/src/migrations.rs

@@ -0,0 +1,39 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+use diesel::{
+    PgConnection,
+    r2d2::{ConnectionManager, ManageConnection},
+};
+use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations};
+
+/// Core v-model migrations that are always applied.
+pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations");
+
+/// Saga-specific migrations, only available when the `sagas` feature is enabled.
+#[cfg(feature = "sagas")]
+pub const SAGA_MIGRATIONS: EmbeddedMigrations = embed_migrations!("src/saga/migrations");
+
+/// Returns all embedded migration sets that should be applied based on the
+/// currently enabled features.
+fn all_migrations() -> Vec<EmbeddedMigrations> {
+    let mut migrations = vec![MIGRATIONS];
+
+    #[cfg(feature = "sagas")]
+    migrations.push(SAGA_MIGRATIONS);
+
+    migrations
+}
+
+/// Runs all pending migrations for each enabled feature against the database
+/// at the provided connection string. Migration sets are applied in dependency
+/// order (core first, then feature-specific).
+pub fn run_migrations(url: &str) {
+    let conn: ConnectionManager<PgConnection> = ConnectionManager::new(url);
+    let mut conn = conn.connect().unwrap();
+
+    for migrations in all_migrations() {
+        conn.run_pending_migrations(migrations).unwrap();
+    }
+}

v-model/src/saga/migrations/2026-05-19-172630_sagas/down.sql

@@ -0,0 +1,13 @@
+DROP INDEX IF EXISTS idx_saga_events_saga_id_id;
+DROP INDEX IF EXISTS idx_saga_events_event_type;
+DROP INDEX IF EXISTS idx_saga_events_saga_id;
+
+DROP INDEX IF EXISTS idx_sagas_node_claimed_at;
+DROP INDEX IF EXISTS idx_sagas_current_node_id;
+DROP INDEX IF EXISTS idx_sagas_created_at;
+DROP INDEX IF EXISTS idx_sagas_name;
+DROP INDEX IF EXISTS idx_sagas_state;
+
+-- Drop tables (saga_events first due to foreign key constraint)
+DROP TABLE IF EXISTS saga_events;
+DROP TABLE IF EXISTS sagas;

v-model/src/saga/migrations/2026-05-19-172630_sagas/up.sql

@@ -0,0 +1,29 @@
+CREATE TABLE sagas (
+    saga_id UUID PRIMARY KEY,
+    name TEXT NOT NULL,
+    dag JSONB NOT NULL,
+    state TEXT NOT NULL,
+    current_node_id UUID,
+    node_claimed_at TIMESTAMPTZ,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE INDEX idx_sagas_state ON sagas (state);
+CREATE INDEX idx_sagas_name ON sagas (name);
+CREATE INDEX idx_sagas_created_at ON sagas (created_at);
+CREATE INDEX idx_sagas_current_node_id ON sagas (current_node_id);
+CREATE INDEX idx_sagas_node_claimed_at ON sagas (node_claimed_at) WHERE current_node_id IS NOT NULL;
+
+CREATE TABLE saga_events (
+    id BIGSERIAL PRIMARY KEY,
+    saga_id UUID NOT NULL REFERENCES sagas(saga_id) ON DELETE CASCADE,
+    node_id BIGINT NOT NULL,
+    event_type TEXT NOT NULL,
+    event_data JSONB NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE INDEX idx_saga_events_saga_id ON saga_events (saga_id);
+CREATE INDEX idx_saga_events_event_type ON saga_events (event_type);
+CREATE INDEX idx_saga_events_saga_id_id ON saga_events (saga_id, id);

v-model/tests/postgres.rs

@@ -15,9 +15,9 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::ops::{Add, Sub};
 use uuid::Uuid;
-use v_api_installer::run_migrations;
 use v_model::{
     NewApiKey, NewApiUser, NewMagicLink, NewMagicLinkAttempt, UserId,
+    migrations::run_migrations,
     schema_ext::MagicLinkAttemptState,
     storage::{
         ApiKeyFilter, ApiKeyStore, ApiUserFilter, ApiUserStore, ListPagination,