Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(qe): make UpdateRecord::WithSelection nodes return RecordSelection #4508

Merged
merged 10 commits into from
Dec 4, 2023
Merged

fix(qe): make UpdateRecord::WithSelection nodes return RecordSelection #4508

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2107881
fix(qe): regression in queries with update returning
aqrln Nov 30, 2023
767351c
Show selection in update nodes in graphviz visualization
aqrln Nov 30, 2023
e25151c
Project node's selection result into dependent's field selection
aqrln Nov 30, 2023
315f46a
Remove unnecessary type annotation
aqrln Nov 30, 2023
b5584df
Revert "Remove unnecessary type annotation"
aqrln Dec 1, 2023
94c60ce
Revert "Project node's selection result into dependent's field select…
aqrln Dec 1, 2023
6f7607a
Make `UpdateRecord::WithSelection` always have name
aqrln Dec 1, 2023
4a76e4e
Add graphviz to the dev shell
aqrln Dec 1, 2023
afcae32
Use an empty string instead of a dummy name
aqrln Dec 1, 2023
27b325d
Add comment and rename test
aqrln Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nix/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ in
nodejs.pkgs.pnpm

jq
graphviz
wasm-bindgen-cli
wasm-pack
];
Expand Down
1 change: 1 addition & 0 deletions query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ mod prisma_16760;
mod prisma_17103;
mod prisma_18517;
mod prisma_20799;
mod prisma_21182;
mod prisma_21369;
mod prisma_21901;
mod prisma_5952;
Expand Down
97 changes: 97 additions & 0 deletions query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_21182.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
use query_engine_tests::*;

#[test_suite(schema(schema))]
mod regression {
use indoc::indoc;

fn schema() -> String {
indoc! {r#"
model User {
#id(id, Int, @id)
email String @unique
name String?
roleId Int
role Role @relation(fields: [roleId], references: [id])
}

model Role {
#id(id, Int, @id)
name String
users User[]

tagId Int?
tag Tag? @relation(fields: [tagId], references: [id])
}

model Tag {
#id(id, Int, @id)
name String
roles Role[]
}
"#}
.to_owned()
}

#[connector_test]
async fn query_with_merged_deps(runner: Runner) -> TestResult<()> {
run_query!(
runner,
indoc! {r#"
mutation {
createOneUser (
data: {
id: 1,
email: "[email protected]",
role: {
create: {
id: 1,
name: "ADMIN",
tag: {
create: {
id: 1,
name: "cs"
}
}
}
}
}
) {
id,
email,
roleId
}
}
"#}
);

run_query!(
runner,
indoc! {r#"
mutation {
updateOneUser(
where: {
email: "[email protected]",
},
data: {
role: {
update: {
data: {
tag: {
disconnect: true
}
}
}
}
}
) {
id,
email,
roleId
}
}
"#}
);

Ok(())
}
}
11 changes: 2 additions & 9 deletions query-engine/core/src/interpreter/query_interpreters/write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ async fn update_one(
.await?;

match q {
UpdateRecord::WithSelection(q) if q.name.is_some() => {
UpdateRecord::WithSelection(q) => {
let res = res
.map(|res| RecordSelection {
name: q.name.unwrap(),
name: q.name,
fields: q.selection_order,
scalars: res.into(),
nested: vec![],
Expand All @@ -95,13 +95,6 @@ async fn update_one(

Ok(QueryResult::RecordSelection(res))
}
UpdateRecord::WithSelection(q) => {
let res = res
.map(|record| record.extract_selection_result(&q.selected_fields))
.transpose()?;

Ok(QueryResult::Id(res))
}
UpdateRecord::WithoutSelection(_) => {
let res = res
.map(|record| record.extract_selection_result(&q.model().primary_identifier()))
Expand Down
9 changes: 6 additions & 3 deletions query-engine/core/src/query_ast/write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ impl ToGraphviz for WriteQuery {
match self {
Self::CreateRecord(q) => format!("CreateRecord(model: {}, args: {:?})", q.model.name(), q.args),
Self::CreateManyRecords(q) => format!("CreateManyRecord(model: {})", q.model.name()),
Self::UpdateRecord(q) => format!("UpdateRecord(model: {})", q.model().name(),),
Self::UpdateRecord(q) => format!(
"UpdateRecord(model: {}, selection: {:?})",
q.model().name(),
q.selected_fields()
),
Self::DeleteRecord(q) => format!("DeleteRecord: {}, {:?}", q.model.name(), q.record_filter),
Self::UpdateManyRecords(q) => format!("UpdateManyRecords(model: {}, args: {:?})", q.model.name(), q.args),
Self::DeleteManyRecords(q) => format!("DeleteManyRecords: {}", q.model.name()),
Expand Down Expand Up @@ -303,8 +307,7 @@ impl UpdateRecord {

#[derive(Debug, Clone)]
pub struct UpdateRecordWithSelection {
// Used for serialization. When `None`, the result will only be used to fulfill other nodes requirement.
pub name: Option<String>,
pub name: String,
pub model: Model,
pub record_filter: RecordFilter,
pub args: WriteArgs,
Expand Down
4 changes: 2 additions & 2 deletions query-engine/core/src/query_graph_builder/write/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ where

Query::Write(WriteQuery::UpdateRecord(UpdateRecord::WithSelection(
UpdateRecordWithSelection {
name: Some(field.name.to_owned()),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed to_owned() because field.name is already an owned string, and we don't need it anymore here so we can just move it without cloning.

name: field.name,
model: model.clone(),
record_filter: filter.into(),
args,
Expand All @@ -215,7 +215,7 @@ where

Query::Write(WriteQuery::UpdateRecord(UpdateRecord::WithSelection(
UpdateRecordWithSelection {
name: None,
name: String::new(), // This node will not be serialized so we don't need a name.
model: model.clone(),
record_filter: filter.into(),
args,
Expand Down
Loading