From be8310ed4a37c4fa4787edf036dbf3011feea6dc Mon Sep 17 00:00:00 2001 From: PascalSenn Date: Tue, 3 May 2022 23:28:09 +0200 Subject: [PATCH] Fixed snapshots in data (#5026) --- ...otChocolateDataRequestBuilderExtensions.cs | 12 +++++++++-- ...reate_CollectionLengthExpression_null.snap | 4 ++-- ...ollectionLengthExpression_null_NET6_0.snap | 4 ++-- ...t.FilterInputType_Inline_AddDirective.snap | 8 ++++---- ...ilterInputType_Inline_AllowAndAllowOr.snap | 8 ++++---- ...st.FilterInputType_Inline_RenameTypes.snap | 8 ++++---- ...erInputType_Inline_SetTypeDescription.snap | 8 ++++---- ...lterInputType_Inline_SwitchToImplicit.snap | 20 +++++++++---------- 8 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/HotChocolate/Data/src/Data/Extensions/HotChocolateDataRequestBuilderExtensions.cs b/src/HotChocolate/Data/src/Data/Extensions/HotChocolateDataRequestBuilderExtensions.cs index 1b0f2b6d1c0..e4498ac9128 100644 --- a/src/HotChocolate/Data/src/Data/Extensions/HotChocolateDataRequestBuilderExtensions.cs +++ b/src/HotChocolate/Data/src/Data/Extensions/HotChocolateDataRequestBuilderExtensions.cs @@ -23,14 +23,22 @@ public static class HotChocolateDataRequestBuilderExtensions /// /// The filter convention name. /// + /// + /// If true uses the old naming convention + /// /// /// Returns the . /// public static IRequestExecutorBuilder AddFiltering( this IRequestExecutorBuilder builder, string? name = null, - bool compatabilityMode = false) => - builder.ConfigureSchema(s => s.AddFiltering(name, compatabilityMode)); + bool compatabilityMode = false) + { + builder.Services.AddSingleton( + new FilterContextParameterExpressionBuilder()); + + return builder.ConfigureSchema(s => s.AddFiltering(name, compatabilityMode)); + } /// /// Adds filtering support. diff --git a/src/HotChocolate/Data/test/Data.Filters.InMemory.Tests/__snapshots__/QueryableFilterVisitorExpressionTests.Create_CollectionLengthExpression_null.snap b/src/HotChocolate/Data/test/Data.Filters.InMemory.Tests/__snapshots__/QueryableFilterVisitorExpressionTests.Create_CollectionLengthExpression_null.snap index d3e5801b9f1..c5faccf982a 100644 --- a/src/HotChocolate/Data/test/Data.Filters.InMemory.Tests/__snapshots__/QueryableFilterVisitorExpressionTests.Create_CollectionLengthExpression_null.snap +++ b/src/HotChocolate/Data/test/Data.Filters.InMemory.Tests/__snapshots__/QueryableFilterVisitorExpressionTests.Create_CollectionLengthExpression_null.snap @@ -1,7 +1,7 @@ { "errors": [ { - "message": "The provided value for filter \u0060eq\u0060 of type ComparableInt32OperationFilterInput is invalid. Null values are not supported.", + "message": "The provided value for filter \u0060eq\u0060 of type IntOperationFilterInput is invalid. Null values are not supported.", "locations": [ { "line": 1, @@ -14,7 +14,7 @@ "extensions": { "code": "HC0026", "expectedType": "Int!", - "filterType": "ComparableInt32OperationFilterInput" + "filterType": "IntOperationFilterInput" } } ], diff --git a/src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorExpressionTests.Create_CollectionLengthExpression_null_NET6_0.snap b/src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorExpressionTests.Create_CollectionLengthExpression_null_NET6_0.snap index d3e5801b9f1..c5faccf982a 100644 --- a/src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorExpressionTests.Create_CollectionLengthExpression_null_NET6_0.snap +++ b/src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorExpressionTests.Create_CollectionLengthExpression_null_NET6_0.snap @@ -1,7 +1,7 @@ { "errors": [ { - "message": "The provided value for filter \u0060eq\u0060 of type ComparableInt32OperationFilterInput is invalid. Null values are not supported.", + "message": "The provided value for filter \u0060eq\u0060 of type IntOperationFilterInput is invalid. Null values are not supported.", "locations": [ { "line": 1, @@ -14,7 +14,7 @@ "extensions": { "code": "HC0026", "expectedType": "Int!", - "filterType": "ComparableInt32OperationFilterInput" + "filterType": "IntOperationFilterInput" } } ], diff --git a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_AddDirective.snap b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_AddDirective.snap index c119bf0b500..b5c296b8123 100644 --- a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_AddDirective.snap +++ b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_AddDirective.snap @@ -7,7 +7,7 @@ type Query { } input BookAuthorFilterInput @Foobar { - id: ComparableInt32OperationFilterInput + id: IntOperationFilterInput } input BookChaptersFilterInput @Foobar { @@ -21,11 +21,11 @@ input BookFilterInput { author: BookAuthorFilterInput } -input ComparableInt32OperationFilterInput { +input IntOperationFilterInput { eq: Int neq: Int - in: [Int!] - nin: [Int!] + in: [Int] + nin: [Int] gt: Int ngt: Int gte: Int diff --git a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_AllowAndAllowOr.snap b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_AllowAndAllowOr.snap index cf046a94267..ce5bab38e28 100644 --- a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_AllowAndAllowOr.snap +++ b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_AllowAndAllowOr.snap @@ -9,7 +9,7 @@ type Query { input BookAuthorFilterInput { and: [BookAuthorFilterInput!] or: [BookAuthorFilterInput!] - id: ComparableInt32OperationFilterInput + id: IntOperationFilterInput } input BookChaptersFilterInput { @@ -24,11 +24,11 @@ input BookFilterInput { author: BookAuthorFilterInput } -input ComparableInt32OperationFilterInput { +input IntOperationFilterInput { eq: Int neq: Int - in: [Int!] - nin: [Int!] + in: [Int] + nin: [Int] gt: Int ngt: Int gte: Int diff --git a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_RenameTypes.snap b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_RenameTypes.snap index 4418fc46b38..f1cacb33c6a 100644 --- a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_RenameTypes.snap +++ b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_RenameTypes.snap @@ -7,7 +7,7 @@ type Query { } input AuthorInput { - id: ComparableInt32OperationFilterInput + id: IntOperationFilterInput } input BookFilterInput { @@ -21,11 +21,11 @@ input ChaptersInput { eq: Int } -input ComparableInt32OperationFilterInput { +input IntOperationFilterInput { eq: Int neq: Int - in: [Int!] - nin: [Int!] + in: [Int] + nin: [Int] gt: Int ngt: Int gte: Int diff --git a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_SetTypeDescription.snap b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_SetTypeDescription.snap index ba40ede288b..18d062727f0 100644 --- a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_SetTypeDescription.snap +++ b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_SetTypeDescription.snap @@ -8,7 +8,7 @@ type Query { "Test" input BookAuthorFilterInput { - id: ComparableInt32OperationFilterInput + id: IntOperationFilterInput } "Test" @@ -23,11 +23,11 @@ input BookFilterInput { author: BookAuthorFilterInput } -input ComparableInt32OperationFilterInput { +input IntOperationFilterInput { eq: Int neq: Int - in: [Int!] - nin: [Int!] + in: [Int] + nin: [Int] gt: Int ngt: Int gte: Int diff --git a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_SwitchToImplicit.snap b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_SwitchToImplicit.snap index 7381276b266..f4c0d25a532 100644 --- a/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_SwitchToImplicit.snap +++ b/src/HotChocolate/Data/test/Data.Filters.Tests/__snapshots__/FilterInputTypeTest.FilterInputType_Inline_SwitchToImplicit.snap @@ -16,7 +16,7 @@ input AddressFilterInput { } input BookAuthorFilterInput { - id: ComparableInt32OperationFilterInput + id: IntOperationFilterInput name: StringOperationFilterInput address: AddressFilterInput } @@ -27,11 +27,17 @@ input BookFilterInput { author: BookAuthorFilterInput } -input ComparableInt32OperationFilterInput { +input CountryFilterInput { + and: [CountryFilterInput!] + or: [CountryFilterInput!] + name: StringOperationFilterInput +} + +input IntOperationFilterInput { eq: Int neq: Int - in: [Int!] - nin: [Int!] + in: [Int] + nin: [Int] gt: Int ngt: Int gte: Int @@ -42,12 +48,6 @@ input ComparableInt32OperationFilterInput { nlte: Int } -input CountryFilterInput { - and: [CountryFilterInput!] - or: [CountryFilterInput!] - name: StringOperationFilterInput -} - input StringOperationFilterInput { and: [StringOperationFilterInput!] or: [StringOperationFilterInput!]