Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd135859

Browse files
author
Jorge Olivero
committed
graph, store: Do not create a table for the _Schema_ type
1 parent6d77048 commitd135859

File tree

2 files changed

+26
-12
lines changed

2 files changed

+26
-12
lines changed

‎graph/src/data/schema.rs‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -421,21 +421,30 @@ impl Schema {
421421
};
422422

423423
iflet schema::Definition::TypeDefinition(refmut type_definition) = definition{
424-
let directives =match type_definition{
425-
TypeDefinition::Object(object_type) =>&mut object_type.directives,
426-
TypeDefinition::Interface(interface_type) =>&mut interface_type.directives,
427-
TypeDefinition::Enum(enum_type) =>&mut enum_type.directives,
428-
TypeDefinition::Scalar(scalar_type) =>&mut scalar_type.directives,
424+
let(name, directives) =match type_definition{
425+
TypeDefinition::Object(object_type) =>{
426+
(&object_type.name,&mut object_type.directives)
427+
}
428+
TypeDefinition::Interface(interface_type) =>{
429+
(&interface_type.name,&mut interface_type.directives)
430+
}
431+
TypeDefinition::Enum(enum_type) =>(&enum_type.name,&mut enum_type.directives),
432+
TypeDefinition::Scalar(scalar_type) =>{
433+
(&scalar_type.name,&mut scalar_type.directives)
434+
}
429435
TypeDefinition::InputObject(input_object_type) =>{
430-
&mut input_object_type.directives
436+
(&input_object_type.name,&mut input_object_type.directives)
437+
}
438+
TypeDefinition::Union(union_type) =>{
439+
(&union_type.name,&mut union_type.directives)
431440
}
432-
TypeDefinition::Union(union_type) =>&mut union_type.directives,
433441
};
434442

435-
if directives
436-
.iter()
437-
.find(|directive| directive.name.eq("subgraphId"))
438-
.is_none()
443+
if !name.eq(SCHEMA_TYPE_NAME)
444+
&& directives
445+
.iter()
446+
.find(|directive| directive.name.eq("subgraphId"))
447+
.is_none()
439448
{
440449
directives.push(subgraph_id_directive);
441450
}
@@ -701,7 +710,9 @@ impl Schema {
701710
.document
702711
.get_object_type_definitions()
703712
.iter()
704-
.filter(|t| t.find_directive(String::from("entity")).is_none())
713+
.filter(|t|{
714+
t.find_directive(String::from("entity")).is_none() && !t.name.eq(SCHEMA_TYPE_NAME)
715+
})
705716
.map(|t| t.name.to_owned())
706717
.collect::<Vec<_>>();
707718
if types_without_entity_directive.is_empty(){

‎store/postgres/src/relational.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use crate::relational_queries::{
2121
ClampRangeQuery,ConflictingEntityQuery,EntityData,FilterQuery,FindManyQuery,FindQuery,
2222
InsertQuery,RevertClampQuery,RevertRemoveQuery,
2323
};
24+
use graph::data::schema::SCHEMA_TYPE_NAME;
2425
use graph::prelude::{
2526
format_err, trace,BlockNumber,Entity,EntityChange,EntityChangeOperation,EntityCollection,
2627
EntityFilter,EntityKey,EntityOrder,EntityRange,Logger,QueryExecutionError,StoreError,
@@ -174,6 +175,8 @@ impl Layout {
174175

175176
for defnin&document.definitions{
176177
match defn{
178+
// Do not create a table for the _Schema_ type
179+
TypeDefinition(Object(obj_type))if obj_type.name.eq(SCHEMA_TYPE_NAME) =>{}
177180
TypeDefinition(Object(obj_type)) =>{
178181
let table =Table::new(
179182
obj_type,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp