Skip to content

Commit

Permalink
fix: batching should work with non unique scalar filters (#3328)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Weakky
Weakky committed Nov 7, 2022
1 parent 2321d7e commit 2e719ef
Show file tree
Hide file tree
Showing 14 changed files with 454 additions and 61 deletions.
4 changes: 2 additions & 2 deletions query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_5952.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ mod regression {
.assert_success();

let queries = vec![
r#"query {findUniqueArtist(where:{firstName_lastName_birth:{firstName:"Michael",netWorth:"236600000.12409"}}) {firstName netWorth}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName_birth:{firstName:"George",netWorth:"-0.23660010012409"}}) {firstName netWorth}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_netWorth:{firstName:"Michael",netWorth:"236600000.12409"}}) {firstName netWorth}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_netWorth:{firstName:"George",netWorth:"-0.23660010012409"}}) {firstName netWorth}}"#.to_string(),
];

let batch_results = runner.batch(queries, false, None).await?;
Expand Down
235 changes: 233 additions & 2 deletions ...ngine/connector-test-kit-rs/query-engine-tests/tests/queries/batch/select_one_compound.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ use query_engine_tests::*;
#[test_suite(schema(schema), capabilities(AnyId))]
mod compound_batch {
use indoc::indoc;
use query_engine_tests::query_core::{BatchDocument, QueryDocument};

fn schema() -> String {
let schema = indoc! {
r#"model Artist {
firstName String
lastName String
non_unique Int?
@@unique([firstName, lastName])
}"#
Expand All @@ -24,13 +26,22 @@ mod compound_batch {
let queries = vec![
r#"query { findUniqueArtist(where: { firstName_lastName: { firstName:"Musti", lastName:"Naukio" }}) { firstName lastName }}"#.to_string()
];

let batch_results = runner.batch(queries, false, None).await?;
insta::assert_snapshot!(
batch_results.to_string(),
@r###"{"batchResult":[{"data":{"findUniqueArtist":{"firstName":"Musti","lastName":"Naukio"}}}]}"###
);

// With non unique filters
let queries = vec![
r#"query { findUniqueArtist(where: { firstName_lastName: { firstName:"Musti", lastName:"Naukio", non_unique: 0 }}) { firstName lastName non_unique }}"#.to_string()
];
let batch_results = runner.batch(queries, false, None).await?;
insta::assert_snapshot!(
batch_results.to_string(),
@r###"{"batchResult":[{"data":{"findUniqueArtist":{"firstName":"Musti","lastName":"Naukio","non_unique":0}}}]}"###
);

Ok(())
}

Expand All @@ -43,7 +54,18 @@ mod compound_batch {
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Naukio",lastName:"Musti"}}) {firstName lastName}}"#.to_string(),
];
let batch_results = runner.batch(queries, false, None).await?;
insta::assert_snapshot!(
batch_results.to_string(),
@r###"{"batchResult":[{"data":{"findUniqueArtist":{"firstName":"Musti","lastName":"Naukio"}}},{"data":{"findUniqueArtist":null}},{"data":{"findUniqueArtist":{"firstName":"Naukio","lastName":"Musti"}}}]}"###
);

// With non unique filters
let queries = vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio", non_unique: 0}}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio", non_unique: 1}}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Naukio",lastName:"Musti", non_unique: null}}) {firstName lastName}}"#.to_string(),
];
let batch_results = runner.batch(queries, false, None).await?;
insta::assert_snapshot!(
batch_results.to_string(),
Expand All @@ -68,6 +90,18 @@ mod compound_batch {
@r###"{"batchResult":[{"data":{"findUniqueArtist":{"firstName":"Musti","lastName":"Naukio"}}},{"data":{"findUniqueArtist":{"firstName":"Naukio","lastName":"Musti"}}}]}"###
);

// With non unique filters
let queries = vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, non_unique: 0}) {non_unique firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Naukio",lastName:"Musti"}, non_unique: null}) {lastName firstName}}"#.to_string(),
];

let batch_results = runner.batch(queries, false, None).await?;
insta::assert_snapshot!(
batch_results.to_string(),
@r###"{"batchResult":[{"data":{"findUniqueArtist":{"non_unique":0,"firstName":"Musti","lastName":"Naukio"}}},{"data":{"findUniqueArtist":{"lastName":"Musti","firstName":"Naukio"}}}]}"###
);

Ok(())
}

Expand All @@ -88,6 +122,19 @@ mod compound_batch {
@r###"{"batchResult":[{"data":{"findUniqueArtist":{"firstName":"Musti","lastName":"Naukio"}}},{"data":{"findUniqueArtist":null}},{"data":{"findUniqueArtist":{"firstName":"Naukio","lastName":"Musti"}}}]}"###
);

// With non unique filters
let queries = vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, non_unique: { equals: 0 }}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, non_unique: 1}) {lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Naukio",lastName:"Musti"}, non_unique: null}) {firstName lastName}}"#.to_string(),
];

let batch_results = runner.batch(queries, false, None).await?;
insta::assert_snapshot!(
batch_results.to_string(),
@r###"{"batchResult":[{"data":{"findUniqueArtist":{"firstName":"Musti","lastName":"Naukio"}}},{"data":{"findUniqueArtist":null}},{"data":{"findUniqueArtist":{"firstName":"Naukio","lastName":"Musti"}}}]}"###
);

Ok(())
}

Expand Down Expand Up @@ -127,9 +174,193 @@ mod compound_batch {
Ok(())
}

