GraphQL comments without appending and fields (#4808)
Co-authored-by: itsezc <itsezc>
This commit is contained in:
parent
ebec244b01
commit
3b21249e99
1 changed files with 21 additions and 13 deletions
|
@ -185,7 +185,7 @@ pub async fn generate_schema(
|
||||||
let desc = current.get("desc");
|
let desc = current.get("desc");
|
||||||
match (asc, desc) {
|
match (asc, desc) {
|
||||||
(Some(_), Some(_)) => {
|
(Some(_), Some(_)) => {
|
||||||
return Err("Found both asc and desc in order".into());
|
return Err("Found both ASC and DESC in order".into());
|
||||||
}
|
}
|
||||||
(Some(GqlValue::Enum(a)), None) => {
|
(Some(GqlValue::Enum(a)), None) => {
|
||||||
orders.push(order!(asc, a.as_str()))
|
orders.push(order!(asc, a.as_str()))
|
||||||
|
@ -281,7 +281,7 @@ pub async fn generate_schema(
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.description(format!("Generated from table `{}`{}\nallows querying a table with filters", tb.name, if let Some(ref c) = &tb.comment {format!("\n{c}")} else {"".to_string()}))
|
.description(format!("{}", if let Some(ref c) = &tb.comment { format!("{c}") } else { format!("Generated from table `{}`\nallows querying a table with filters", tb.name) }))
|
||||||
.argument(limit_input!())
|
.argument(limit_input!())
|
||||||
.argument(start_input!())
|
.argument(start_input!())
|
||||||
.argument(InputValue::new("order", TypeRef::named(&table_order_name)))
|
.argument(InputValue::new("order", TypeRef::named(&table_order_name)))
|
||||||
|
@ -329,12 +329,11 @@ pub async fn generate_schema(
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.description(format!(
|
.description(format!(
|
||||||
"Generated from table `{}`{}\nallows querying a single record in a table by id",
|
"{}",
|
||||||
tb.name,
|
|
||||||
if let Some(ref c) = &tb.comment {
|
if let Some(ref c) = &tb.comment {
|
||||||
format!("\n{c}")
|
format!("{c}")
|
||||||
} else {
|
} else {
|
||||||
"".to_string()
|
format!("Generated from table `{}`\nallows querying a single record in a table by ID", tb.name)
|
||||||
}
|
}
|
||||||
))
|
))
|
||||||
.argument(id_input!()),
|
.argument(id_input!()),
|
||||||
|
@ -371,10 +370,19 @@ pub async fn generate_schema(
|
||||||
table_filter = table_filter
|
table_filter = table_filter
|
||||||
.field(InputValue::new(fd.name.to_string(), TypeRef::named(type_filter_name)));
|
.field(InputValue::new(fd.name.to_string(), TypeRef::named(type_filter_name)));
|
||||||
|
|
||||||
table_ty_obj = table_ty_obj.field(Field::new(
|
table_ty_obj = table_ty_obj
|
||||||
|
.field(Field::new(
|
||||||
fd.name.to_string(),
|
fd.name.to_string(),
|
||||||
fd_type,
|
fd_type,
|
||||||
make_table_field_resolver(fd_name.as_str(), fd.kind.clone()),
|
make_table_field_resolver(fd_name.as_str(), fd.kind.clone()),
|
||||||
|
))
|
||||||
|
.description(format!(
|
||||||
|
"{}",
|
||||||
|
if let Some(ref c) = fd.comment {
|
||||||
|
format!("{c}")
|
||||||
|
} else {
|
||||||
|
"".to_string()
|
||||||
|
}
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -421,7 +429,7 @@ pub async fn generate_schema(
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.description("allows fetching arbitrary records".to_string())
|
.description("Allows fetching arbitrary records".to_string())
|
||||||
.argument(id_input!()),
|
.argument(id_input!()),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -476,7 +484,7 @@ pub async fn generate_schema(
|
||||||
schema,
|
schema,
|
||||||
"uuid",
|
"uuid",
|
||||||
Kind::Uuid,
|
Kind::Uuid,
|
||||||
"a string encoded uuid",
|
"String encoded UUID",
|
||||||
"https://datatracker.ietf.org/doc/html/rfc4122"
|
"https://datatracker.ietf.org/doc/html/rfc4122"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue