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: count & orderBy on one2m with multiple fks #2145

Merged
merged 3 commits into from Aug 12, 2021
Merged

fix: count & orderBy on one2m with multiple fks #2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdc4e5a
fix: count on one2m with multiple fks
Weakky Aug 11, 2021
9544a95
fix dm for sqlserver
Weakky Aug 11, 2021
9eb5f33
Merge branch 'master' into fix/rel-count-one2m-many-fks
Weakky Aug 12, 2021
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
76 changes: 76 additions & 0 deletions ...connector-test-kit-rs/query-engine-tests/tests/queries/aggregation/many_count_relation.rs
View file
Open in desktop
Expand Up @@ -214,6 +214,7 @@ mod many_count_rel {

Ok(())
}

fn m_n_self_rel() -> String {
let schema = indoc! {
r#"model User {
Expand Down Expand Up @@ -334,6 +335,81 @@ mod many_count_rel {
Ok(())
}

fn schema_one2m_multi_fks() -> String {
let schema = indoc! {
r#"model User {
#id(id, Int, @id, @default(autoincrement()))
votes Vote[]
UserToObjective UserToObjective[]
}

model Objective {
#id(id, Int, @default(autoincrement()), @id)
name String @unique
UserToObjective UserToObjective[] @relation(name: "UserObjectives")
}

model UserToObjective {
user User @relation(fields: [userId], references: [id])
userId Int
objective Objective @relation(name: "UserObjectives", fields: [objectiveId], references: [id], onDelete: NoAction, onUpdate: NoAction)
objectiveId Int
votes Vote[]

@@id([userId, objectiveId])
}

model Vote {
createdAt DateTime @default(now())
user User @relation(fields: [userId], references: [id])
userId Int
userObjective UserToObjective @relation(fields: [objectiveId, followerId], references: [userId, objectiveId], onDelete: NoAction, onUpdate: NoAction)
objectiveId Int
followerId Int

@@id([userId, objectiveId])
}"#
};

schema.to_owned()
}

// Regression test for: https://github.com/prisma/prisma/issues/7299
#[connector_test(schema(schema_one2m_multi_fks))]
async fn count_one2m_multi_fks(runner: Runner) -> TestResult<()> {
run_query!(
runner,
r#"mutation {
createOneUserToObjective(
data: {
user: { create: {} }
objective: { create: { name: "Objective 1" } }
votes: { create: [{ user: { create: {} } }, { user: { create: {} } }] }
}
) {
userId
_count {
votes
}
}
}
"#
);

insta::assert_snapshot!(
run_query!(&runner, r#"query {
findManyUserToObjective {
_count {
votes
}
}
}"#),
@r###"{"data":{"findManyUserToObjective":[{"_count":{"votes":2}}]}}"###
);

Ok(())
}

