Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ae31230ef2 | |||
| ce542a31cc | |||
| 75296ab107 | |||
| 1a4b328b45 | |||
| c5e103c867 |
@ -888,7 +888,7 @@
|
|||||||
},
|
},
|
||||||
"created_at": {
|
"created_at": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"immutable": true
|
"immutable": "always"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -899,7 +899,7 @@
|
|||||||
},
|
},
|
||||||
"created_at": {
|
"created_at": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"immutable": true
|
"immutable": "always"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -945,5 +945,70 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "immutable external vs always property validation",
|
||||||
|
"database": {
|
||||||
|
"types": [
|
||||||
|
{
|
||||||
|
"name": "invoice",
|
||||||
|
"schemas": {
|
||||||
|
"save_invoice.request": {
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"type": "string",
|
||||||
|
"immutable": "external"
|
||||||
|
},
|
||||||
|
"created_at": {
|
||||||
|
"type": "string",
|
||||||
|
"immutable": "always"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"tests": [
|
||||||
|
{
|
||||||
|
"description": "immutable external property in request context allowed when internal (punc.external = false)",
|
||||||
|
"data": {
|
||||||
|
"id": "123",
|
||||||
|
"status": "paid"
|
||||||
|
},
|
||||||
|
"schema_id": "save_invoice.request",
|
||||||
|
"action": "validate",
|
||||||
|
"expect": {
|
||||||
|
"success": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "immutable always property in request context rejected even when internal (punc.external = false)",
|
||||||
|
"data": {
|
||||||
|
"id": "123",
|
||||||
|
"created_at": "2026-07-21T00:00:00Z"
|
||||||
|
},
|
||||||
|
"schema_id": "save_invoice.request",
|
||||||
|
"action": "validate",
|
||||||
|
"expect": {
|
||||||
|
"success": false,
|
||||||
|
"errors": [
|
||||||
|
{
|
||||||
|
"code": "IMMUTABLE_PROPERTY_VIOLATION",
|
||||||
|
"values": {
|
||||||
|
"property_name": "created_at"
|
||||||
|
},
|
||||||
|
"details": {
|
||||||
|
"path": "created_at",
|
||||||
|
"schema": "save_invoice.request"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -13,6 +13,7 @@ pub struct MockState {
|
|||||||
pub query_responses: Vec<Result<Value, String>>,
|
pub query_responses: Vec<Result<Value, String>>,
|
||||||
pub execute_responses: Vec<Result<(), String>>,
|
pub execute_responses: Vec<Result<(), String>>,
|
||||||
pub mocks: Vec<Value>,
|
pub mocks: Vec<Value>,
|
||||||
|
pub punc_external: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@ -23,10 +24,12 @@ impl MockState {
|
|||||||
query_responses: Default::default(),
|
query_responses: Default::default(),
|
||||||
execute_responses: Default::default(),
|
execute_responses: Default::default(),
|
||||||
mocks: Default::default(),
|
mocks: Default::default(),
|
||||||
|
punc_external: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
thread_local! {
|
thread_local! {
|
||||||
pub static MOCK_STATE: RefCell<MockState> = RefCell::new(MockState::new());
|
pub static MOCK_STATE: RefCell<MockState> = RefCell::new(MockState::new());
|
||||||
@ -85,6 +88,10 @@ impl DatabaseExecutor for MockExecutor {
|
|||||||
Ok("2026-03-10T00:00:00Z".to_string())
|
Ok("2026-03-10T00:00:00Z".to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn punc_external(&self) -> Result<bool, String> {
|
||||||
|
Ok(MOCK_STATE.with(|state| state.borrow().punc_external))
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
fn get_queries(&self) -> Vec<String> {
|
fn get_queries(&self) -> Vec<String> {
|
||||||
MOCK_STATE.with(|state| state.borrow().captured_queries.clone())
|
MOCK_STATE.with(|state| state.borrow().captured_queries.clone())
|
||||||
@ -105,10 +112,21 @@ impl DatabaseExecutor for MockExecutor {
|
|||||||
s.query_responses.clear();
|
s.query_responses.clear();
|
||||||
s.execute_responses.clear();
|
s.execute_responses.clear();
|
||||||
s.mocks.clear();
|
s.mocks.clear();
|
||||||
|
s.punc_external = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
impl MockExecutor {
|
||||||
|
pub fn set_punc_external(&self, external: bool) {
|
||||||
|
MOCK_STATE.with(|state| {
|
||||||
|
state.borrow_mut().punc_external = external;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
fn parse_and_match_mocks(sql: &str, mocks: &[Value]) -> Option<Vec<Value>> {
|
fn parse_and_match_mocks(sql: &str, mocks: &[Value]) -> Option<Vec<Value>> {
|
||||||
let sql_upper = sql.to_uppercase();
|
let sql_upper = sql.to_uppercase();
|
||||||
|
|||||||
@ -20,6 +20,9 @@ pub trait DatabaseExecutor: Send + Sync {
|
|||||||
/// Returns the current transaction timestamp
|
/// Returns the current transaction timestamp
|
||||||
fn timestamp(&self) -> Result<String, String>;
|
fn timestamp(&self) -> Result<String, String>;
|
||||||
|
|
||||||
|
/// Returns true if the current execution context is marked as an external client API cue (punc.external = true)
|
||||||
|
fn punc_external(&self) -> Result<bool, String>;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
fn get_queries(&self) -> Vec<String>;
|
fn get_queries(&self) -> Vec<String>;
|
||||||
|
|
||||||
|
|||||||
@ -150,4 +150,26 @@ impl DatabaseExecutor for SpiExecutor {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn punc_external(&self) -> Result<bool, String> {
|
||||||
|
self.transact(|| {
|
||||||
|
Spi::connect(|client| {
|
||||||
|
let mut tup_table = client
|
||||||
|
.select(
|
||||||
|
"SELECT COALESCE(current_setting('punc.external', true), 'false')::boolean",
|
||||||
|
None,
|
||||||
|
&[],
|
||||||
|
)
|
||||||
|
.map_err(|e| format!("SPI Select Error: {}", e))?;
|
||||||
|
|
||||||
|
let row = tup_table
|
||||||
|
.next()
|
||||||
|
.ok_or("No setting returned from context".to_string())?;
|
||||||
|
let is_external: Option<bool> = row.get(1).map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
|
Ok(is_external.unwrap_or(false))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -151,19 +151,7 @@ pub struct SchemaObject {
|
|||||||
pub extensible: Option<bool>,
|
pub extensible: Option<bool>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub immutable: Option<bool>,
|
pub immutable: Option<ImmutableMode>,
|
||||||
// readOnly = the CLIENT may not write it; the SERVER still may. Deliberately NOT
|
|
||||||
// enforced here (see validator/rules/object.rs, which rejects `immutable` on any
|
|
||||||
// request) — enforcing it would break legitimate server writers such as the
|
|
||||||
// Mercury feed matcher stamping `reconciliation_status`, or the rollup triggers
|
|
||||||
// that own `total_amount`/`amount_paid`. It is carried purely so it survives
|
|
||||||
// compilation and reaches the punc code generator, which turns it into a
|
|
||||||
// client-side immutable Reactor. Without this field the key was silently dropped
|
|
||||||
// at this boundary and ten authored declarations did nothing for months.
|
|
||||||
#[serde(default)]
|
|
||||||
#[serde(rename = "readOnly")]
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub read_only: Option<bool>,
|
|
||||||
|
|
||||||
// Contains ALL structural fields perfectly flattened from the ENTIRE Database inheritance tree (e.g. `entity` fields like `id`) as well as local fields hidden inside conditional `cases` blocks.
|
// Contains ALL structural fields perfectly flattened from the ENTIRE Database inheritance tree (e.g. `entity` fields like `id`) as well as local fields hidden inside conditional `cases` blocks.
|
||||||
// This JSON exported array gives clients absolute deterministic visibility to O(1) validation and masking bounds without duplicating structural memory.
|
// This JSON exported array gives clients absolute deterministic visibility to O(1) validation and masking bounds without duplicating structural memory.
|
||||||
@ -275,6 +263,13 @@ pub fn is_primitive_type(t: &str) -> bool {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "lowercase")]
|
||||||
|
pub enum ImmutableMode {
|
||||||
|
Always,
|
||||||
|
External,
|
||||||
|
}
|
||||||
|
|
||||||
impl SchemaObject {
|
impl SchemaObject {
|
||||||
pub fn get_discriminator_value(&self, dim: &str, schema_id: &str) -> Option<String> {
|
pub fn get_discriminator_value(&self, dim: &str, schema_id: &str) -> Option<String> {
|
||||||
let is_split = self
|
let is_split = self
|
||||||
@ -322,7 +317,11 @@ impl SchemaObject {
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn is_immutable(&self) -> bool {
|
pub fn is_immutable(&self, is_external: bool) -> bool {
|
||||||
self.immutable == Some(true)
|
match self.immutable {
|
||||||
|
Some(ImmutableMode::Always) => true,
|
||||||
|
Some(ImmutableMode::External) => is_external,
|
||||||
|
None => false,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -281,6 +281,8 @@ impl Merger {
|
|||||||
let mut entity_objects = std::collections::BTreeMap::new();
|
let mut entity_objects = std::collections::BTreeMap::new();
|
||||||
let mut entity_arrays = std::collections::BTreeMap::new();
|
let mut entity_arrays = std::collections::BTreeMap::new();
|
||||||
|
|
||||||
|
let is_external = self.db.executor.punc_external().unwrap_or(false);
|
||||||
|
|
||||||
for (k, v) in obj {
|
for (k, v) in obj {
|
||||||
// Always retain system and unmapped core fields natively implicitly mapped to the Postgres tables
|
// Always retain system and unmapped core fields natively implicitly mapped to the Postgres tables
|
||||||
if k == "id" || k == "type" || k == "created" {
|
if k == "id" || k == "type" || k == "created" {
|
||||||
@ -289,10 +291,12 @@ impl Merger {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if let Some(prop_schema) = compiled_props.get(&k) {
|
if let Some(prop_schema) = compiled_props.get(&k) {
|
||||||
if prop_schema.is_immutable() {
|
if prop_schema.is_immutable(is_external) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
let mut is_edge = false;
|
let mut is_edge = false;
|
||||||
if let Some(edges) = schema.obj.compiled_edges.get() {
|
if let Some(edges) = schema.obj.compiled_edges.get() {
|
||||||
if edges.contains_key(&k) {
|
if edges.contains_key(&k) {
|
||||||
|
|||||||
@ -2531,6 +2531,18 @@ fn test_properties_13_1() {
|
|||||||
crate::tests::runner::run_test_case(&path, 13, 1).unwrap();
|
crate::tests::runner::run_test_case(&path, 13, 1).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_properties_14_0() {
|
||||||
|
let path = format!("{}/fixtures/properties.json", env!("CARGO_MANIFEST_DIR"));
|
||||||
|
crate::tests::runner::run_test_case(&path, 14, 0).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_properties_14_1() {
|
||||||
|
let path = format!("{}/fixtures/properties.json", env!("CARGO_MANIFEST_DIR"));
|
||||||
|
crate::tests::runner::run_test_case(&path, 14, 1).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_max_contains_0_0() {
|
fn test_max_contains_0_0() {
|
||||||
let path = format!("{}/fixtures/maxContains.json", env!("CARGO_MANIFEST_DIR"));
|
let path = format!("{}/fixtures/maxContains.json", env!("CARGO_MANIFEST_DIR"));
|
||||||
|
|||||||
@ -180,9 +180,10 @@ impl<'a> ValidationContext<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !self.response {
|
if !self.response {
|
||||||
|
let is_external = self.db.executor.punc_external().unwrap_or(false);
|
||||||
if let Some(compiled_props) = self.schema.compiled_properties.get() {
|
if let Some(compiled_props) = self.schema.compiled_properties.get() {
|
||||||
for (key, sub_schema) in compiled_props {
|
for (key, sub_schema) in compiled_props {
|
||||||
if sub_schema.is_immutable() && obj.contains_key(key) {
|
if sub_schema.is_immutable(is_external) && obj.contains_key(key) {
|
||||||
result.errors.push(ValidationError {
|
result.errors.push(ValidationError {
|
||||||
code: "IMMUTABLE_PROPERTY_VIOLATION".to_string(),
|
code: "IMMUTABLE_PROPERTY_VIOLATION".to_string(),
|
||||||
values: Some(IndexMap::from([
|
values: Some(IndexMap::from([
|
||||||
@ -194,7 +195,7 @@ impl<'a> ValidationContext<'a> {
|
|||||||
}
|
}
|
||||||
} else if let Some(props) = &self.schema.properties {
|
} else if let Some(props) = &self.schema.properties {
|
||||||
for (key, sub_schema) in props {
|
for (key, sub_schema) in props {
|
||||||
if sub_schema.is_immutable() && obj.contains_key(key) {
|
if sub_schema.is_immutable(is_external) && obj.contains_key(key) {
|
||||||
result.errors.push(ValidationError {
|
result.errors.push(ValidationError {
|
||||||
code: "IMMUTABLE_PROPERTY_VIOLATION".to_string(),
|
code: "IMMUTABLE_PROPERTY_VIOLATION".to_string(),
|
||||||
values: Some(IndexMap::from([
|
values: Some(IndexMap::from([
|
||||||
@ -207,6 +208,8 @@ impl<'a> ValidationContext<'a> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if let Some(props) = &self.schema.properties {
|
if let Some(props) = &self.schema.properties {
|
||||||
for (key, sub_schema) in props {
|
for (key, sub_schema) in props {
|
||||||
if self.overrides.contains(key) {
|
if self.overrides.contains(key) {
|
||||||
|
|||||||
Reference in New Issue
Block a user