diff --git a/cot-macros/src/lib.rs b/cot-macros/src/lib.rs index 56ba13df4..b376c0c0c 100644 --- a/cot-macros/src/lib.rs +++ b/cot-macros/src/lib.rs @@ -90,25 +90,6 @@ pub fn dbtest(_args: TokenStream, input: TokenStream) -> TokenStream { .into() } -/// An attribute macro that defines a custom migration operation. -/// -/// This macro simplifies writing custom migration operations by allowing you to -/// write them as regular `async` functions. It handles the necessary pinning -/// and boxing of the return type to make it compatible with the migration -/// engine. -/// -/// # Examples -/// -/// ``` -/// use cot::db::Result; -/// use cot::db::migrations::{MigrationContext, migration_op}; -/// -/// #[migration_op] -/// async fn my_migration(ctx: MigrationContext<'_>) -> Result<()> { -/// // Your migration logic here -/// Ok(()) -/// } -/// ``` #[proc_macro_attribute] pub fn migration_op(_args: TokenStream, input: TokenStream) -> TokenStream { let fn_input = parse_macro_input!(input as ItemFn); diff --git a/cot-test/src/lib.rs b/cot-test/src/lib.rs index 7224b2405..6c5d09240 100644 --- a/cot-test/src/lib.rs +++ b/cot-test/src/lib.rs @@ -1,3 +1,5 @@ +pub mod utils; + use std::fs; use std::path::PathBuf; use std::sync::{Mutex, MutexGuard, OnceLock}; diff --git a/cot-test/src/utils.rs b/cot-test/src/utils.rs new file mode 100644 index 000000000..d0a124175 --- /dev/null +++ b/cot-test/src/utils.rs @@ -0,0 +1,55 @@ +//! Test utilities + +use std::fmt::Write; + +/// Formats a code snippet for an error message using the style of rustc +/// diagnostics +/// +/// # Example +/// +/// ```text +/// --> migrations.md:201:1 +/// | +/// 201 | Rollback dry run +/// 202 | +/// 203 | Target: +/// 204 | app: customers +/// 205 | migration: m_0001_initial +/// | +/// ``` +#[must_use] +pub fn format_code_snippet( + literal: &str, + file_name: &str, + start_line: usize, + start_col: usize, + max_lines: usize, +) -> String { + const FMT_MSG: &str = "failed to write to string buffer"; + let lines: Vec<&str> = literal.lines().take(max_lines).collect(); + + // Width of the largest line number, for gutter alignment. + let last_line_num = start_line + lines.len().saturating_sub(1); + let gutter_width = last_line_num.to_string().len(); + + let mut out = String::new(); + writeln!( + out, + "{:width$}--> {}:{}:{}\n", + "", + file_name, + start_line, + start_col, + width = gutter_width + 1 + ) + .expect(FMT_MSG); + writeln!(out, "{:gutter_width$} |", "").expect(FMT_MSG); + + for (i, line) in lines.iter().enumerate() { + let line_num = start_line + i; + writeln!(out, "{line_num:gutter_width$} | {line}").expect(FMT_MSG); + } + writeln!(out, "{:gutter_width$} |", "").expect(FMT_MSG); + + out +} diff --git a/cot-test/tests/doc_code_blocks.rs b/cot-test/tests/doc_code_blocks.rs index bef843c68..355b9847a 100644 --- a/cot-test/tests/doc_code_blocks.rs +++ b/cot-test/tests/doc_code_blocks.rs @@ -6,13 +6,28 @@ use std::sync::OnceLock; use comrak::arena_tree::NodeEdge; use comrak::nodes::NodeValue; use comrak::{Arena, parse_document}; -use cot_test::{TestConfig, TestLanguage, get_test_project}; +use cot_test::utils::format_code_snippet; +use cot_test::{TestConfig, TestLanguage, TestLanguageFromStringError, get_test_project}; use libtest_mimic::{Arguments, Failed, Trial}; type TestRunner = fn(&str) -> Result<(), Failed>; static TEST_RUNNERS: OnceLock> = OnceLock::new(); +#[derive(Debug, thiserror::Error)] +#[error( + "{source}\n{}", + format_code_snippet(literal, file_name, *start_line, *start_col, 5) +)] +pub struct CodeBlockError { + #[source] + source: TestLanguageFromStringError, + file_name: String, + literal: String, + start_line: usize, + start_col: usize, +} + fn main() { let args = Arguments::from_args(); @@ -45,13 +60,19 @@ fn main() { } let contents = fs::read_to_string(&path).expect("failed to read md file"); - test_md(&mut trials, file_name, &contents); + if let Err(err) = test_md(&mut trials, file_name, &contents) { + panic!("{err}"); + } } libtest_mimic::run(&args, trials).exit(); } -fn test_md(trials: &mut Vec, file_name: &str, file_contents: &str) { +fn test_md( + trials: &mut Vec, + file_name: &str, + file_contents: &str, +) -> Result<(), CodeBlockError> { let arena = Arena::new(); let mut options = comrak::Options::default(); @@ -75,7 +96,14 @@ fn test_md(trials: &mut Vec, file_name: &str, file_contents: &str) { TestConfig::Default, ) }; - let lang = lang.expect("unknown language"); + + let lang = lang.map_err(|source| CodeBlockError { + source, + file_name: file_name.to_string(), + literal: code_block.literal.clone(), + start_line: node_data.sourcepos.start.line, + start_col: node_data.sourcepos.start.column, + })?; if let Some(runner) = TEST_RUNNERS.get().unwrap().get(&(lang, test_config)) { let literal = if lang == TestLanguage::Rust { @@ -106,6 +134,7 @@ fn test_md(trials: &mut Vec, file_name: &str, file_contents: &str) { } } } + Ok(()) } fn clean_code(code: &str) -> String { diff --git a/cot/src/db/migrations.rs b/cot/src/db/migrations.rs index 1ac4590d1..c9a77a2c5 100644 --- a/cot/src/db/migrations.rs +++ b/cot/src/db/migrations.rs @@ -6,6 +6,25 @@ use std::fmt; use std::fmt::{Debug, Formatter}; use std::future::Future; +/// An attribute macro that defines a custom migration operation. +/// +/// This macro simplifies writing custom migration operations by allowing you to +/// write them as regular `async` functions. It handles the necessary pinning +/// and boxing of the return type to make it compatible with the migration +/// engine. +/// +/// # Examples +/// +/// ``` +/// use cot::db::Result; +/// use cot::db::migrations::{MigrationContext, migration_op}; +/// +/// #[migration_op] +/// async fn my_migration(ctx: MigrationContext<'_>) -> Result<()> { +/// // Your migration logic here +/// Ok(()) +/// } +/// ``` pub use cot_macros::migration_op; use sea_query::{ColumnDef, StringLen}; use thiserror::Error; diff --git a/docs/databases/migrations.md b/docs/databases/migrations.md new file mode 100644 index 000000000..0bd27e536 --- /dev/null +++ b/docs/databases/migrations.md @@ -0,0 +1,221 @@ +--- +title: Migrations +--- + +Migrations are how Cot's ORM keeps your database schema in sync with your Model structs. Think of them as version control for your schema: every time you add a model, add a field, or remove something, you generate a migration file that records exactly what changed. Cot then applies those files, in order, to bring any database (a fresh one, or the one in production) up to date. + +Migration files are plain Rust files. There's no separate DSL to learn and nothing gets serialized to JSON or YAML behind your back. If you can read Rust, you can read a migration. + +## Creating migrations + +Once you've added or changed a struct annotated with [`#[model]`](attr@cot::db::model), run: + +```bash +cot migration make +``` + +Cot compares your current models against the models recorded in the most recent migrations, works out what changed, and writes a new migration file for you. If nothing changed, it will just tell you so and exit without creating anything. + +A few things worth knowing about how this works: + +* The **app name** for a migration is your crate name by default. You can override it with `--app-name` if you'd like, though in most single-crate projects you'll never need to. +* Migrations are generated per crate. If you have a Cargo workspace with multiple crates, each one gets its own `migrations` directory and its own independent history. There's currently no way for a migration in one crate to be generated against models living in another crate in the same workspace. +* By default, migrations are written to the `src/migrations/` directory inside your crate. You can point this elsewhere with `--output-dir` if needed. + +If you want an empty migration to hand-write yourself (useful for data migrations, or anything that isn't a simple schema change), use: + +```bash +cot migration new +``` + +This scaffolds a migration file with `forwards` and `backwards` stubs ready to fill in, rather than trying to auto-detect any model changes. + +## Running migrations + +Migrations are applied automatically whenever your project boots up, so a normal `cargo run` is all it takes. On startup, Cot creates a small internal table called `cot__migrations` (if it doesn't already exist) to keep track of which migrations have already been applied, then walks through your migrations in dependency order and applies anything new. Migrations that are already recorded as applied are skipped, so it's always safe to boot the project again after pulling in new migrations. + +## Listing migrations + +To see what migrations exist across your project, run: + +```bash +cot migration list +``` + +This prints every migration Cot can find, one per line, alongside the app (crate) it belongs to. In a workspace, this walks all member crates. + +## Anatomy of a migration file + +Here's a trimmed down version of what `cot migration make` generates for a simple `Product` model: + +```rust,ignore +//! Create a new table for the Product model. +//! +//! Generated by cot CLI 0.6.0 on 2026-05-26 16:15:49+00:00 + +#[derive(Debug, Copy, Clone)] +pub(super) struct Migration; + +impl ::cot::db::migrations::Migration for Migration { + const APP_NAME: &'static str = "ecommerce"; + const MIGRATION_NAME: &'static str = "m_0001_initial"; + const DEPENDENCIES: &'static [::cot::db::migrations::MigrationDependency] = &[]; + const OPERATIONS: &'static [::cot::db::migrations::Operation] = &[ + ::cot::db::migrations::Operation::create_model() + .table_name(::cot::db::Identifier::new("ecommerce__product")) + .fields(&[ + ::cot::db::migrations::Field::new( + ::cot::db::Identifier::new("id"), + as ::cot::db::DatabaseField>::TYPE, + ) + .auto() + .primary_key(), + ::cot::db::migrations::Field::new( + ::cot::db::Identifier::new("name"), + as ::cot::db::DatabaseField>::TYPE, + ), + ]) + .build(), + ]; +} + +#[derive(::core::fmt::Debug)] +#[::cot::db::model(model_type = "migration")] +struct _Product { + #[model(primary_key)] + id: cot::db::Auto, + name: cot::db::LimitedString<255>, +} +``` + +Every migration is just a unit struct that implements the [`Migration`](trait@cot::db::migrations::Migration) trait, made up of four consts: + +* **`APP_NAME`**: the app (crate) this migration belongs to. This, together with `MIGRATION_NAME`, is what Cot uses to identify a migration uniquely. +* **`MIGRATION_NAME`**: the migration's own name, matching the file name minus the extension (for example `m_0001_initial`). By convention, auto-generated names after the first one look like `m_0002_auto_20260527_004236`, a sequence number followed by a timestamp. Migrations created with `cot migration new my_name` instead get `m_0002_my_name`. +* **`DEPENDENCIES`**: a list of other migrations (including those in other apps) that must run before this one. See [Dependencies](#dependencies) below. +* **`OPERATIONS`**: the actual list of schema changes this migration performs, applied in order. See [Operations](#operations) below. + +You'll also notice a second struct below the `Migration` impl, prefixed with an underscore (`_Product` above). This is a snapshot of the model as it looked at the time this migration was generated, marked with `model_type = "migration"`. Cot uses these snapshots to work out what changed the next time you run `cot migration make`, by diffing your current models against the latest snapshot on record. It's also the struct you should reach for if you need typed access to this model inside a custom operation, See [Using models inside custom operations](#using-models-inside-custom-operations) below for more on this. . + +### The `migrations.rs` module + +Alongside your migration files, Cot maintains a `migrations.rs` module that lists all of them: + +```rust,ignore +//! +//! List of migrations for the current app. +//! +//! Generated by cot CLI 0.6.0 on 2026-05-27 00:42:36+00:00 + +pub mod m_0001_initial; +pub mod m_0002_auto_20260527_004236; + +/// The list of migrations for current app. +pub const MIGRATIONS: &[&::cot::db::migrations::SyncDynMigration] = &[ + &m_0001_initial::Migration, + &m_0002_auto_20260527_004236::Migration, +]; +``` + +This file is regenerated in full every time you run `cot migration make` or `cot migration new`, so treat it as generated code. It's what your [`App::migrations`](trait@cot::project::App#method.migrations) implementation typically returns. + +## Operations + +An [`Operation`](struct@cot::db::migrations::Operation) describes one schema change, and knows how to apply itself both [`forward`](struct@cot::db::migrations::Operation#method.forwards) (when migrating) and [`backwards`](struct@cot::db::migrations::Operation#method.backwards) (when rolling back). You'll rarely construct these by hand since `cot migration make` does it for you, but it's useful to know the shape, especially if you're writing a custom migration. + +For example, adding a field to an existing table: + +```rust +# use cot::db::migrations::{Operation, Field}; +# use cot::db::{DatabaseField, Identifier}; +const OPERATION: Operation = Operation::add_field() + .table_name(Identifier::new("customers__product")) + .field(Field::new(Identifier::new("sku"), ::TYPE).unique()) + .build(); +``` + +Besides [`add_field`](struct@cot::db::migrations::Operation#method.add_field), Cot ships builders for creating a model, removing a field, and removing a model. See the [`Operation`](struct@cot::db::migrations::Operation) for the full list of supported operations. + +### Custom operations + +Sometimes a schema change isn't expressible with the built-in operations above, or you need to run a data migration alongside a schema one. For that, there's [`Operation::custom`](struct@cot::db::migrations::Operation#method.custom): + +```rust +use cot::db::Result; +use cot::db::migrations::{MigrationContext, Operation, migration_op}; + +#[migration_op] +async fn forwards(ctx: MigrationContext<'_>) -> Result<()> { + // run whatever queries you need against ctx.db + Ok(()) +} + +#[migration_op] +async fn backwards(ctx: MigrationContext<'_>) -> Result<()> { + // undo it + Ok(()) +} + +const OPERATION: Operation = Operation::custom(forwards).backwards(backwards).build(); +``` + +The [`#[migration_op]`](attr@cot::db::migrations::migration_op) macro just takes care of the boilerplate needed to match the function signature Cot expects. `backwards` is optional. If you skip it and someone later tries to roll this migration back, Cot will simply return an error saying the backwards migration isn't implemented, rather than silently doing nothing. + +#### Using models inside custom operations + +When you query a model inside `forwards` or `backwards` operation functions, use the migration Model (annotated with `model_type = "migration"` in the migration file), not the live one from your crate (eg. `crate::Product`). Migrations replay in order on every fresh database, so at the point this migration runs, later migrations haven't happened yet. The live model may already have fields the table doesn't have at this stage, which can fail outright, or worse, write bad data without failing at all. The migration model always matches the table as it actually looked at this point in history. + +## Dependencies + +Migrations within the same app are always applied in the order their names sort in (which is why the auto-generated names are zero-padded and sequential). Across apps, or whenever ordering needs to be more explicit than that, you can add entries to `DEPENDENCIES`: + +* **[`MigrationDependency::migration`](struct@cot::db::migrations::MigrationDependency#method.migration)**, for depending on a specific migration in a specific app being applied first. +* **[`MigrationDependency::model`](struct@cot::db::migrations::MigrationDependency#method.model)**, for depending on whichever migration created a given model, without needing to know or hardcode its exact name. + +You'll see `cot migration make` add these automatically whenever a new foreign key points at a model that isn't being created in the very same migration. That's the most common reason you'd end up depending on another app: a `ForeignKey` field pointing at a model whose migration lives elsewhere. + +If Cot ever detects a cycle in your migration dependencies, it will refuse to run and tell you so, both when generating new migrations and when booting the project. + +## Rolling back migrations + +Rolling back migrations runs through your compiled project binary in the target dir, not the `cot` CLI: + +```bash +./path/to/binary migration rollback [--app ] [--dry-run] +``` + +`` can be given a few different ways: + +* The full migration name, e.g. `m_0002_add_sku` +* Just the number, e.g. `0002` +* The special value `zero`, meaning "roll back everything for this app" + +`--app` defaults to your crate name, the same as `APP_NAME` in your migrations. Rolling back to a specific migration is **exclusive**: that migration itself stays applied, and everything after it gets undone. + +Rollbacks aren't limited to a single app either. If another app has a migration that depends on one of the migrations you're rolling back (say, through a foreign key), that dependent migration gets rolled back too, so you're never left with a dangling reference. Migrations that were never applied in the first place are simply skipped. + +Because rolling back can have a wider blast radius than expected once cross-app dependencies are involved, it's worth checking first with the `--dry-run` flag which shows a preview of what migrations will be undone: + +```bash +./target/debug/binary migration rollback --dry-run +``` + +This prints the exact rollback plan without touching your database at all, something like: + +```bash +Rollback dry run + +Target: + app: customers + migration: m_0001_initial + mode: zero (all migrations in app rolled back) + +Rollback plan: + 1. customers::m_0002_auto_20260527_004236 + 2. customers::m_0001_initial + +Summary: + to roll back: 2 + skipped: 0 + database changes: none +``` diff --git a/docs/site/src/main.rs b/docs/site/src/main.rs index 3a93106a0..d59f2c3ac 100644 --- a/docs/site/src/main.rs +++ b/docs/site/src/main.rs @@ -43,6 +43,7 @@ impl Project for CotSiteProject { pages: vec![ md_page!("databases/overview"), md_page!("databases/queries"), + md_page!("databases/migrations"), ], }, GuideItem::Page(md_page!("admin-panel")),