graphql: Pass a schema, not the query, to coerce_argument_values

Author: lutter

graphql/src/execution/execution.rs

@@ -554,7 +554,7 @@ fn execute_field(
     field: &a::Field,
     field_definition: &s::Field,
 ) -> Result<r::Value, Vec<QueryExecutionError>> {
-    coerce_argument_values(&ctx.query, object_type, field)
+    coerce_argument_values(&ctx.query.schema, object_type, field)
         .and_then(|argument_values| {
             resolve_field_value(
                 ctx,
@@ -895,14 +895,14 @@ fn resolve_abstract_type<'a>(
 
 /// Coerces argument values into GraphQL values.
 pub fn coerce_argument_values<'a>(
-    query: &crate::execution::Query,
+    schema: &ApiSchema,
     ty: impl Into<ObjectOrInterface<'a>>,
     field: &a::Field,
 ) -> Result<HashMap<&'a str, r::Value>, Vec<QueryExecutionError>> {
     let mut coerced_values = HashMap::new();
     let mut errors = vec![];
 
-    let resolver = |name: &str| query.schema.document().get_named_type(name);
+    let resolver = |name: &str| schema.document().get_named_type(name);
 
     for argument_def in sast::get_argument_definitions(ty, &field.name)
         .into_iter()

graphql/src/execution/query.rs

@@ -205,13 +205,14 @@ impl Query {
 
         let root_type = self.schema.query_type.as_ref();
         for field in self.selection_set.fields_for(root_type) {
-            let args = match crate::execution::coerce_argument_values(self, root_type, field) {
-                Ok(args) => args,
-                Err(errs) => {
-                    errors.extend(errs);
-                    continue;
-                }
-            };
+            let args =
+                match crate::execution::coerce_argument_values(&self.schema, root_type, field) {
+                    Ok(args) => args,
+                    Err(errs) => {
+                        errors.extend(errs);
+                        continue;
+                    }
+                };
 
             let bc = match args.get("block") {
                 Some(bc) => BlockConstraint::try_from_value(bc).map_err(|_| {

graphql/src/store/prefetch.rs

@@ -630,7 +630,8 @@ fn execute_field(
     field_definition: &s::Field,
     selected_attrs: SelectedAttributes<'_>,
 ) -> Result<Vec<Node>, Vec<QueryExecutionError>> {
-    let argument_values = crate::execution::coerce_argument_values(&ctx.query, object_type, field)?;
+    let argument_values =
+        crate::execution::coerce_argument_values(&ctx.query.schema, object_type, field)?;
     let multiplicity = if sast::is_list_or_non_null_list_field(field_definition) {
         ChildMultiplicity::Many
     } else {

graphql/src/subscription/mod.rs

@@ -119,7 +119,8 @@ fn create_source_event_stream(
         }
     };
 
-    let argument_values = coerce_argument_values(&ctx.query, subscription_type.as_ref(), field)?;
+    let argument_values =
+        coerce_argument_values(&ctx.query.schema, subscription_type.as_ref(), field)?;
 
     resolve_field_stream(&ctx, &subscription_type, field, argument_values)
 }