Skip to content

fix(router): allow null value for nullable scalar types while validating variables & coerce list variables #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 16, 2025
Merged

fix(router): allow null value for nullable scalar types while validating variables & coerce list variables #483

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d7cd97
Allow null value for nullable scalar types while validating variables
ardatan Oct 13, 2025
13c4d66
Update lib/executor/src/variables/mod.rs
ardatan Oct 13, 2025
7e37a0b
Add test for list types
ardatan Oct 13, 2025
a5c18ff
Pretty
ardatan Oct 13, 2025
b6394d2
No locations if empty
ardatan Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions lib/executor/src/variables/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ fn validate_runtime_value(
) -> Result<(), String> {
match type_node {
TypeNode::Named(name) => {
if let ValueRef::Null = value {
return Ok(());
}
if let Some(enum_values) = schema_metadata.enum_values.get(name) {
if let ValueRef::String(ref s) = value {
if !enum_values.contains(&s.to_string()) {
Expand Down Expand Up @@ -179,6 +182,9 @@ fn validate_runtime_value(
validate_runtime_value(value, inner_type, schema_metadata)?;
}
TypeNode::List(inner_type) => {
if let ValueRef::Null = value {
return Ok(());
}
if let ValueRef::Array(arr) = value {
for item in arr.iter() {
validate_runtime_value(item.as_ref(), inner_type, schema_metadata)?;
Expand All @@ -190,3 +196,21 @@ fn validate_runtime_value(
}
Ok(())
}

#[cfg(test)]
mod tests {
#[test]
fn allow_null_values_for_nullable_scalar_types() {
let schema_metadata = crate::introspection::schema::SchemaMetadata::default();

let scalars = vec!["String", "Int", "Float", "Boolean", "ID"];
for scalar in scalars {
let type_node = crate::variables::TypeNode::Named(scalar.to_string());

let value = sonic_rs::ValueRef::Null;

let result = super::validate_runtime_value(value, &type_node, &schema_metadata);
assert_eq!(result, Ok(()));
}
}
}
Loading