feat: ADR-0035 4a.3 — table-level / multi-column CHECK

Add table-level CHECK (e.g. `CREATE TABLE t (a int, b int, CHECK (a < b))`)
to advanced-mode SQL CREATE TABLE. Since SQLite exposes no PRAGMA for CHECK
constraints, a table-level CHECK cannot be read back from the engine and
becomes the source of truth in a new internal metadata table
`__rdbms_playground_table_checks (table_name, seq, check_expr)`.

- Grammar: new TABLE_CHECK element in ELEMENT_CHOICES.
- Builder: distinguishes a table-level CHECK from a column-level one by
  element position (no column-def open in the element), using depth-aware
  boundary tracking so a length-arg comma (`numeric(10,2)`) or a
  table-PRIMARY KEY's inner comma is not mistaken for an element separator.
- Worker: do_create_table emits the CHECK clauses and writes the metadata
  rows in its transaction; schema_to_ddl emits them identically on rebuild;
  read_schema / read_schema_snapshot read them from the metadata table;
  do_drop_table clears them.
- Persistence: TableSchema.check_constraints round-trips through project.yaml
  (#[serde(default)], optional on read), mirroring unique_constraints.
- Composite UNIQUE deliberately stays PRAGMA-detected (engine-reportable,
  unlike CHECK) — user-confirmed.

DA/runda round added cross-cutting tests and a forward-looking doc fix:
- table CHECK survives a rebuild triggered by `add column`, and a later
  rebuild_from_text (the ADR-0013 rebuild primitive uses a raw DROP, so the
  metadata rows keyed on the final name are preserved);
- dropping a column a table CHECK references fails cleanly (rollback, table
  intact); detection is 4e, friendly wording is H1;
- dropping a table clears its CHECK metadata (no orphan rows on re-create);
- amended ADR §6 so 4h's RENAME also updates the new metadata table.

20 Tier-3 + 9 grammar/builder + 2 YAML tests. Docs: ADR-0035 Status/§13/§6,
README index, requirements.md Q1. Help/usage skeleton + describe display of
table-level constraints deferred to 4i (symmetric with 4a.2).

Tests: 1769 passing, 0 failing, 1 ignored. Clippy clean.
This commit is contained in:
claude@clouddev1
2026-05-25 14:06:52 +00:00
parent 1991fb4fc7
commit 60111f69d5
12 changed files with 899 additions and 39 deletions
+34 -19
View File
@@ -3,10 +3,12 @@
## Status ## Status
Accepted. Design agreed with the user (2026-05-24); the approach is Accepted. Design agreed with the user (2026-05-24); the approach is
**validated end-to-end by sub-phase 4a** (`CREATE TABLE`, implemented **validated end-to-end by sub-phases 4a / 4a.2 / 4a.3** (`CREATE TABLE`
2026-05-25 — plan `docs/plans/20260524-adr-0035-sql-ddl-4a.md`), so the with column- and table-level constraints, implemented 2026-05-25 —
decision is accepted while the remaining sub-phases (**4a.2, 4b4i**, plans `docs/plans/20260524-adr-0035-sql-ddl-4a.md`,
§13) continue. This is **Phase 4** of the ADR-0030 roadmap (the `…-4a2.md`, `…-4a3.md`), so the decision is accepted while the remaining
sub-phases (**4b4i**, §13) continue. This is **Phase 4** of the
ADR-0030 roadmap (the
advanced-mode SQL surface), the peer of ADR-0031 (expression grammar), advanced-mode SQL surface), the peer of ADR-0031 (expression grammar),
ADR-0032 (`SELECT`), and ADR-0033 (DML). It **clarifies ADR-0030 §4** ADR-0032 (`SELECT`), and ADR-0033 (DML). It **clarifies ADR-0030 §4**
on how DDL is represented and executed. on how DDL is represented and executed.
@@ -201,10 +203,12 @@ is no simple-mode rename-table verb. It needs a genuinely new
low-level operation (none exists today): within one transaction, low-level operation (none exists today): within one transaction,
rename the table in the database, rename its `data/<table>.csv` file, rename the table in the database, rename its `data/<table>.csv` file,
and update every metadata row that names it — the column-metadata and update every metadata row that names it — the column-metadata
rows, and **both ends of any relationship** in rows, **both ends of any relationship** in
`__rdbms_playground_relationships` that references the old name. Name `__rdbms_playground_relationships` that references the old name, and
validation and `__rdbms_*` rejection apply to the target. This closes **the table-level CHECK rows** in `__rdbms_playground_table_checks`
the rename half of `C1` for the advanced surface. (added in 4a.3; keyed by `table_name`). Name validation and
`__rdbms_*` rejection apply to the target. This closes the rename half
of `C1` for the advanced surface.
### 7. Column type conversion — one engine, mode-appropriate policy ### 7. Column type conversion — one engine, mode-appropriate policy
@@ -332,23 +336,34 @@ ADR-0033's structure:
field, detected on read via the UNIQUE-constraint index field, detected on read via the UNIQUE-constraint index
(`PRAGMA index_list` origin `u`), round-tripped through YAML, with (`PRAGMA index_list` origin `u`), round-tripped through YAML, with
save/load/rebuild tests. save/load/rebuild tests.
- **4a.3 — Table-level / multi-column `CHECK(…)`.** Split from 4a.2 - **4a.3 — Table-level / multi-column `CHECK(…)`.** *(Implemented
(2026-05-25, user-confirmed) because SQLite exposes **no PRAGMA for 2026-05-25 — plan `docs/plans/20260525-adr-0035-sql-ddl-4a3.md`.)*
CHECK constraints**, so a table-level CHECK cannot be read back from Split from 4a.2 (2026-05-25, user-confirmed) because SQLite exposes
the engine and needs a **new `__rdbms_*` metadata table** as its **no PRAGMA for CHECK constraints**, so a table-level CHECK cannot be
source of truth (the ADR-0012/0013 pattern) — a distinct read back from the engine and needs a **new `__rdbms_*` metadata
architectural step. Until 4a.2/4a.3 land, 4a rejects these forms table** as its source of truth (the ADR-0012/0013 pattern) — a
"not yet supported". (The general rule: a DDL feature needs new distinct architectural step. Landed as
model/execution work only when it introduces a structure simple mode `__rdbms_playground_table_checks (table_name, seq, check_expr)`; the
could never produce, or an expression the structural helper cannot builder distinguishes a table-level CHECK from a column-level one by
consume — cf. the `UNIQUE`-index flag in 4d and the rename op in 4h.) element position (no column-def open). Composite `UNIQUE` deliberately
stays PRAGMA-detected (engine-reportable, unlike CHECK). (The general
rule: a DDL feature needs new model/execution work only when it
introduces a structure simple mode could never produce, or an
expression the structural helper cannot consume — cf. the
`UNIQUE`-index flag in 4d and the rename op in 4h.)
- **4b — Foreign keys in `CREATE TABLE`.** Inline `REFERENCES` + - **4b — Foreign keys in `CREATE TABLE`.** Inline `REFERENCES` +
table-level `FOREIGN KEY` → relationship metadata, one undo step. table-level `FOREIGN KEY` → relationship metadata, one undo step.
- **4c — `DROP TABLE [IF EXISTS]`** → `SqlDropTable` (cascade parity; - **4c — `DROP TABLE [IF EXISTS]`** → `SqlDropTable` (cascade parity;
`IF EXISTS` no-op-with-note, §4). `IF EXISTS` no-op-with-note, §4).
- **4d — `CREATE [UNIQUE] INDEX` / `DROP INDEX`** → `SqlCreateIndex` - **4d — `CREATE [UNIQUE] INDEX` / `DROP INDEX`** → `SqlCreateIndex`
/ `SqlDropIndex` (ADR-0025; the `UNIQUE` flag extension if needed). / `SqlDropIndex` (ADR-0025; the `UNIQUE` flag extension if needed).
- **4e — `ALTER TABLE` add/drop/rename column.** - **4e — `ALTER TABLE` add/drop/rename column.** Drop/rename column
must guard against a **table-level CHECK that references the column**
(4a.3): today the rebuild rejects it cleanly via the engine (the
rebuilt table's `CHECK` names a missing column), leaving the table
intact — 4e adds the up-front detection (parsing column references
out of the raw CHECK text in `__rdbms_playground_table_checks`) so the
refusal is deliberate; the friendly wording itself is **H1** work.
- **4f — `ALTER TABLE … ALTER COLUMN TYPE`** (the §7 conversion - **4f — `ALTER TABLE … ALTER COLUMN TYPE`** (the §7 conversion
model + the lossy-with-note path). model + the lossy-with-note path).
- **4g — `ALTER TABLE` add/drop constraint, add foreign key.** - **4g — `ALTER TABLE` add/drop constraint, add foreign key.**
+1 -1
View File
File diff suppressed because one or more lines are too long
+256
View File
@@ -0,0 +1,256 @@
# Plan: ADR-0035 Phase 4, sub-phase 4a.3 — table-level / multi-column `CHECK`
The constraint slice's second (and final) half. Adds, to advanced-mode
SQL `CREATE TABLE`, the one constraint that needs a **new `__rdbms_*`
metadata table**: a **table-level `CHECK (<expr>)`** that can reference
several columns, e.g. `CREATE TABLE t (a int, b int, CHECK (a < b))`.
SQLite exposes **no PRAGMA for CHECK constraints**, so a table-level
CHECK cannot be read back from the engine and must live in metadata as
its source of truth (the ADR-0012/0013 pattern). Builds directly on the
4a/4a.2 `SqlCreateTable` command + grammar.
## 1. Baseline
- Tests: **1752 passing, 0 failing, 0 skipped, 1 ignored** (the
`friendly/mod.rs` ` ```ignore ` doctest); clippy clean
(`cargo clippy --all-targets -- -D warnings`). Branch `main`, last
commit `1991fb4` (handoff-37). 4a.3 starts here.
## 2. Decisions locked with the user (do not re-litigate)
1. **New metadata table — `__rdbms_playground_table_checks`** (user
confirmed 2026-05-25), focused/minimal, purpose-named like the
existing metadata tables:
```sql
__rdbms_playground_table_checks (
table_name TEXT NOT NULL,
seq INT NOT NULL, -- declaration order
check_expr TEXT NOT NULL,
PRIMARY KEY (table_name, seq)
) STRICT;
```
It is the **source of truth** for table-level CHECKs; `read_schema`
reads them from here, not PRAGMA. Auto-filtered from `list_tables`
by the `__rdbms_` prefix. A constraint `name` column is **not** added
now — 4g's `ADD CONSTRAINT <name>` will add it when actually needed.
2. **Composite `UNIQUE` stays PRAGMA-detected** (user confirmed,
2026-05-25): the PRAGMA/metadata split is principled — engine-
reportable (UNIQUE, PK, FK, indexes) → PRAGMA; not reportable (CHECK,
column + table) → metadata. No churn to shipped 4a.2 code.
3. **Stored as raw SQL text**, like 4a.2's column CHECK: `sql_expr` is
validate-only (no `Expr` AST), so the builder captures the inner
expression text by byte span via `capture_parenthesised_span`.
4. **One undo step**; structural execution reuses `do_create_table`,
which writes the metadata rows inside its existing transaction.
5. **FK stays rejected** (4b). Only the table-level CHECK shape is
lifted from the 4a "not yet supported" parse rejection.
## 3. Phase 1 — Requirements checklist (4a.3)
### Functional
- [ ] Table element `CHECK (<sql_expr>)` parses (advanced mode), in any
position among the elements, accepting the full `sql_expr` surface.
- [ ] The builder distinguishes a **table-level** CHECK (no column-def
open in the current element) from a **column-level** CHECK (after a
column's type — 4a.2, unchanged). Depth-aware element-boundary
detection (§4.2).
- [ ] Multiple table-level CHECKs in one statement, preserved in
declaration order (the `seq` column).
- [ ] A table-level CHECK is **enforced** by the engine (a violating
insert fails) and **survives a rebuild** (the part-D proof).
- [ ] The 4a/4a.2 "table-level CHECK not yet supported" parse-rejection
is **lifted**; **FK stays rejected** (4b).
- [ ] Engine-neutral errors; `STRICT` preserved; one undo step.
### Cross-cutting / round-trip
- [ ] A table with one or more table-level CHECKs survives save → load
→ rebuild (DDL + enforcement). The new metadata table is the source
of truth on read; `schema_to_ddl` re-emits the clauses on rebuild.
- [ ] `project.yaml` round-trips the CHECKs
(`TableSchema.check_constraints`, YAML `#[serde(default)]`, optional
on read — mirrors `unique_constraints`).
- [ ] `history.log` / replay unchanged (part of the same `create`
write command).
### Testing (ADR-0008 four tiers)
- [ ] **Tier 1** (builder, `sql_create_table.rs`): table CHECK captured
verbatim, distinct from a column CHECK; multiple table CHECKs ordered;
table CHECK after a length-arg column + column CHECK (the depth probe);
table CHECK after a table-level PK/UNIQUE; nested parens balanced;
FK still rejected (update `table_level_check_and_fk_still_rejected`).
- [ ] **Tier 3** (`tests/sql_create_table.rs`): worker round-trip —
table CHECK enforced (violating insert fails), **survives rebuild**;
multiple CHECKs all enforced.
- [ ] **YAML round-trip unit test** for the metadata field.
## 4. Architecture & design
### 4.1 Grammar (`src/dsl/grammar/sql_create_table.rs`)
Add a table-level CHECK element, mirroring `TABLE_UNIQUE`:
```rust
static TABLE_CHECK_NODES: &[Node] = &[
Node::Word(Word::keyword("check")),
Node::Punct('('),
Node::Subgrammar(&sql_expr::SQL_OR_EXPR),
Node::Punct(')'),
];
const TABLE_CHECK: Node = Node::Seq(TABLE_CHECK_NODES);
```
Extend `ELEMENT_CHOICES`:
`&[TABLE_PK, TABLE_UNIQUE, TABLE_CHECK, COLUMN_DEF]`. Order note: a
column literally named `check` is already unavailable (it is a keyword
in the column-constraint set); `TABLE_CHECK` before `COLUMN_DEF` keeps
the table-level form winning at element start. (`COLUMN_DEF`'s own
`CHECK` lives inside `COL_CONSTRAINT_SUFFIX`, so the two never compete
for the same position.)
### 4.2 Builder distinguisher (the load-bearing mechanism)
`MatchedKind::Word` carries **no role or node provenance** (only
`Ident` carries `role`), so the table-level and column-level `check`
keywords are indistinguishable by kind. Distinguish by **element
position**, depth-aware:
- Track `depth` over the top-level item stream: `+1` on each `Punct('(')`
that reaches the loop, `-1` on each `Punct(')')`. The column-list
interior is `depth == 1`. (Parens consumed inside the `check` /
`default` capture helpers and the table-`unique` sub-loop never reach
the loop, so they don't perturb `depth`; the outer list parens, type
length-args `(10, 2)`, and table-`PRIMARY KEY (a, b)` parens **do**,
and balance.)
- Track `column_open: bool` — set `true` when a `col_type` / `double`
finalises a column; reset `false` on a `Punct(',')` at `depth == 1`
(an element separator).
- On `MatchedKind::Word("check")`: capture the parenthesised span as
today; then **route by `column_open`** — `true` → column-level
(`columns.last_mut().check_sql`, 4a.2 behaviour); `false` →
table-level (push raw text onto `check_constraints`).
This is **verified by probe tests**, not reasoning — in particular the
`a numeric(10,2) check (a>0)` case (a naive "reset on any comma" would
misclassify it because the length-arg comma is at `depth == 2`).
The capture for a table-level CHECK reuses `capture_parenthesised_span`
(`src/dsl/grammar/ddl.rs`) unchanged — `CHECK ( … )` is paren-bounded.
### 4.3 Command AST (`src/dsl/command.rs`)
`Command::SqlCreateTable` gains `check_constraints: Vec<String>` (raw
inner SQL texts, declaration order), peer to `unique_constraints`.
### 4.4 Worker / DDL — both generators in lockstep (`src/db.rs`)
The two DDL generators **must** emit the table CHECK clauses
identically (the §6.1 rule; the 4a `serial` bug is the cautionary tale):
- **`do_create_table`** gains a `check_constraints: &[String]` param;
emits `, CHECK (expr)` table clauses (after composite UNIQUE, before
`STRICT`), and **writes the `__rdbms_playground_table_checks` rows**
(one per CHECK, `seq` = index) inside its existing transaction.
- **`schema_to_ddl`** emits the same clauses from
`ReadSchema.check_constraints`.
- **`configure_connection`** creates the new metadata table alongside
the existing `__rdbms_*` tables.
- **`read_schema`** + **`read_schema_snapshot`** read the CHECKs from
the metadata table (ordered by `seq`) into `ReadSchema` /
`SchemaSnapshot` (→ `TableSchema.check_constraints`).
- **`Request::SqlCreateTable`** dispatch passes the new field through to
`do_create_table`; `snapshot_then` wrapping unchanged (one undo step).
- A table drop / rebuild must clear/repopulate the metadata rows — verify
the existing drop path clears `__rdbms_*` rows for the table (it does
for columns/relationships); extend it to the new table.
### 4.5 Persistence round-trip
- `TableSchema.check_constraints: Vec<String>` (`src/persistence/mod.rs`).
- `RawTable.check_constraints` with `#[serde(default)]`;
`write_table` emits only when non-empty; `parse_schema` maps it —
all mirroring `unique_constraints` exactly.
### 4.6 Friendly catalog / keys
Update the `ddl.sql_create_table` help body and
`parse.usage.sql_create_table` usage skeleton to show the table-level
`CHECK (…)` form. No new keys expected (the parse error for a still-
rejected shape reuses existing keys); if any new diagnostic key is
added, keep `keys.rs` ↔ `en-US.yaml` in lockstep (the validator test)
and engine-neutral (the vocab audit).
## 5. Out of 4a.3 scope
- FK (4b); `DROP` (4c); indexes (4d); `ALTER` (4e4h).
- `CONSTRAINT <name> CHECK (…)` (named constraints) → 4g (adds a `name`
column to the metadata table then).
## 6. Open items / implementer calls
1. **Builder distinguisher** (§4.2) — depth-aware; settle by the probe
tests in step 2 before relying on it.
2. **Drop / rebuild cleanup of the new metadata rows** — confirm by
test that dropping (and rebuilding) a table leaves no orphan CHECK
rows and repopulates correctly.
3. **CHECK column-validation at create time** — table CHECKs reference
columns being defined (not yet in the schema cache); confirm by test
they raise no spurious unknown-column `[ERR]` (mirror the 4a.2
column-CHECK finding; it was fine there).
## 7. Devil's Advocate review of this plan
- **Why a new table at all — is CHECK really unreportable?** Yes;
SQLite has no PRAGMA for CHECK (column or table). 4a.2's *column*
CHECK only round-tripped because it was already stored in
`__rdbms_playground_columns.check_expr` for the same reason. A
table-level CHECK has no column to hang on, hence the new table. ✓
- **Two DDL generators in sync?** The plan emits the CHECK clauses in
**both** `do_create_table` and `schema_to_ddl` and adds a
survives-rebuild test — the exact safety net the 4a `serial` drift
proved necessary. ✓
- **Distinguisher robust?** The naive comma reset is explicitly
rejected (length-arg / table-PK inner commas); depth-aware detection
is probe-tested, including the `numeric(10,2) check(...)` trap. ✓
- **Silent scope creep?** FK stays rejected (4b); named CHECK is 4g;
composite UNIQUE deliberately stays on PRAGMA (user-confirmed). ✓
- **Round-trip detectable on read?** The metadata table is read by both
`read_schema` and `read_schema_snapshot`; YAML mirrors
`unique_constraints`. ✓
- **Tests first?** §8 orders failing tests before code at every step. ✓
## 8. Implementation sequence (test-first)
1. **Builder probe + Tier-1** — write the distinguisher tests (table
CHECK captured + ordered; the `numeric(10,2) check(...)` depth trap;
table CHECK after table PK/UNIQUE; nested parens; column CHECK still
column-level; update `table_level_check_and_fk_still_rejected` so
table CHECK is accepted and **FK stays rejected**) → red → add
`TABLE_CHECK` grammar + the depth-aware builder branch +
`Command.check_constraints` → green. *(Compiles once the worker
dispatch threads the new field; steps 12 land together.)*
2. **Worker + metadata table** — write Tier-3 (`tests/sql_create_table.rs`):
table CHECK enforced (violating insert fails); multiple CHECKs; the
metadata rows present → red → add `__rdbms_playground_table_checks`
in `configure_connection`, the `do_create_table` emission + metadata
writes, the `read_schema` / `read_schema_snapshot` reads, and the
drop-path cleanup → green.
3. **Round-trip** — extend `TableSchema` + YAML + `schema_to_ddl` →
Tier-3 survives-rebuild test + a YAML round-trip unit test → green.
4. **Catalog** — update help/usage bodies; run
`keys_validate_against_catalog` + the vocab audit → green.
5. **Full sweep** — `cargo test` (no regressions from 1752) +
`cargo clippy --all-targets -- -D warnings`.
6. **Docs** — ADR §13 already records 4a.3; update `requirements.md`
Q1 note; flip nothing (ADR already Accepted). Propose the commit
message; wait for approval.
## 9. Exit gate
- All §3 checklist items satisfied; four tiers green, zero skips; no
regression from the 1752 baseline; written DA pass on the delivered
slice; clippy clean.
+5 -3
View File
@@ -218,9 +218,11 @@ handoff-14 cleanup; 449 after B2/C2.)
`CREATE TABLE` (ADR-0035, 2026-05-25 — executed structurally: columns `CREATE TABLE` (ADR-0035, 2026-05-25 — executed structurally: columns
+ types + `NOT NULL`/`UNIQUE`/`PRIMARY KEY` + `IF NOT EXISTS` (4a), + types + `NOT NULL`/`UNIQUE`/`PRIMARY KEY` + `IF NOT EXISTS` (4a),
then per-column `DEFAULT`/`CHECK` (raw `sql_expr` text) and composite then per-column `DEFAULT`/`CHECK` (raw `sql_expr` text) and composite
`UNIQUE(a,b)` (4a.2)). Remaining DDL — table-level/multi-column `UNIQUE(a,b)` (4a.2), then table-level/multi-column `CHECK` (4a.3 —
`CHECK` (4a.3), FK (4b), `DROP TABLE` (4c), indexes (4d), round-trips via the new `__rdbms_playground_table_checks` metadata
`ALTER TABLE` (4e4h) — is phased per ADR-0035 §13.)* table, since the engine reports no CHECK constraints)). Remaining DDL
— FK (4b), `DROP TABLE` (4c), indexes (4d), `ALTER TABLE` (4e4h) —
is phased per ADR-0035 §13.)*
- [ ] **Q2** Non-standard syntax rejected with a clear message - [ ] **Q2** Non-standard syntax rejected with a clear message
pointing at the supported subset. pointing at the supported subset.
*(Design done — ADR-0030 §8: out-of-subset statements are *(Design done — ADR-0030 §8: out-of-subset statements are
+92
View File
@@ -466,6 +466,7 @@ enum Request {
columns: Vec<ColumnSpec>, columns: Vec<ColumnSpec>,
primary_key: Vec<String>, primary_key: Vec<String>,
unique_constraints: Vec<Vec<String>>, unique_constraints: Vec<Vec<String>>,
check_constraints: Vec<String>,
if_not_exists: bool, if_not_exists: bool,
source: Option<String>, source: Option<String>,
reply: oneshot::Sender<Result<CreateOutcome, DbError>>, reply: oneshot::Sender<Result<CreateOutcome, DbError>>,
@@ -829,12 +830,14 @@ impl Database {
/// Advanced-mode SQL `CREATE TABLE` (ADR-0035 §1, 4a). Executes /// Advanced-mode SQL `CREATE TABLE` (ADR-0035 §1, 4a). Executes
/// structurally; returns whether the table was created or skipped /// structurally; returns whether the table was created or skipped
/// (the `IF NOT EXISTS` no-op, ADR-0035 §4). /// (the `IF NOT EXISTS` no-op, ADR-0035 §4).
#[allow(clippy::too_many_arguments)]
pub async fn sql_create_table( pub async fn sql_create_table(
&self, &self,
name: String, name: String,
columns: Vec<ColumnSpec>, columns: Vec<ColumnSpec>,
primary_key: Vec<String>, primary_key: Vec<String>,
unique_constraints: Vec<Vec<String>>, unique_constraints: Vec<Vec<String>>,
check_constraints: Vec<String>,
if_not_exists: bool, if_not_exists: bool,
source: Option<String>, source: Option<String>,
) -> Result<CreateOutcome, DbError> { ) -> Result<CreateOutcome, DbError> {
@@ -844,6 +847,7 @@ impl Database {
columns, columns,
primary_key, primary_key,
unique_constraints, unique_constraints,
check_constraints,
if_not_exists, if_not_exists,
source, source,
reply, reply,
@@ -1411,6 +1415,12 @@ const REL_TABLE: &str = "__rdbms_playground_relationships";
/// `created_at`. Created on first connect and only ever /// `created_at`. Created on first connect and only ever
/// written by us; the user never touches it directly. /// written by us; the user never touches it directly.
const META_PROJECT_TABLE: &str = "__rdbms_playground_meta"; const META_PROJECT_TABLE: &str = "__rdbms_playground_meta";
/// Table-level `CHECK (<expr>)` constraints (ADR-0035 §4a.3). The
/// engine exposes no PRAGMA for CHECK constraints, so — unlike UNIQUE /
/// PK / FK, which are read back from PRAGMA — a table-level CHECK has no
/// engine-readable home and this table is its source of truth. One row
/// per CHECK, ordered by `seq` (declaration order).
const CHECK_TABLE: &str = "__rdbms_playground_table_checks";
fn configure_connection(conn: &Connection) -> Result<(), rusqlite::Error> { fn configure_connection(conn: &Connection) -> Result<(), rusqlite::Error> {
conn.execute_batch(&format!( conn.execute_batch(&format!(
@@ -1432,6 +1442,12 @@ fn configure_connection(conn: &Connection) -> Result<(), rusqlite::Error> {
on_update TEXT NOT NULL,\n\ on_update TEXT NOT NULL,\n\
PRIMARY KEY (child_table, child_column)\n\ PRIMARY KEY (child_table, child_column)\n\
) STRICT;\n\ ) STRICT;\n\
CREATE TABLE IF NOT EXISTS {CHECK_TABLE} (\n\
table_name TEXT NOT NULL,\n\
seq INTEGER NOT NULL,\n\
check_expr TEXT NOT NULL,\n\
PRIMARY KEY (table_name, seq)\n\
) STRICT;\n\
CREATE TABLE IF NOT EXISTS {META_PROJECT_TABLE} (\n\ CREATE TABLE IF NOT EXISTS {META_PROJECT_TABLE} (\n\
key TEXT NOT NULL PRIMARY KEY,\n\ key TEXT NOT NULL PRIMARY KEY,\n\
value TEXT NOT NULL\n\ value TEXT NOT NULL\n\
@@ -1691,6 +1707,7 @@ fn handle_request(
&columns, &columns,
&primary_key, &primary_key,
&[], &[],
&[],
)); ));
} }
Request::SqlCreateTable { Request::SqlCreateTable {
@@ -1698,6 +1715,7 @@ fn handle_request(
columns, columns,
primary_key, primary_key,
unique_constraints, unique_constraints,
check_constraints,
if_not_exists, if_not_exists,
source, source,
reply, reply,
@@ -1726,6 +1744,7 @@ fn handle_request(
&columns, &columns,
&primary_key, &primary_key,
&unique_constraints, &unique_constraints,
&check_constraints,
) )
.map(CreateOutcome::Created) .map(CreateOutcome::Created)
}); });
@@ -2324,6 +2343,7 @@ fn read_schema_snapshot(conn: &Connection) -> Result<SchemaSnapshot, DbError> {
primary_key: read.primary_key.clone(), primary_key: read.primary_key.clone(),
columns, columns,
unique_constraints: read.unique_constraints.clone(), unique_constraints: read.unique_constraints.clone(),
check_constraints: read.check_constraints.clone(),
}); });
} }
@@ -2569,6 +2589,7 @@ fn read_schema_for_specs(columns: &[ColumnSpec], primary_key: &[String]) -> Read
primary_key: primary_key.to_vec(), primary_key: primary_key.to_vec(),
foreign_keys: Vec::new(), foreign_keys: Vec::new(),
unique_constraints: Vec::new(), unique_constraints: Vec::new(),
check_constraints: Vec::new(),
} }
} }
@@ -2606,6 +2627,7 @@ pub enum CreateOutcome {
Skipped(TableDescription), Skipped(TableDescription),
} }
#[allow(clippy::too_many_arguments)]
fn do_create_table( fn do_create_table(
conn: &Connection, conn: &Connection,
persistence: Option<&Persistence>, persistence: Option<&Persistence>,
@@ -2614,6 +2636,7 @@ fn do_create_table(
columns: &[ColumnSpec], columns: &[ColumnSpec],
primary_key: &[String], primary_key: &[String],
unique_constraints: &[Vec<String>], unique_constraints: &[Vec<String>],
check_constraints: &[String],
) -> Result<TableDescription, DbError> { ) -> Result<TableDescription, DbError> {
if columns.is_empty() { if columns.is_empty() {
// SQLite requires at least one column. The DSL grammar // SQLite requires at least one column. The DSL grammar
@@ -2702,6 +2725,17 @@ fn do_create_table(
ddl.push(')'); ddl.push(')');
} }
// Table-level CHECK constraints (ADR-0035 §4a.3), emitted verbatim
// from the captured raw SQL text. Must stay identical to the
// `schema_to_ddl` rebuild path (the §6.1 two-generators rule).
// The engine has no PRAGMA to report these back, so they are also
// recorded in `CHECK_TABLE` (below) as their source of truth.
for expr in check_constraints {
ddl.push_str(", CHECK (");
ddl.push_str(expr);
ddl.push(')');
}
ddl.push_str(") STRICT;"); ddl.push_str(") STRICT;");
debug!(ddl = %ddl, "create_table"); debug!(ddl = %ddl, "create_table");
@@ -2715,6 +2749,18 @@ fn do_create_table(
for (col, check_sql) in columns.iter().zip(&check_sqls) { for (col, check_sql) in columns.iter().zip(&check_sqls) {
insert_column_metadata(&tx, name, &col.name, col.ty, check_sql.as_deref())?; insert_column_metadata(&tx, name, &col.name, col.ty, check_sql.as_deref())?;
} }
// Record table-level CHECKs in their metadata table (the engine
// reports no CHECK constraints, ADR-0035 §4a.3). `seq` preserves
// declaration order so read-back / rebuild re-emit them in order.
for (seq, expr) in check_constraints.iter().enumerate() {
tx.execute(
&format!(
"INSERT INTO {CHECK_TABLE} (table_name, seq, check_expr) VALUES (?1, ?2, ?3);"
),
rusqlite::params![name, seq as i64, expr],
)
.map_err(DbError::from_rusqlite)?;
}
let description = do_describe_table(conn, name)?; let description = do_describe_table(conn, name)?;
let changes = Changes { let changes = Changes {
schema_dirty: true, schema_dirty: true,
@@ -2764,6 +2810,12 @@ fn do_drop_table(
[name], [name],
) )
.map_err(DbError::from_rusqlite)?; .map_err(DbError::from_rusqlite)?;
// Table-level CHECK metadata goes with the table (ADR-0035 §4a.3).
tx.execute(
&format!("DELETE FROM {CHECK_TABLE} WHERE table_name = ?1;"),
[name],
)
.map_err(DbError::from_rusqlite)?;
let changes = Changes { let changes = Changes {
schema_dirty: true, schema_dirty: true,
rewritten_tables: Vec::new(), rewritten_tables: Vec::new(),
@@ -4722,6 +4774,11 @@ struct ReadSchema {
/// read from the UNIQUE-constraint indexes (`origin = 'u'`). /// read from the UNIQUE-constraint indexes (`origin = 'u'`).
/// Single-column UNIQUE rides on `ReadColumn::unique` instead. /// Single-column UNIQUE rides on `ReadColumn::unique` instead.
unique_constraints: Vec<Vec<String>>, unique_constraints: Vec<Vec<String>>,
/// Table-level CHECK constraints as raw SQL text, in declaration
/// order (ADR-0035 §4a.3). The engine reports no CHECK constraints,
/// so these are read from `__rdbms_playground_table_checks` rather
/// than PRAGMA, and echoed verbatim by `schema_to_ddl` on rebuild.
check_constraints: Vec<String>,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@@ -4842,14 +4899,40 @@ fn read_schema(conn: &Connection, table: &str) -> Result<ReadSchema, DbError> {
foreign_keys.push(row.map_err(DbError::from_rusqlite)?); foreign_keys.push(row.map_err(DbError::from_rusqlite)?);
} }
// Table-level CHECK constraints (ADR-0035 §4a.3) come from their
// metadata table, not PRAGMA — the engine reports no CHECKs.
let check_constraints = read_table_checks(conn, table)?;
Ok(ReadSchema { Ok(ReadSchema {
columns, columns,
primary_key, primary_key,
foreign_keys, foreign_keys,
unique_constraints, unique_constraints,
check_constraints,
}) })
} }
/// Read a table's table-level CHECK constraints (ADR-0035 §4a.3) from
/// `CHECK_TABLE`, in declaration order (`seq`). The engine exposes no
/// PRAGMA for CHECK constraints, so this metadata table is their only
/// source of truth.
fn read_table_checks(conn: &Connection, table: &str) -> Result<Vec<String>, DbError> {
let mut stmt = conn
.prepare(&format!(
"SELECT check_expr FROM {CHECK_TABLE} \
WHERE table_name = ?1 ORDER BY seq;"
))
.map_err(DbError::from_rusqlite)?;
let rows = stmt
.query_map([table], |row| row.get::<_, String>(0))
.map_err(DbError::from_rusqlite)?;
let mut out = Vec::new();
for row in rows {
out.push(row.map_err(DbError::from_rusqlite)?);
}
Ok(out)
}
/// Read the user-created indexes on `table` (ADR-0025). /// Read the user-created indexes on `table` (ADR-0025).
/// ///
/// `pragma_index_list` reports every index; we keep only those /// `pragma_index_list` reports every index; we keep only those
@@ -5042,6 +5125,13 @@ fn schema_to_ddl(table: &str, schema: &ReadSchema) -> String {
clauses.push(format!("UNIQUE ({})", idents.join(", "))); clauses.push(format!("UNIQUE ({})", idents.join(", ")));
} }
// Table-level CHECK constraints (ADR-0035 §4a.3) — echoed verbatim
// from the raw SQL stored in the metadata table, emitted identically
// to `do_create_table` (the §6.1 two-generators rule).
for expr in &schema.check_constraints {
clauses.push(format!("CHECK ({expr})"));
}
for fk in &schema.foreign_keys { for fk in &schema.foreign_keys {
clauses.push(format!( clauses.push(format!(
"FOREIGN KEY ({child}) REFERENCES {parent_table}({parent_col}) \ "FOREIGN KEY ({child}) REFERENCES {parent_table}({parent_col}) \
@@ -7504,6 +7594,7 @@ fn build_read_schema(table: &TableSchema, relationships: &[RelationshipSchema])
primary_key: table.primary_key.clone(), primary_key: table.primary_key.clone(),
foreign_keys, foreign_keys,
unique_constraints: table.unique_constraints.clone(), unique_constraints: table.unique_constraints.clone(),
check_constraints: table.check_constraints.clone(),
} }
} }
@@ -11206,6 +11297,7 @@ mod tests {
primary_key: vec!["id".to_string()], primary_key: vec!["id".to_string()],
foreign_keys: vec![], foreign_keys: vec![],
unique_constraints: Vec::new(), unique_constraints: Vec::new(),
check_constraints: Vec::new(),
}; };
let ddl = schema_to_ddl("T", &schema); let ddl = schema_to_ddl("T", &schema);
assert!( assert!(
+5
View File
@@ -148,6 +148,11 @@ pub enum Command {
/// (ADR-0035 §4a.2). Single-column table-level `UNIQUE` is /// (ADR-0035 §4a.2). Single-column table-level `UNIQUE` is
/// folded into the column's `unique` flag instead. /// folded into the column's `unique` flag instead.
unique_constraints: Vec<Vec<String>>, unique_constraints: Vec<Vec<String>>,
/// Table-level `CHECK (<expr>)` constraints, in declaration
/// order, as raw SQL text (ADR-0035 §4a.3). A multi-column
/// CHECK has no column to hang on and the engine reports no
/// CHECKs, so it round-trips via a dedicated metadata table.
check_constraints: Vec<String>,
if_not_exists: bool, if_not_exists: bool,
}, },
/// Add a column to an existing table. The column carries /// Add a column to an existing table. The column carries
+38 -5
View File
@@ -1320,7 +1320,20 @@ fn build_sql_create_table(path: &MatchedPath, source: &str) -> Result<Command, V
let mut columns: Vec<ColumnSpec> = Vec::new(); let mut columns: Vec<ColumnSpec> = Vec::new();
let mut primary_key: Vec<String> = Vec::new(); let mut primary_key: Vec<String> = Vec::new();
let mut unique_constraints: Vec<Vec<String>> = Vec::new(); let mut unique_constraints: Vec<Vec<String>> = Vec::new();
let mut check_constraints: Vec<String> = Vec::new();
let mut pending_name: Option<String> = None; let mut pending_name: Option<String> = None;
// Distinguish a table-level `CHECK (…)` from a column-level one
// (ADR-0035 §4a.3): both are spelled `check (`, and `Word` matches
// carry no role, so position is the only signal. `column_open` is
// `true` while a column definition is accepting constraints in the
// current element; a `check` seen while it is `false` is table-level.
// `depth` tracks the parens that reach this loop (the outer column
// list, type length-args `(10, 2)`, and table-`PRIMARY KEY (a, b)` —
// the `check`/`default`/table-`unique` arms consume their own parens
// internally, so they never perturb it). An element separator is a
// comma at the column-list interior, `depth == 1`.
let mut column_open = false;
let mut depth = 0usize;
let mut items = path.items.iter().peekable(); let mut items = path.items.iter().peekable();
while let Some(item) = items.next() { while let Some(item) = items.next() {
match &item.kind { match &item.kind {
@@ -1336,6 +1349,7 @@ fn build_sql_create_table(path: &MatchedPath, source: &str) -> Result<Command, V
})?; })?;
let col_name = pending_name.take().ok_or_else(sql_col_type_without_name)?; let col_name = pending_name.take().ok_or_else(sql_col_type_without_name)?;
columns.push(ColumnSpec::new(col_name, ty)); columns.push(ColumnSpec::new(col_name, ty));
column_open = true;
} }
// `double precision` — the two-word alias maps to `real`. // `double precision` — the two-word alias maps to `real`.
// The grammar guarantees `precision` follows `double`. // The grammar guarantees `precision` follows `double`.
@@ -1348,6 +1362,7 @@ fn build_sql_create_table(path: &MatchedPath, source: &str) -> Result<Command, V
} }
let col_name = pending_name.take().ok_or_else(sql_col_type_without_name)?; let col_name = pending_name.take().ok_or_else(sql_col_type_without_name)?;
columns.push(ColumnSpec::new(col_name, Type::Real)); columns.push(ColumnSpec::new(col_name, Type::Real));
column_open = true;
} }
// A table-level `PRIMARY KEY (col, …)` column reference. // A table-level `PRIMARY KEY (col, …)` column reference.
MatchedKind::Ident { role: "pk_column", .. } => { MatchedKind::Ident { role: "pk_column", .. } => {
@@ -1432,14 +1447,31 @@ fn build_sql_create_table(path: &MatchedPath, source: &str) -> Result<Command, V
} }
} }
// `check ( <expr> )` — capture the inner expression text // `check ( <expr> )` — capture the inner expression text
// (without the wrapping parens) by matching paren depth. // (without the wrapping parens) by matching paren depth, then
// route by element position: a CHECK inside an open column
// definition is column-level (4a.2); one seen at element
// start (no column open) is a table-level CHECK (4a.3).
MatchedKind::Word("check") => { MatchedKind::Word("check") => {
if let Some((s, e)) = capture_parenthesised_span(&mut items) if let Some((s, e)) = capture_parenthesised_span(&mut items) {
&& let Some(last) = columns.last_mut() let text = source[s..e].trim().to_string();
{ if column_open {
last.check_sql = Some(source[s..e].trim().to_string()); if let Some(last) = columns.last_mut() {
last.check_sql = Some(text);
}
} else {
check_constraints.push(text);
}
} }
} }
// Track paren depth for element-boundary detection. The
// column/`check`/`default`/table-`unique` arms consume their
// own parens, so the only parens reaching here are the outer
// column list, type length-args, and table-`PRIMARY KEY (…)`.
MatchedKind::Punct('(') => depth += 1,
MatchedKind::Punct(')') => depth = depth.saturating_sub(1),
// A comma at the column-list interior ends the current
// element — the next element starts fresh (no column open).
MatchedKind::Punct(',') if depth == 1 => column_open = false,
_ => {} _ => {}
} }
} }
@@ -1461,6 +1493,7 @@ fn build_sql_create_table(path: &MatchedPath, source: &str) -> Result<Command, V
columns, columns,
primary_key, primary_key,
unique_constraints, unique_constraints,
check_constraints,
if_not_exists, if_not_exists,
}) })
} }
+122 -10
View File
@@ -236,12 +236,27 @@ static TABLE_UNIQUE_NODES: &[Node] = &[
]; ];
const TABLE_UNIQUE: Node = Node::Seq(TABLE_UNIQUE_NODES); const TABLE_UNIQUE: Node = Node::Seq(TABLE_UNIQUE_NODES);
// One element of the column list: a table-level `PRIMARY KEY (…)` or a // Table-level `CHECK ( <expr> )` (ADR-0035 §4a.3) — a multi-column
// column definition. `TABLE_PK` is tried first — it starts with the // CHECK referencing several columns. Same paren-bounded shape as the
// keyword `primary`, which disambiguates it from a column name. (A // column-level CHECK; the builder tells them apart by position (a
// column literally named `primary` is therefore unavailable, the same // CHECK at element start, with no column definition open, is
// trade real SQL makes with its reserved words.) // table-level). The engine reports no CHECK constraints, so a
static ELEMENT_CHOICES: &[Node] = &[TABLE_PK, TABLE_UNIQUE, COLUMN_DEF]; // table-level CHECK round-trips via a dedicated metadata table.
static TABLE_CHECK_NODES: &[Node] = &[
Node::Word(Word::keyword("check")),
Node::Punct('('),
Node::Subgrammar(&sql_expr::SQL_OR_EXPR),
Node::Punct(')'),
];
const TABLE_CHECK: Node = Node::Seq(TABLE_CHECK_NODES);
// One element of the column list: a table-level `PRIMARY KEY (…)` /
// `UNIQUE (…)` / `CHECK (…)`, or a column definition. The table-level
// forms are tried first — each starts with a keyword (`primary` /
// `unique` / `check`) that disambiguates it from a column name. (A
// column literally named `primary`/`unique`/`check` is therefore
// unavailable, the same trade real SQL makes with its reserved words.)
static ELEMENT_CHOICES: &[Node] = &[TABLE_PK, TABLE_UNIQUE, TABLE_CHECK, COLUMN_DEF];
const ELEMENT: Node = Node::Choice(ELEMENT_CHOICES); const ELEMENT: Node = Node::Choice(ELEMENT_CHOICES);
static COLUMN_LIST_NODES: &[Node] = &[ static COLUMN_LIST_NODES: &[Node] = &[
@@ -445,10 +460,20 @@ mod tests {
} }
#[test] #[test]
fn table_level_check_and_fk_still_rejected() { fn table_level_check_accepted() {
// Table-level (multi-column) CHECK is 4a.3 (needs a metadata // 4a.3: a table-level (multi-column) CHECK is now admitted, in
// table); FK is 4b. Neither shape exists here yet. // any position among the elements and alongside other forms.
bad("table t (a int, b int, check (a < b))"); good("table t (a int, b int, check (a < b))");
good("table t (a int, b int, c int, check (a < b), check (b < c))");
good("table t (a int, b int, primary key (a), check (a < b))");
good("table t (a int, b int, unique (a, b), check (a <> b))");
good("table t (price real check (price >= 0), total real, check (total >= price))");
}
#[test]
fn foreign_key_still_rejected() {
// FK in CREATE TABLE is 4b — neither inline `REFERENCES` nor a
// table-level `FOREIGN KEY` shape exists in the grammar yet.
bad("table t (id int, ref int references other(id))"); bad("table t (id int, ref int references other(id))");
bad("table t (id int, foreign key (id) references other(id))"); bad("table t (id int, foreign key (id) references other(id))");
} }
@@ -696,4 +721,91 @@ mod builder_tests {
assert!(col(&cols, "b").unique, "it folds into the column's flag"); assert!(col(&cols, "b").unique, "it folds into the column's flag");
assert!(!col(&cols, "a").unique); assert!(!col(&cols, "a").unique);
} }
// --- 4a.3: table-level / multi-column CHECK ---
/// Parse and return the columns + the table-level CHECK constraints.
fn parse_sct_checks(input: &str) -> (Vec<ColumnSpec>, Vec<String>) {
match parse_command(input).expect("should parse") {
Command::SqlCreateTable {
columns,
check_constraints,
..
} => (columns, check_constraints),
other => panic!("expected SqlCreateTable, got {other:?}"),
}
}
#[test]
fn table_level_check_captured_as_raw_text() {
let (cols, checks) = parse_sct_checks("create table t (a int, b int, check (a < b))");
assert_eq!(checks, vec!["a < b".to_string()]);
// The CHECK belongs to no column — it stays table-level.
assert!(col(&cols, "a").check_sql.is_none() && col(&cols, "b").check_sql.is_none());
}
#[test]
fn multiple_table_checks_preserve_declaration_order() {
let (_, checks) =
parse_sct_checks("create table t (a int, b int, c int, check (a < b), check (b < c))");
assert_eq!(checks, vec!["a < b".to_string(), "b < c".to_string()]);
}
#[test]
fn column_check_and_table_check_route_separately() {
// A column-level CHECK (after a column's type) and a table-level
// CHECK (its own element) in the same statement must not be
// conflated — the load-bearing distinction of 4a.3.
let (cols, checks) = parse_sct_checks(
"create table t (price real check (price >= 0), total real, check (total >= price))",
);
assert_eq!(col(&cols, "price").check_sql.as_deref(), Some("price >= 0"));
assert!(col(&cols, "total").check_sql.is_none());
assert_eq!(checks, vec!["total >= price".to_string()]);
}
#[test]
fn column_check_after_length_arg_stays_column_level() {
// The depth trap: the `,` inside `numeric(10, 2)` is at paren
// depth 2, not an element boundary, so the following `check`
// is still column-level. A naive "reset on any comma" would
// misclassify it as table-level (the §4.2 probe).
let (cols, checks) =
parse_sct_checks("create table t (n numeric(10, 2) check (n > 0))");
assert_eq!(col(&cols, "n").check_sql.as_deref(), Some("n > 0"));
assert!(checks.is_empty(), "no table-level CHECK was produced");
}
#[test]
fn table_check_after_table_primary_key() {
// A table-PK `(a, b)` injects its own parens/comma into the
// item stream; the following table CHECK must still be detected.
let (_, checks) =
parse_sct_checks("create table t (a int, b int, primary key (a, b), check (a < b))");
assert_eq!(checks, vec!["a < b".to_string()]);
}
#[test]
fn table_check_after_table_unique() {
let (_, checks) =
parse_sct_checks("create table t (a int, b int, unique (a, b), check (a <> b))");
assert_eq!(checks, vec!["a <> b".to_string()]);
}
#[test]
fn table_check_captures_balanced_nested_parens() {
let (_, checks) =
parse_sct_checks("create table t (a int, b int, check ((a + b) > (a - b)))");
assert_eq!(checks, vec!["(a + b) > (a - b)".to_string()]);
}
#[test]
fn table_check_before_a_later_column_is_table_level() {
// A CHECK element that appears between columns (not after a
// column's type) is table-level even though more columns follow.
let (cols, checks) =
parse_sct_checks("create table t (a int, check (a > 0), b int)");
assert_eq!(checks, vec!["a > 0".to_string()]);
assert!(col(&cols, "a").check_sql.is_none() && col(&cols, "b").check_sql.is_none());
}
} }
+7
View File
@@ -146,6 +146,13 @@ pub struct TableSchema {
/// written before composite UNIQUE existed — the YAML field is /// written before composite UNIQUE existed — the YAML field is
/// optional on read. /// optional on read.
pub unique_constraints: Vec<Vec<String>>, pub unique_constraints: Vec<Vec<String>>,
/// Table-level `CHECK (<expr>)` constraints, in declaration
/// order, as raw SQL text (ADR-0035 §4a.3). The engine reports
/// no CHECK constraints, so these are the source of truth (held
/// in `__rdbms_playground_table_checks`) and echoed verbatim
/// into the rebuilt DDL. Empty for project files written before
/// table-level CHECK existed — the YAML field is optional on read.
pub check_constraints: Vec<String>,
} }
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
+67
View File
@@ -105,6 +105,15 @@ fn write_table(out: &mut String, table: &TableSchema) {
let _ = writeln!(out, "]"); let _ = writeln!(out, "]");
} }
} }
// Table-level CHECK constraints as raw SQL text (ADR-0035 §4a.3) —
// double-quoted (an expression like `a < b` is not a bare scalar)
// and emitted only when present.
if !table.check_constraints.is_empty() {
let _ = writeln!(out, " check_constraints:");
for expr in &table.check_constraints {
let _ = writeln!(out, " - {}", yaml_string(expr));
}
}
} }
/// Always render `s` as a double-quoted YAML string — used /// Always render `s` as a double-quoted YAML string — used
@@ -265,6 +274,7 @@ pub(crate) fn parse_schema(body: &str) -> Result<SchemaSnapshot, YamlError> {
primary_key: t.primary_key, primary_key: t.primary_key,
columns, columns,
unique_constraints: t.unique_constraints, unique_constraints: t.unique_constraints,
check_constraints: t.check_constraints,
}); });
} }
let mut relationships: Vec<RelationshipSchema> = Vec::with_capacity(raw.relationships.len()); let mut relationships: Vec<RelationshipSchema> = Vec::with_capacity(raw.relationships.len());
@@ -377,6 +387,10 @@ struct RawTable {
/// Optional on read — older project files omit it. /// Optional on read — older project files omit it.
#[serde(default)] #[serde(default)]
unique_constraints: Vec<Vec<String>>, unique_constraints: Vec<Vec<String>>,
/// Table-level CHECK constraints as raw SQL text (ADR-0035 §4a.3).
/// Optional on read — older project files omit it.
#[serde(default)]
check_constraints: Vec<String>,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
@@ -439,6 +453,7 @@ mod tests {
ColumnSchema { name: "Name".to_string(), user_type: Type::Text, unique: false, not_null: false, default: None, check: None }, ColumnSchema { name: "Name".to_string(), user_type: Type::Text, unique: false, not_null: false, default: None, check: None },
], ],
unique_constraints: Vec::new(), unique_constraints: Vec::new(),
check_constraints: Vec::new(),
}, },
TableSchema { TableSchema {
name: "Orders".to_string(), name: "Orders".to_string(),
@@ -448,6 +463,7 @@ mod tests {
ColumnSchema { name: "CustId".to_string(), user_type: Type::Int, unique: false, not_null: false, default: None, check: None }, ColumnSchema { name: "CustId".to_string(), user_type: Type::Int, unique: false, not_null: false, default: None, check: None },
], ],
unique_constraints: Vec::new(), unique_constraints: Vec::new(),
check_constraints: Vec::new(),
}, },
], ],
relationships: vec![RelationshipSchema { relationships: vec![RelationshipSchema {
@@ -517,6 +533,7 @@ mod tests {
check: None, check: None,
}], }],
unique_constraints: Vec::new(), unique_constraints: Vec::new(),
check_constraints: Vec::new(),
}], }],
relationships: vec![], relationships: vec![],
indexes: vec![], indexes: vec![],
@@ -575,6 +592,7 @@ mod tests {
}, },
], ],
unique_constraints: Vec::new(), unique_constraints: Vec::new(),
check_constraints: Vec::new(),
}], }],
relationships: vec![], relationships: vec![],
indexes: vec![], indexes: vec![],
@@ -584,6 +602,54 @@ mod tests {
assert_eq!(parsed, snap, "constraints survive the yaml round-trip"); assert_eq!(parsed, snap, "constraints survive the yaml round-trip");
} }
#[test]
fn table_level_constraints_round_trip_through_yaml() {
// Composite UNIQUE and table-level CHECK (raw SQL text) survive
// a serialize → parse cycle in declaration order (ADR-0035
// §4a.2 / §4a.3).
let snap = SchemaSnapshot {
created_at: "2026-05-25T00:00:00Z".to_string(),
tables: vec![TableSchema {
name: "T".to_string(),
primary_key: vec![],
columns: vec![
ColumnSchema { name: "a".to_string(), user_type: Type::Int, unique: false, not_null: false, default: None, check: None },
ColumnSchema { name: "b".to_string(), user_type: Type::Int, unique: false, not_null: false, default: None, check: None },
ColumnSchema { name: "c".to_string(), user_type: Type::Int, unique: false, not_null: false, default: None, check: None },
],
unique_constraints: vec![vec!["a".to_string(), "b".to_string()]],
check_constraints: vec!["a < b".to_string(), "b < c".to_string()],
}],
relationships: vec![],
indexes: vec![],
};
let body = serialize_schema(&snap);
let parsed = parse_schema(&body).expect("parse schema");
assert_eq!(
parsed, snap,
"table-level UNIQUE + CHECK survive the yaml round-trip in order"
);
}
#[test]
fn check_constraints_optional_on_read() {
// A project file written before table-level CHECK existed (no
// `check_constraints:` key) parses with an empty list.
let body = "\
version: 1
project:
created_at: 2026-05-25T00:00:00Z
tables:
- name: T
primary_key: [id]
columns:
- { name: id, type: int }
relationships: []
";
let parsed = parse_schema(body).expect("parse");
assert!(parsed.tables[0].check_constraints.is_empty());
}
#[test] #[test]
fn parses_minimal_yaml_with_no_tables() { fn parses_minimal_yaml_with_no_tables() {
let body = "\ let body = "\
@@ -662,6 +728,7 @@ relationships:
ColumnSchema { name: "b".to_string(), user_type: Type::Int, unique: false, not_null: false, default: None, check: None }, ColumnSchema { name: "b".to_string(), user_type: Type::Int, unique: false, not_null: false, default: None, check: None },
], ],
unique_constraints: Vec::new(), unique_constraints: Vec::new(),
check_constraints: Vec::new(),
}], }],
relationships: vec![], relationships: vec![],
indexes: vec![], indexes: vec![],
+10 -1
View File
@@ -1925,9 +1925,18 @@ async fn execute_command_typed(
columns, columns,
primary_key, primary_key,
unique_constraints, unique_constraints,
check_constraints,
if_not_exists, if_not_exists,
} => database } => database
.sql_create_table(name, columns, primary_key, unique_constraints, if_not_exists, src) .sql_create_table(
name,
columns,
primary_key,
unique_constraints,
check_constraints,
if_not_exists,
src,
)
.await .await
.map(|outcome| match outcome { .map(|outcome| match outcome {
CreateOutcome::Created(d) => CommandOutcome::Schema(Some(d)), CreateOutcome::Created(d) => CommandOutcome::Schema(Some(d)),
+262
View File
@@ -52,6 +52,7 @@ fn created_table_appears_with_playground_types() {
], ],
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table Widget (id int primary key, name text)".to_string()), Some("create table Widget (id int primary key, name text)".to_string()),
)) ))
@@ -89,6 +90,7 @@ fn integer_primary_key_is_plain_int() {
vec![ColumnSpec::new("id", Type::Int)], vec![ColumnSpec::new("id", Type::Int)],
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table T (id integer primary key)".to_string()), Some("create table T (id integer primary key)".to_string()),
)) ))
@@ -114,6 +116,7 @@ fn serial_pk_autoincrements_in_multi_column_table() {
], ],
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table T (id serial primary key, name text)".to_string()), Some("create table T (id serial primary key, name text)".to_string()),
)) ))
@@ -157,6 +160,7 @@ fn if_not_exists_is_a_noop_when_table_exists() {
specs(), specs(),
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table T (id int)".to_string()), Some("create table T (id int)".to_string()),
)) ))
@@ -168,6 +172,7 @@ fn if_not_exists_is_a_noop_when_table_exists() {
specs(), specs(),
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
true, // IF NOT EXISTS true, // IF NOT EXISTS
Some("create table if not exists T (id int)".to_string()), Some("create table if not exists T (id int)".to_string()),
)) ))
@@ -194,6 +199,7 @@ fn table_without_primary_key_is_allowed() {
vec![ColumnSpec::new("body", Type::Text)], vec![ColumnSpec::new("body", Type::Text)],
vec![], // no primary key vec![], // no primary key
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table Notes (body text)".to_string()), Some("create table Notes (body text)".to_string()),
)) ))
@@ -236,6 +242,7 @@ fn check_constraint_is_enforced() {
vec![ColumnSpec::new("id", Type::Serial), col_check("price", Type::Real, "price >= 0")], vec![ColumnSpec::new("id", Type::Serial), col_check("price", Type::Real, "price >= 0")],
vec!["id".to_string()], vec!["id".to_string()],
vec![], vec![],
vec![], // no table CHECK
false, false,
Some("create table T (id serial primary key, price real check (price >= 0))".to_string()), Some("create table T (id serial primary key, price real check (price >= 0))".to_string()),
)) ))
@@ -270,6 +277,7 @@ fn default_is_applied_when_column_omitted() {
], ],
vec!["id".to_string()], vec!["id".to_string()],
vec![], vec![],
vec![], // no table CHECK
false, false,
Some("create table T (id serial primary key, label text, n int default 7)".to_string()), Some("create table T (id serial primary key, label text, n int default 7)".to_string()),
)) ))
@@ -298,6 +306,7 @@ fn composite_unique_is_enforced() {
vec![ColumnSpec::new("a", Type::Int), ColumnSpec::new("b", Type::Int)], vec![ColumnSpec::new("a", Type::Int), ColumnSpec::new("b", Type::Int)],
vec![], vec![],
vec![vec!["a".to_string(), "b".to_string()]], vec![vec!["a".to_string(), "b".to_string()]],
vec![], // no table CHECK
false, false,
Some("create table T (a int, b int, unique (a, b))".to_string()), Some("create table T (a int, b int, unique (a, b))".to_string()),
)) ))
@@ -332,6 +341,7 @@ fn check_default_and_composite_unique_survive_rebuild() {
], ],
vec![], vec![],
vec![vec!["a".to_string(), "b".to_string()]], vec![vec!["a".to_string(), "b".to_string()]],
vec![], // no table CHECK
false, false,
Some( Some(
"create table T (a int, b int, price real check (price >= 0), \ "create table T (a int, b int, price real check (price >= 0), \
@@ -369,6 +379,197 @@ fn check_default_and_composite_unique_survive_rebuild() {
assert!(r.block_on(ins("1", "1", "5")).is_err(), "composite UNIQUE survived rebuild"); assert!(r.block_on(ins("1", "1", "5")).is_err(), "composite UNIQUE survived rebuild");
} }
#[test]
fn table_level_check_is_enforced() {
// ADR-0035 §4a.3: a multi-column CHECK has no column to hang on and
// the engine reports no CHECKs, so it round-trips via a metadata
// table. Here we prove the engine actually enforces it.
let (_p, db, _d) = open(false);
let r = rt();
r.block_on(db.sql_create_table(
"T".to_string(),
vec![ColumnSpec::new("a", Type::Int), ColumnSpec::new("b", Type::Int)],
vec![],
vec![], // no composite UNIQUE
vec!["a < b".to_string()], // table-level CHECK
false,
Some("create table T (a int, b int, check (a < b))".to_string()),
))
.expect("create");
let ins = |a: &str, b: &str| {
db.insert(
"T".to_string(),
None,
vec![Value::Number(a.to_string()), Value::Number(b.to_string())],
Some("insert".to_string()),
)
};
r.block_on(ins("1", "2")).expect("(1,2) satisfies a < b");
assert!(r.block_on(ins("2", "1")).is_err(), "CHECK (a < b) rejects (2,1)");
assert!(r.block_on(ins("3", "3")).is_err(), "CHECK (a < b) rejects (3,3)");
}
#[test]
fn multiple_table_level_checks_all_enforced() {
let (_p, db, _d) = open(false);
let r = rt();
r.block_on(db.sql_create_table(
"T".to_string(),
vec![
ColumnSpec::new("a", Type::Int),
ColumnSpec::new("b", Type::Int),
ColumnSpec::new("c", Type::Int),
],
vec![],
vec![], // no composite UNIQUE
vec!["a < b".to_string(), "b < c".to_string()],
false,
Some("create table T (a int, b int, c int, check (a < b), check (b < c))".to_string()),
))
.expect("create");
let ins = |a: &str, b: &str, c: &str| {
db.insert(
"T".to_string(),
None,
vec![
Value::Number(a.to_string()),
Value::Number(b.to_string()),
Value::Number(c.to_string()),
],
Some("insert".to_string()),
)
};
r.block_on(ins("1", "2", "3")).expect("(1,2,3) satisfies both checks");
assert!(r.block_on(ins("2", "1", "3")).is_err(), "first CHECK (a < b) enforced");
assert!(r.block_on(ins("1", "3", "2")).is_err(), "second CHECK (b < c) enforced");
}
#[test]
fn dropping_a_table_clears_its_table_check_metadata() {
// The CHECK metadata table is keyed by (table_name, seq). If a drop
// left orphan rows behind, re-creating the same table with a CHECK
// would collide on that primary key and fail. A clean create→drop→
// create round-trip proves the drop path clears the metadata.
let (_p, db, _d) = open(false);
let r = rt();
let make = || {
db.sql_create_table(
"T".to_string(),
vec![ColumnSpec::new("a", Type::Int), ColumnSpec::new("b", Type::Int)],
vec![],
vec![], // no composite UNIQUE
vec!["a < b".to_string()],
false,
Some("create table T (a int, b int, check (a < b))".to_string()),
)
};
r.block_on(make()).expect("first create");
r.block_on(db.drop_table("T".to_string(), Some("drop table T".to_string())))
.expect("drop");
r.block_on(make()).expect("re-create must not collide on orphaned CHECK metadata");
// The re-created CHECK is enforced (and there is exactly one of it).
let ins = |a: &str, b: &str| {
db.insert(
"T".to_string(),
None,
vec![Value::Number(a.to_string()), Value::Number(b.to_string())],
Some("insert".to_string()),
)
};
r.block_on(ins("1", "2")).expect("(1,2) valid");
assert!(r.block_on(ins("2", "1")).is_err(), "CHECK enforced after re-create");
}
#[test]
fn table_level_check_survives_a_rebuild_triggering_column_add() {
// Cross-cutting probe (ADR-0013 rebuild primitive × 4a.3 metadata):
// adding a constrained column to a table that carries a table-level
// CHECK rebuilds the table via `schema_to_ddl`. The CHECK must
// survive both in the engine (enforced) AND in the metadata table
// (so a *later* rebuild_from_text still re-emits it) — otherwise the
// constraint is silently lost the next time the table is rebuilt.
let (p, db, _d) = open(false);
let r = rt();
r.block_on(db.sql_create_table(
"T".to_string(),
vec![ColumnSpec::new("a", Type::Int), ColumnSpec::new("b", Type::Int)],
vec![],
vec![], // no composite UNIQUE
vec!["a < b".to_string()],
false,
Some("create table T (a int, b int, check (a < b))".to_string()),
))
.expect("create");
// A UNIQUE column forces the rebuild path (ADR-0029 §6).
let mut c = ColumnSpec::new("c", Type::Int);
c.unique = true;
r.block_on(db.add_column("T".to_string(), c, Some("add column T: c(int) unique".to_string())))
.expect("add column via rebuild");
let ins = |a: &str, b: &str, c: &str| {
db.insert(
"T".to_string(),
Some(vec!["a".to_string(), "b".to_string(), "c".to_string()]),
vec![
Value::Number(a.to_string()),
Value::Number(b.to_string()),
Value::Number(c.to_string()),
],
Some("insert".to_string()),
)
};
// Engine still enforces the CHECK right after the rebuild.
r.block_on(ins("1", "2", "10")).expect("(1,2) valid after column add");
assert!(r.block_on(ins("2", "1", "20")).is_err(), "CHECK survived the column-add rebuild");
// And the metadata survived too: a fresh rebuild from project.yaml
// re-emits the CHECK (it would be lost if the rebuild primitive had
// dropped the table_checks rows without repopulating them).
r.block_on(db.rebuild_from_text(p.path().to_path_buf(), None))
.expect("rebuild");
assert!(
r.block_on(ins("9", "8", "30")).is_err(),
"CHECK still present after a later rebuild_from_text — metadata was preserved"
);
}
#[test]
fn table_level_check_survives_rebuild() {
// The part-D proof for 4a.3: the engine reports no CHECK, so the
// constraint can only be reconstructed from the metadata table via
// project.yaml. After a rebuild it must still be enforced.
let (p, db, _d) = open(false);
let r = rt();
r.block_on(db.sql_create_table(
"T".to_string(),
vec![ColumnSpec::new("a", Type::Int), ColumnSpec::new("b", Type::Int)],
vec![],
vec![], // no composite UNIQUE
vec!["a < b".to_string()],
false,
Some("create table T (a int, b int, check (a < b))".to_string()),
))
.expect("create");
r.block_on(db.rebuild_from_text(p.path().to_path_buf(), None))
.expect("rebuild");
let ins = |a: &str, b: &str| {
db.insert(
"T".to_string(),
None,
vec![Value::Number(a.to_string()), Value::Number(b.to_string())],
Some("insert".to_string()),
)
};
r.block_on(ins("1", "2")).expect("(1,2) still valid after rebuild");
assert!(
r.block_on(ins("5", "4")).is_err(),
"table-level CHECK survived rebuild via the metadata table"
);
}
#[test] #[test]
fn if_not_exists_noop_is_journalled() { fn if_not_exists_noop_is_journalled() {
// A successful no-op is still a submission and belongs in the // A successful no-op is still a submission and belongs in the
@@ -381,6 +582,7 @@ fn if_not_exists_noop_is_journalled() {
vec![ColumnSpec::new("id", Type::Int)], vec![ColumnSpec::new("id", Type::Int)],
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table T (id int)".to_string()), Some("create table T (id int)".to_string()),
)) ))
@@ -392,6 +594,7 @@ fn if_not_exists_noop_is_journalled() {
vec![ColumnSpec::new("id", Type::Int)], vec![ColumnSpec::new("id", Type::Int)],
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
true, true,
Some(noop.to_string()), Some(noop.to_string()),
)) ))
@@ -411,6 +614,7 @@ fn plain_create_errors_when_table_exists() {
specs(), specs(),
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table T (id int)".to_string()), Some("create table T (id int)".to_string()),
)) ))
@@ -421,6 +625,7 @@ fn plain_create_errors_when_table_exists() {
specs(), specs(),
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, // no IF NOT EXISTS false, // no IF NOT EXISTS
Some("create table T (id int)".to_string()), Some("create table T (id int)".to_string()),
)); ));
@@ -436,6 +641,7 @@ fn sql_create_table_is_one_undo_step() {
vec![ColumnSpec::new("id", Type::Int)], vec![ColumnSpec::new("id", Type::Int)],
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table T (id int)".to_string()), Some("create table T (id int)".to_string()),
)) ))
@@ -487,6 +693,7 @@ fn serial_pk_first_column_autoincrements_after_rebuild() {
], ],
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table T (id serial primary key, name text)".to_string()), Some("create table T (id serial primary key, name text)".to_string()),
)) ))
@@ -519,6 +726,7 @@ fn serial_pk_non_first_column_autoincrements_after_rebuild() {
], ],
vec!["id".to_string()], vec!["id".to_string()],
vec![], // no composite UNIQUE vec![], // no composite UNIQUE
vec![], // no table CHECK
false, false,
Some("create table T (name text, id serial primary key)".to_string()), Some("create table T (name text, id serial primary key)".to_string()),
)) ))
@@ -535,3 +743,57 @@ fn serial_pk_non_first_column_autoincrements_after_rebuild() {
"serial keeps autoincrement after a rebuild even as a non-first column" "serial keeps autoincrement after a rebuild even as a non-first column"
); );
} }
#[test]
fn dropping_a_column_a_table_check_references_fails_cleanly() {
// Cross-cutting safety probe: a simple-mode `drop column` of a column
// that a table-level CHECK references rebuilds the table via
// `schema_to_ddl`, which re-emits `CHECK (a < b)` for a temp table
// that no longer has `a` — the engine rejects it. This must fail
// *cleanly* (the rebuild transaction rolls back), leaving the table
// fully intact, never half-migrated. Up-front detection (parsing the
// referenced columns out of the raw CHECK text so the refusal is
// deliberate) is 4e work; the friendly wording itself is H1. Today's
// clean engine-level rejection is the safe interim (user-confirmed).
let (_p, db, _d) = open(false);
let r = rt();
r.block_on(db.sql_create_table(
"T".to_string(),
vec![ColumnSpec::new("a", Type::Int), ColumnSpec::new("b", Type::Int)],
vec![],
vec![], // no composite UNIQUE
vec!["a < b".to_string()],
false,
Some("create table T (a int, b int, check (a < b))".to_string()),
))
.expect("create");
let dropped = r.block_on(db.drop_column(
"T".to_string(),
"a".to_string(),
false,
Some("drop column T: a".to_string()),
));
assert!(dropped.is_err(), "dropping a column a CHECK references is rejected");
// The table is intact: both columns survive (rollback) ...
let desc = r
.block_on(db.describe_table("T".to_string(), None))
.expect("describe still works");
assert_eq!(
desc.columns.iter().map(|c| c.name.clone()).collect::<Vec<_>>(),
vec!["a".to_string(), "b".to_string()],
"the failed drop rolled back — no half-migrated table"
);
// ... and the CHECK is still enforced.
let ins = |a: &str, b: &str| {
db.insert(
"T".to_string(),
Some(vec!["a".to_string(), "b".to_string()]),
vec![Value::Number(a.to_string()), Value::Number(b.to_string())],
Some("insert".to_string()),
)
};
r.block_on(ins("1", "2")).expect("(1,2) valid — table survived intact");
assert!(r.block_on(ins("2", "1")).is_err(), "CHECK still enforced after the failed drop");
}