graphql: Rename ObjectCondition to ObjectType

The old name wasn't matching what we use it for any more

Author: lutter

graphql/src/execution/ast.rs

@@ -7,7 +7,7 @@ use graph::{
 };
 use graphql_parser::Pos;
 
-use crate::schema::ast::ObjectCondition;
+use crate::schema::ast::ObjectType;
 
 /// A selection set is a table that maps object types to the fields that
 /// should be selected for objects of that type. The types are always
@@ -300,7 +300,7 @@ impl ObjectTypeSet {
 pub(crate) fn resolve_object_types<'a>(
     schema: &'a Schema,
     name: &str,
-) -> Result<HashSet<ObjectCondition<'a>>, QueryExecutionError> {
+) -> Result<HashSet<ObjectType<'a>>, QueryExecutionError> {
     let mut set = HashSet::new();
     match schema
         .document

graphql/src/schema/ast.rs

@@ -53,47 +53,47 @@ pub(crate) fn parse_field_as_filter(key: &str) -> (String, FilterOp) {
 
 /// An `ObjectType` with `Hash` and `Eq` derived from the name.
 #[derive(Clone, Debug)]
-pub(crate) struct ObjectCondition<'a>(&'a s::ObjectType);
+pub(crate) struct ObjectType<'a>(&'a s::ObjectType);
 
-impl<'a> Ord for ObjectCondition<'a> {
+impl<'a> Ord for ObjectType<'a> {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
         self.0.name.cmp(&other.0.name)
     }
 }
 
-impl<'a> PartialOrd for ObjectCondition<'a> {
+impl<'a> PartialOrd for ObjectType<'a> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         Some(self.0.name.cmp(&other.0.name))
     }
 }
 
-impl std::hash::Hash for ObjectCondition<'_> {
+impl std::hash::Hash for ObjectType<'_> {
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
         self.0.name.hash(state)
     }
 }
 
-impl PartialEq for ObjectCondition<'_> {
+impl PartialEq for ObjectType<'_> {
     fn eq(&self, other: &Self) -> bool {
         self.0.name.eq(&other.0.name)
     }
 }
 
-impl Eq for ObjectCondition<'_> {}
+impl Eq for ObjectType<'_> {}
 
-impl<'a> From<&'a s::ObjectType> for ObjectCondition<'a> {
+impl<'a> From<&'a s::ObjectType> for ObjectType<'a> {
     fn from(object: &'a s::ObjectType) -> Self {
-        ObjectCondition(object)
+        ObjectType(object)
     }
 }
 
-impl<'a> From<ObjectCondition<'a>> for ObjectOrInterface<'a> {
-    fn from(cond: ObjectCondition<'a>) -> Self {
+impl<'a> From<ObjectType<'a>> for ObjectOrInterface<'a> {
+    fn from(cond: ObjectType<'a>) -> Self {
         ObjectOrInterface::Object(cond.0)
     }
 }
 
-impl ObjectCondition<'_> {
+impl ObjectType<'_> {
     pub fn name(&self) -> &str {
         &self.0.name
     }

graphql/src/store/prefetch.rs

@@ -639,7 +639,7 @@ fn execute_selection_set<'a>(
 struct CollectedResponseKey<'a> {
     iface_cond: Option<&'a s::InterfaceType>,
     iface_fields: Vec<&'a a::Field>,
-    obj_types: IndexMap<sast::ObjectCondition<'a>, Vec<&'a a::Field>>,
+    obj_types: IndexMap<sast::ObjectType<'a>, Vec<&'a a::Field>>,
     collected_column_names: CollectedAttributeNames<'a>,
 }
 
@@ -753,7 +753,7 @@ fn fetch(
 
 /// Represents a finished column collection operation, mapping each object type to the final set of
 /// selected SQL columns.
-type AttributeNamesByObjectType<'a> = BTreeMap<sast::ObjectCondition<'a>, AttributeNames>;
+type AttributeNamesByObjectType<'a> = BTreeMap<sast::ObjectType<'a>, AttributeNames>;
 
 #[derive(Debug, Default, Clone)]
 struct CollectedAttributeNames<'a>(HashMap<ObjectOrInterface<'a>, AttributeNames>);

graphql/src/store/query.rs

@@ -7,7 +7,7 @@ use graph::{components::store::EntityType, data::graphql::ObjectOrInterface};
 
 use crate::execution::ast as a;
 use crate::schema::ast as sast;
-use crate::schema::ast::ObjectCondition;
+use crate::schema::ast::ObjectType;
 
 #[derive(Debug)]
 enum OrderDirection {
@@ -25,7 +25,7 @@ pub(crate) fn build_query<'a>(
     types_for_interface: &'a BTreeMap<EntityType, Vec<s::ObjectType>>,
     max_first: u32,
     max_skip: u32,
-    mut column_names: BTreeMap<ObjectCondition<'a>, AttributeNames>,
+    mut column_names: BTreeMap<ObjectType<'a>, AttributeNames>,
 ) -> Result<EntityQuery, QueryExecutionError> {
     let entity = entity.into();
     let entity_types = EntityCollection::All(match &entity {