hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2024-12-15 09:22:43 +03:00
Code Issues Projects Releases Wiki Activity

Make schema field mandatory in ConnectorLink (#315)

Browse Source 
V3_GIT_ORIGIN_REV_ID: 5d782bc8dec8630b5b63821b61ecec615f0ed47f
This commit is contained in:
Abhinav Gupta 2024-02-05 15:10:50 -08:00 committed by hasura-bot
parent 339cc34d06
commit dfd2e940b1
4 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
v3/engine/src/metadata/resolved/data_connector.rs
View File

@ -267,7 +267,14 @@ mod tests {
"url": { "singleUrl": { "value": "http://test.com" } }, "url": { "singleUrl": { "value": "http://test.com" } },
"schema": { "schema": {
"version": "v0.1", "version": "v0.1",
"capabilities": { "versions": "1", "capabilities": { "query": {} }} "capabilities": { "versions": "1", "capabilities": { "query": {} }},
"schema": {
"scalar_types": {},
"object_types": {},
"collections": [],
"functions": [],
"procedures": []
}
} }
} }
"#, "#,

14
v3/open-dds/metadata.jsonschema
View File

@ -515,6 +515,7 @@
"type": "object", "type": "object",
"required": [ "required": [
"capabilities", "capabilities",
"schema",
"version" "version"
], ],
"properties": { "properties": {
@ -525,18 +526,7 @@
] ]
}, },
"schema": { "schema": {
"default": { "$ref": "https://raw.githubusercontent.com/hasura/ndc-spec/v0.1.0-rc.13/ndc-client/tests/json_schema/schema_response.jsonschema"
"scalar_types": {},
"object_types": {},
"collections": [],
"functions": [],
"procedures": []
},
"allOf": [
{
"$ref": "https://raw.githubusercontent.com/hasura/ndc-spec/v0.1.0-rc.13/ndc-client/tests/json_schema/schema_response.jsonschema"
}
]
}, },
"capabilities": { "capabilities": {
"$ref": "https://raw.githubusercontent.com/hasura/ndc-spec/v0.1.0-rc.13/ndc-client/tests/json_schema/capabilities_response.jsonschema" "$ref": "https://raw.githubusercontent.com/hasura/ndc-spec/v0.1.0-rc.13/ndc-client/tests/json_schema/capabilities_response.jsonschema"

15
v3/open-dds/src/data_connector.rs
View File

@ -58,7 +58,6 @@ pub enum VersionedSchemaAndCapabilities {
#[schemars(title = "SchemaAndCapabilitiesV01")] #[schemars(title = "SchemaAndCapabilitiesV01")]
pub struct SchemaAndCapabilitiesV01 { pub struct SchemaAndCapabilitiesV01 {
#[schemars(schema_with = "ndc_schema_response_v01_schema_reference")] #[schemars(schema_with = "ndc_schema_response_v01_schema_reference")]
#[serde(default)]
pub schema: SchemaResponse, pub schema: SchemaResponse,
#[schemars(schema_with = "ndc_capabilities_response_v01_schema_reference")] #[schemars(schema_with = "ndc_capabilities_response_v01_schema_reference")]
pub capabilities: CapabilitiesResponse, pub capabilities: CapabilitiesResponse,
@ -94,6 +93,13 @@ mod tests {
"capabilities": { "capabilities": {
"query": {} "query": {}
} }
},
"schema": {
"scalar_types": {},
"object_types": {},
"collections": [],
"functions": [],
"procedures": []
} }
} }
} }
@ -123,6 +129,13 @@ mod tests {
"capabilities": { "capabilities": {
"query": {} "query": {}
} }
},
"schema": {
"scalar_types": {},
"object_types": {},
"collections": [],
"functions": [],
"procedures": []
} }
} }
} }

9
v3/open-dds/src/data_connector/v1.rs
View File

@ -62,7 +62,14 @@ impl DataConnectorLinkV1 {
"variables": {} "variables": {}
} }
} }
} },
"schema": {
"scalar_types": {},
"object_types": {},
"collections": [],
"functions": [],
"procedures": []
}
} }
} }
"#, "#,