#[connector_test]
async fn no_compact_but_works_as_batch(runner: Runner) -> TestResult<()> {
create_test_data(&runner).await?;

let queries = vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, non_unique: { gte: 0 }}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Naukio",lastName:"Musti"}, non_unique: null}) {firstName lastName}}"#.to_string(),
];

let batch_results = runner.batch(queries, false, None).await?;
insta::assert_snapshot!(
batch_results.to_string(),
@r###"{"batchResult":[{"data":{"findUniqueArtist":{"firstName":"Musti","lastName":"Naukio"}}},{"data":{"findUniqueArtist":{"firstName":"Naukio","lastName":"Musti"}}}]}"###
);

Ok(())
}

fn should_batch_schema() -> String {
let schema = indoc! {
r#"model Artist {
#id(id, Int, @id)
firstName String
lastName String
non_unique Int?
songs Song[]
@@unique([firstName, lastName])
}
model Song {
#id(id, Int, @id)
title String
artistId Int?
artist Artist? @relation(fields: [artistId], references: [id])
}
"#
};

schema.to_owned()
}

// Ensures non compactable batch are not compacted
#[connector_test(schema(should_batch_schema))]
async fn should_only_batch_if_possible(runner: Runner) -> TestResult<()> {
// COMPACT: Queries use compound unique
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}}) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact());

// COMPACT: Queries use compound unique + non unique equal filter (shorthand syntax)
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, non_unique: 0}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, non_unique: 1}) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact());

// COMPACT: Queries use compound unique + non unique equal filter
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, non_unique: 0}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, non_unique: { equals: 1 }}) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact());

// COMPACT: Queries use compound unique + non unique equal filter
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, non_unique: 0}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}}) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact());

// COMPACT: Queries use compound unique + non unique equal filter (null)
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, non_unique: null}) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, non_unique: { equals: null }}) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact());

// NO COMPACT: Queries use boolean operators
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, OR: [{ non_unique: 0 }] }) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, OR: [{ non_unique: 0 }] }) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact() == false);

// NO COMPACT: Queries use boolean operators
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, AND: [{ non_unique: 0 }] }) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, AND: [{ non_unique: 0 }] }) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact() == false);

// NO COMPACT: Queries use boolean operators
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, NOT: [{ non_unique: 0 }] }) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, NOT: [{ non_unique: 1 }] }) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact() == false);

// NO COMPACT: Queries use relation
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, songs: { some: { title: "Bohemian Rapsody" } } }) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, songs: { some: { title: "Somebody To Love" } } }) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact() == false);

// NO COMPACT: Queries use non unique filter that's not EQUALS
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"}, non_unique: { gt: 1 } }) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, non_unique: { gt: 1 } }) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact() == false);

// NO COMPACT: One of the query uses a non unique filter that's not EQUALS
let doc = compact_batch(&runner, vec![
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"Musti",lastName:"Naukio"} }) {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, non_unique: { gt: 1 } }) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact() == false);

// NO COMPACT: One of the query is not a findUnique
let doc = compact_batch(&runner, vec![
r#"query {findManyArtist {firstName lastName}}"#.to_string(),
r#"query {findUniqueArtist(where:{firstName_lastName:{firstName:"NO",lastName:"AVAIL"}, non_unique: { gt: 1 } }) {firstName lastName}}"#.to_string(),
]).await?;
assert!(doc.is_compact() == false);

Ok(())
}

#[connector_test(schema(common_list_types), capabilities(ScalarLists))]
async fn should_only_batch_if_possible_list(runner: Runner) -> TestResult<()> {
run_query!(
&runner,
r#"mutation { createOneTestModel(data: { id: 1, int: [1, 2, 3] }) { id } }"#
);
run_query!(
&runner,
r#"mutation { createOneTestModel(data: { id: 2, int: [1, 3, 4] }) { id } }"#
);

let queries = vec![
r#"query {findUniqueTestModel(where:{ id: 1, int: { equals: [1, 2, 3] } }) {id, int}}"#.to_string(),
r#"query {findUniqueTestModel(where:{ id: 2, int: { equals: [1, 3, 4] } }) {id, int}}"#.to_string(),
];

// COMPACT: Queries use scalar list
let doc = compact_batch(&runner, queries.clone()).await?;
assert!(doc.is_compact());

let batch_results = runner.batch(queries, false, None).await?;
insta::assert_snapshot!(
batch_results.to_string(),
@r###"{"batchResult":[{"data":{"findUniqueTestModel":{"id":1,"int":[1,2,3]}}},{"data":{"findUniqueTestModel":{"id":2,"int":[1,3,4]}}}]}"###
);

Ok(())
}

async fn compact_batch(runner: &Runner, queries: Vec<String>) -> TestResult<BatchDocument> {
// Ensure queries are valid
for q in queries.iter() {
run_query!(runner, q.to_string());
}

let doc = GraphQlBody::Multi(MultiQuery::new(
queries.into_iter().map(Into::into).collect(),
false,
None,
))
.into_doc()
.unwrap();
let batch = match doc {
QueryDocument::Multi(batch) => batch.compact(runner.query_schema()),
_ => unreachable!(),
};

Ok(batch.compact(runner.query_schema()))
}

async fn create_test_data(runner: &Runner) -> TestResult<()> {
runner
.query(r#"mutation { createOneArtist(data: { firstName: "Musti" lastName: "Naukio" }) { firstName }}"#)
.query(r#"mutation { createOneArtist(data: { firstName: "Musti" lastName: "Naukio", non_unique: 0 }) { firstName }}"#)
.await?
.assert_success();

Expand Down

0 comments on commit 2e719ef

Please sign in to comment.