ADR-0024 Phase D (full): schema-aware value typing
Schema-aware typed value slots — the central design claim of
ADR-0024 §Phase D. Insert / update / delete value slots now
dispatch on the user-facing column type at parse time, rejecting
mis-shaped input with localised wording instead of waiting for
the bind-time error.
What changed:
**SchemaCache extension** (`src/completion.rs`):
- New `TableColumn { name, user_type }` for per-table column
metadata.
- `SchemaCache.table_columns: HashMap<String, Vec<TableColumn>>`.
- `SchemaCache::columns_for_table(name)` — case-insensitive
lookup, mirrors the walker's case-insensitive entry-word
resolution.
**WalkContext schema plumbing** (`src/dsl/walker/context.rs`):
- `WalkContext<'a>` gains a lifetime and a `schema: Option<&'a
SchemaCache>`. `WalkContext::new()` keeps the schemaless
default; `with_schema(s)` is the new schema-aware constructor.
**Parser entry point** (`src/dsl/parser.rs`):
- `parse_command_with_schema(input, schema)` is the new public
schema-aware variant. `parse_command(input)` becomes a thin
wrapper that delegates with `None` for back-compat.
- Internal `try_walker_route` accepts an `Option<&SchemaCache>`
and threads it into the WalkContext.
**Node::Ident writes_table/writes_column** (`src/dsl/grammar/mod.rs`):
- Two new fields on `Node::Ident`. When `writes_table: true` and
`source: Tables`, the walker writes the matched ident's name
into `current_table` and resolves `current_table_columns`
against the schema cache. When `writes_column: true` and
`source: Columns`, the walker writes the resolved
`TableColumn` into `current_column`.
**Walker driver DynamicSubgrammar dispatch** (`src/dsl/walker/driver.rs`):
- The `Node::DynamicSubgrammar(factory)` branch now resolves the
factory at walk time and `Box::leak`s the result so its inner
static-slice fields (Choice/Seq) have the lifetime the walker
expects (per ADR-0024 §sub-grammars). The leak is bounded by
command-shape complexity per walk; per-walk arena is a future
optimisation.
- `walk_ident` extends to perform the schema writes when the
flags are set.
**Typed value slot factories + dynamic sub-grammars** (`src/dsl/grammar/shared.rs`):
- `int_slot` / `real_slot` / `decimal_slot` / `bool_slot` /
`text_slot` / `date_slot` / `datetime_slot` / `blob_slot` —
one per `Type`. Each accepts the appropriate literal kind plus
`null`; integer-only validator rejects `3.14` at int columns;
decimal validator pins numeric shape.
- `slot_for_type(ty) -> Node` is the dispatcher.
- `current_column_value(ctx) -> Node` is the dynamic sub-grammar
for `set col = …` and `where col = …` values; reads
`current_column` and dispatches via `slot_for_type`.
- `column_value_list(ctx) -> Node` is the dynamic sub-grammar
for `insert into T values (…)`; reads `current_table_columns`
and unfolds a Seq of typed slots separated by commas.
- Both fall back to the schemaless `VALUE_LITERAL` choice when
the context lacks the schema-resolved entries — keeps
schemaless `parse_command` callers (tests, replay path)
working.
**Data-command grammar wires the new types** (`src/dsl/grammar/data.rs`):
- `TABLE_NAME_INSERT` / `TABLE_NAME_WRITES` (new): table-name
slots that set `writes_table: true`. Used by insert / update /
delete to populate `current_table_columns`.
- `SET_COLUMN` / `FILTER_COLUMN` (new): column-name slots in
`set col=…` / `where col=…` set `writes_column: true`.
- `INSERT_VALUES_LIST` becomes `DynamicSubgrammar(column_value_list)`.
- `UPDATE_ASSIGNMENT` and `WHERE_CLAUSE` use
`PER_COLUMN_VALUE = DynamicSubgrammar(current_column_value)`.
**Runtime plumbs schema-with-types** (`src/runtime.rs`):
- `refresh_schema_cache` calls `describe_table` for each table
and populates `SchemaCache::table_columns` with
`TableColumn { name, user_type }` entries. Best-effort: a
`describe_table` miss leaves that table unpopulated and the
walker falls back to schemaless dispatch.
**App dispatches with schema** (`src/app.rs`):
- `dispatch_dsl` routes through `parse_command_with_schema(&self
.schema_cache, …)` so live typing/dispatch sees the typed
slots. The replay path stays schemaless (deferred — replay
bind-time errors still catch type mismatches).
**Catalog** (`src/friendly/strings/en-US.yaml`, `src/friendly/keys.rs`):
- New `parse.custom.bind_type_mismatch` entry with `{found}` and
`{expected}` placeholders. Surfaced by the int_slot /
decimal_slot validators.
Tests:
- 11 new walker-side Phase D tests cover insert / update /
delete with schemas — typed acceptance per column, decimal
rejection at int columns, null acceptance at any slot,
multi-assignment per-column dispatch, schemaless fallback.
- The pre-existing `parse_command(input)` test suite (no
schema) still passes — the fallback path is behaviour-
preserving.
- 828 passing total, 0 failing, 1 ignored. Clippy clean.
This commit is contained in:
+38
-7
@@ -88,11 +88,37 @@ impl ParseError {
|
||||
/// first identifier-shape token isn't a registered entry word),
|
||||
/// produces a synthetic "unknown command" error naming every
|
||||
/// valid entry keyword.
|
||||
///
|
||||
/// Schemaless variant: schema-aware nodes
|
||||
/// (`Ident { source: Tables }` with `writes_table` enabled,
|
||||
/// `DynamicSubgrammar`) fall back to schema-unaware behaviour.
|
||||
/// Use `parse_command_with_schema` to enable typed value slots
|
||||
/// (ADR-0024 §Phase D).
|
||||
pub fn parse_command(input: &str) -> Result<Command, ParseError> {
|
||||
parse_command_inner(input, None)
|
||||
}
|
||||
|
||||
/// Schema-aware parse entry point (ADR-0024 §Phase D).
|
||||
///
|
||||
/// Threads a `SchemaCache` reference through `WalkContext` so
|
||||
/// the walker can populate `current_table` / `current_column`
|
||||
/// from existing entities and `DynamicSubgrammar` factories
|
||||
/// can unfold per-column typed value slots.
|
||||
pub fn parse_command_with_schema(
|
||||
input: &str,
|
||||
schema: &crate::completion::SchemaCache,
|
||||
) -> Result<Command, ParseError> {
|
||||
parse_command_inner(input, Some(schema))
|
||||
}
|
||||
|
||||
fn parse_command_inner(
|
||||
input: &str,
|
||||
schema: Option<&crate::completion::SchemaCache>,
|
||||
) -> Result<Command, ParseError> {
|
||||
if input.trim().is_empty() {
|
||||
return Err(ParseError::Empty);
|
||||
}
|
||||
if let Some(result) = try_walker_route(input) {
|
||||
if let Some(result) = try_walker_route(input, schema) {
|
||||
return result;
|
||||
}
|
||||
Err(unknown_command_error(input))
|
||||
@@ -124,13 +150,18 @@ fn unknown_command_error(source: &str) -> ParseError {
|
||||
}
|
||||
}
|
||||
|
||||
/// Walker route (ADR-0024 §migration Phase A). Returns `None`
|
||||
/// when the walker doesn't engage (input doesn't start with a
|
||||
/// migrated entry keyword); the router falls through to the
|
||||
/// chumsky path for non-migrated commands.
|
||||
fn try_walker_route(source: &str) -> Option<Result<Command, ParseError>> {
|
||||
/// Walker route. Returns `None` when the walker doesn't engage
|
||||
/// (input doesn't start with a registered entry keyword); the
|
||||
/// router falls through to the synthetic "unknown command"
|
||||
/// error.
|
||||
fn try_walker_route(
|
||||
source: &str,
|
||||
schema: Option<&crate::completion::SchemaCache>,
|
||||
) -> Option<Result<Command, ParseError>> {
|
||||
use crate::dsl::walker::{self, outcome::WalkBound};
|
||||
let mut ctx = walker::context::WalkContext::new();
|
||||
let mut ctx = schema.map_or_else(walker::context::WalkContext::new, |s| {
|
||||
walker::context::WalkContext::with_schema(s)
|
||||
});
|
||||
let (result, command) = walker::walk(source, WalkBound::EndOfInput, &mut ctx);
|
||||
let result = result?;
|
||||
Some(walker_outcome_to_parse_result(source, result, command))
|
||||
|
||||
Reference in New Issue
Block a user