async fn create_row(runner: &Runner, data: &str) -> TestResult<()> {
runner
.query(format!("mutation {{ createOnePost(data: {}) {{ id }} }}", data))
Expand Down
30 changes: 15 additions & 15 deletions query-engine/connectors/sql-query-connector/src/join_utils.rs
View file
Open in desktop
Expand Up @@ -63,15 +63,15 @@ fn compute_aggr_join_one2m(
let query = right_fields.iter().fold(query, |acc, f| acc.group_by(f.as_column()));

let pairs = left_fields.into_iter().zip(right_fields.into_iter());
let on_conditions = pairs
let on_conditions: Vec<Expression> = pairs
.map(|(a, b)| {
let col_a = match previous_join {
Some(prev_join) => Column::from((prev_join.alias.to_owned(), a.db_name().to_owned())),
None => a.as_column(),
};
let col_b = Column::from((join_alias.to_owned(), b.db_name().to_owned()));

col_a.equals(col_b)
col_a.equals(col_b).into()
})
.collect::<Vec<_>>();

Expand All @@ -81,7 +81,7 @@ fn compute_aggr_join_one2m(
// + ) AS <ORDER_JOIN_PREFIX> ON (<A | previous_join_alias>.<fk> = <ORDER_JOIN_PREFIX>.<fk>)
let join = Table::from(query)
.alias(join_alias.to_owned())
.on(ConditionTree::single(on_conditions));
.on(ConditionTree::And(on_conditions));

AliasedJoin {
data: join,
Expand Down Expand Up @@ -126,15 +126,15 @@ fn compute_aggr_join_m2m(
// FROM _AtoB
let query = query.value(aggr_expr.alias(aggregator_alias.to_owned()));

let conditions_a: Vec<_> = a_columns
let conditions_a: Vec<Expression> = a_columns
.clone()
.into_iter()
.map(|c| c.equals(rf.related_field().m2m_columns()))
.map(|c| c.equals(rf.related_field().m2m_columns()).into())
.collect();
let conditions_b: Vec<_> = b_columns
let conditions_b: Vec<Expression> = b_columns
.clone()
.into_iter()
.map(|c| c.equals(rf.m2m_columns()))
.map(|c| c.equals(rf.m2m_columns()).into())
.collect();

// SELECT A_A.id, COUNT(*) AS <AGGREGATOR_ALIAS> FROM _AtoB
Expand All @@ -145,13 +145,13 @@ fn compute_aggr_join_m2m(
model_a
.as_table()
.alias(model_a_alias)
.on(ConditionTree::single(conditions_a)),
.on(ConditionTree::And(conditions_a)),
)
.inner_join(
model_b
.as_table()
.alias(model_b_alias)
.on(ConditionTree::single(conditions_b)),
.on(ConditionTree::And(conditions_b)),
);

// SELECT A_A.id, COUNT(*) AS <AGGREGATOR_ALIAS> FROM _AtoB
Expand All @@ -162,15 +162,15 @@ fn compute_aggr_join_m2m(

let (left_fields, right_fields) = (a_ids.scalar_fields(), b_ids.scalar_fields());
let pairs = left_fields.zip(right_fields);
let on_conditions = pairs
let on_conditions: Vec<Expression> = pairs
.map(|(a, b)| {
let col_a = match previous_join {
Some(prev_join) => Column::from((prev_join.alias.to_owned(), a.db_name().to_owned())),
None => a.as_column(),
};
let col_b = Column::from((join_alias.to_owned(), b.db_name().to_owned()));

col_a.equals(col_b)
col_a.equals(col_b).into()
})
.collect::<Vec<_>>();

Expand All @@ -182,7 +182,7 @@ fn compute_aggr_join_m2m(
// + ) AS <ORDER_JOIN_PREFIX> ON (<A | previous_join_alias>.id = <ORDER_JOIN_PREFIX>.id)
let join = Table::from(query)
.alias(join_alias.to_owned())
.on(ConditionTree::single(on_conditions));
.on(ConditionTree::And(on_conditions));

AliasedJoin {
alias: join_alias.to_owned(),
Expand Down Expand Up @@ -212,7 +212,7 @@ pub fn compute_one2m_join(base_model: &ModelRef, rf: &RelationFieldRef, join_pre
let related_model = rf.related_model();
let pairs = left_fields.into_iter().zip(right_fields.into_iter());

let on_conditions = pairs
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()))
Expand All @@ -222,7 +222,7 @@ pub fn compute_one2m_join(base_model: &ModelRef, rf: &RelationFieldRef, join_pre

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

a_col.equals(b_col)
a_col.equals(b_col).into()
})
.collect::<Vec<_>>();

Expand All @@ -231,6 +231,6 @@ pub fn compute_one2m_join(base_model: &ModelRef, rf: &RelationFieldRef, join_pre
data: related_model
.as_table()
.alias(right_table_alias)
.on(ConditionTree::single(on_conditions)),
.on(ConditionTree::And(on_conditions)),
}
}