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: order by self-relation #3208

Merged
merged 2 commits into from Sep 21, 2022
Merged

fix: order by self-relation #3208

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa1ad79
fix: order by self-relation
Weakky Sep 20, 2022
51b54da
fix test for mongo & mssql
Weakky Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
107 changes: 107 additions & 0 deletions ...r-test-kit-rs/query-engine-tests/tests/queries/order_and_pagination/order_by_dependent.rs
View file
Open in desktop
Expand Up @@ -452,4 +452,111 @@ mod order_by_dependent {

Ok(())
}

fn schema_self_rel() -> String {
let schema = indoc! {
r#"model Parent {
#id(id, Int, @id)

resource Resource @relation("Resource", fields: [resourceId], references: [id])
resourceId Int @unique
}

model Resource {
#id(id, Int, @id)

dependsOnId Int?
dependsOn Resource? @relation("DependsOn", fields: [dependsOnId], references: [id])

dependedOn Resource[] @relation("DependsOn")
parent Parent? @relation("Resource")
}
"#
};

schema.to_owned()
}

// Regression test for: https://github.com/prisma/prisma/issues/12003
#[connector_test(schema(schema_self_rel))]
async fn self_relation_works(runner: Runner) -> TestResult<()> {
run_query!(
&runner,
r#"mutation {
createOneParent(
data: {
id: 1
resource: {
create: {
id: 1
dependsOn: { create: { id: 2, dependsOn: { create: { id: 3 } } } }
}
}
}
) {
id
}
}
"#
);
run_query!(
&runner,
r#"mutation {
createOneParent(
data: {
id: 2
resource: {
create: {
id: 4
dependsOn: { create: { id: 5, dependsOn: { create: { id: 6 } } } }
}
}
}
) {
id
}
}
"#
);

insta::assert_snapshot!(
run_query!(&runner, r#"{
findManyParent(orderBy: { resource: { dependsOn: { id: asc } } }) {
id
resource { dependsOn { id } }
}
}"#),
@r###"{"data":{"findManyParent":[{"id":1,"resource":{"dependsOn":{"id":2}}},{"id":2,"resource":{"dependsOn":{"id":5}}}]}}"###
);
insta::assert_snapshot!(
run_query!(&runner, r#"{
findManyParent(orderBy: { resource: { dependsOn: { id: desc } } }) {
id
resource { dependsOn { id } }
}
}"#),
@r###"{"data":{"findManyParent":[{"id":2,"resource":{"dependsOn":{"id":5}}},{"id":1,"resource":{"dependsOn":{"id":2}}}]}}"###
);

insta::assert_snapshot!(
run_query!(&runner, r#"{
findManyParent(orderBy: { resource: { dependsOn: { dependsOn: { id: asc } } } }) {
id
resource { dependsOn { dependsOn { id } } }
}
}"#),
@r###"{"data":{"findManyParent":[{"id":1,"resource":{"dependsOn":{"dependsOn":{"id":3}}}},{"id":2,"resource":{"dependsOn":{"dependsOn":{"id":6}}}}]}}"###
);
insta::assert_snapshot!(
run_query!(&runner, r#"{
findManyParent(orderBy: { resource: { dependsOn: { dependsOn: { id: desc } } } }) {
id
resource { dependsOn { dependsOn { id } } }
}
}"#),
@r###"{"data":{"findManyParent":[{"id":2,"resource":{"dependsOn":{"dependsOn":{"id":6}}}},{"id":1,"resource":{"dependsOn":{"dependsOn":{"id":3}}}}]}}"###
);

Ok(())
}
}
20 changes: 8 additions & 12 deletions query-engine/connectors/sql-query-connector/src/join_utils.rs
View file
Open in desktop
Expand Up @@ -216,7 +216,11 @@ fn compute_aggr_join_m2m(
}
}

pub fn compute_one2m_join(base_model: &ModelRef, rf: &RelationFieldRef, join_prefix: &str) -> AliasedJoin {
pub fn compute_one2m_join(
rf: &RelationFieldRef,
join_prefix: &str,
previous_join: Option<&AliasedJoin>,
) -> AliasedJoin {
let (left_fields, right_fields) = if rf.is_inlined_on_enclosing_model() {
(rf.scalar_fields(), rf.referenced_fields())
} else {
Expand All @@ -226,24 +230,16 @@ pub fn compute_one2m_join(base_model: &ModelRef, rf: &RelationFieldRef, join_pre
)
};

// `rf` is always the relation field on the left model in the join (parent).
let left_table_alias = if rf.model().name != base_model.name {
Some(format!("{}_{}", join_prefix, &rf.model().name))
} else {
None
};

let right_table_alias = format!("{}_{}", join_prefix, &rf.related_model().name);

let related_model = rf.related_model();
let pairs = left_fields.into_iter().zip(right_fields.into_iter());

let on_conditions: Vec<Expression> = pairs
.map(|(a, b)| {
let a_col = if let Some(alias) = left_table_alias.clone() {
Column::from((alias, a.db_name().to_owned()))
} else {
a.as_column()
let a_col = match previous_join {
Some(prev_join) => Column::from((prev_join.alias.to_owned(), a.db_name().to_owned())),
None => a.as_column(),
};
Comment on lines +240 to 243
Copy link
Member Author

Choose a reason for hiding this comment

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

This ensures that if we do something like: { orderBy: { rel: { self_rel: { id: asc } } } }, the second join relies on the first one.

We used to make sure joins relied on each other slightly differently. This should be more bullet-proof.


let b_col = Column::from((right_table_alias.clone(), b.db_name().to_owned()));
Expand Down