Fixed issue in parser for directive location VARIABLE_DEFINITION. (#6553

)

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_NullableStringContains_Expression_NET8_0.snap

@@ -17,7 +17,7 @@ a SQL:
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NOT NULL AND (@__p_0 = '' OR instr("d"."Bar", @__p_0) > 0)
+WHERE "d"."Bar" IS NOT NULL AND instr("d"."Bar", @__p_0) > 0
 ---------------
 
 b Result:
@@ -39,7 +39,7 @@ b SQL:
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NOT NULL AND (@__p_0 = '' OR instr("d"."Bar", @__p_0) > 0)
+WHERE "d"."Bar" IS NOT NULL AND instr("d"."Bar", @__p_0) > 0
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_NullableStringEndsWith_Expression_NET8_0.snap

@@ -13,11 +13,11 @@ atest Result:
 
 atest SQL:
 ---------------
-.param set @__p_0 'atest'
+.param set @__p_0_rewritten '%atest'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NOT NULL AND (@__p_0 = '' OR substr("d"."Bar", -length(@__p_0)) = @__p_0 OR @__p_0 = '')
+WHERE "d"."Bar" IS NOT NULL AND "d"."Bar" LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 btest Result:
@@ -35,11 +35,11 @@ btest Result:
 
 btest SQL:
 ---------------
-.param set @__p_0 'btest'
+.param set @__p_0_rewritten '%btest'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NOT NULL AND (@__p_0 = '' OR substr("d"."Bar", -length(@__p_0)) = @__p_0 OR @__p_0 = '')
+WHERE "d"."Bar" IS NOT NULL AND "d"."Bar" LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_NullableStringNoContains_Expression_NET8_0.snap

@@ -20,7 +20,7 @@ a SQL:
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NULL OR NOT (@__p_0 = '' OR instr("d"."Bar", @__p_0) > 0)
+WHERE "d"."Bar" IS NULL OR NOT (instr("d"."Bar", @__p_0) > 0)
 ---------------
 
 b Result:
@@ -45,7 +45,7 @@ b SQL:
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NULL OR NOT (@__p_0 = '' OR instr("d"."Bar", @__p_0) > 0)
+WHERE "d"."Bar" IS NULL OR NOT (instr("d"."Bar", @__p_0) > 0)
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_NullableStringNotEndsWith_Expression_NET8_0.snap

@@ -16,11 +16,11 @@ atest Result:
 
 atest SQL:
 ---------------
-.param set @__p_0 'atest'
+.param set @__p_0_rewritten '%atest'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NULL OR (@__p_0 <> '' AND substr("d"."Bar", -length(@__p_0)) <> @__p_0 AND @__p_0 <> '')
+WHERE "d"."Bar" IS NULL OR "d"."Bar" NOT LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 btest Result:
@@ -41,11 +41,11 @@ btest Result:
 
 btest SQL:
 ---------------
-.param set @__p_0 'btest'
+.param set @__p_0_rewritten '%btest'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NULL OR (@__p_0 <> '' AND substr("d"."Bar", -length(@__p_0)) <> @__p_0 AND @__p_0 <> '')
+WHERE "d"."Bar" IS NULL OR "d"."Bar" NOT LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_NullableStringNotStartsWith_Expression_NET8_0.snap

@@ -16,11 +16,11 @@ testa Result:
 
 testa SQL:
 ---------------
-.param set @__p_0 'testa'
+.param set @__p_0_rewritten 'testa%'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NULL OR (@__p_0 <> '' AND ("d"."Bar" NOT LIKE @__p_0 || '%' OR substr("d"."Bar", 1, length(@__p_0)) <> @__p_0) AND @__p_0 <> '')
+WHERE "d"."Bar" IS NULL OR "d"."Bar" NOT LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 testb Result:
@@ -41,11 +41,11 @@ testb Result:
 
 testb SQL:
 ---------------
-.param set @__p_0 'testb'
+.param set @__p_0_rewritten 'testb%'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NULL OR (@__p_0 <> '' AND ("d"."Bar" NOT LIKE @__p_0 || '%' OR substr("d"."Bar", 1, length(@__p_0)) <> @__p_0) AND @__p_0 <> '')
+WHERE "d"."Bar" IS NULL OR "d"."Bar" NOT LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_NullableStringStartsWith_Expression_NET8_0.snap

@@ -13,11 +13,11 @@ testa Result:
 
 testa SQL:
 ---------------
-.param set @__p_0 'testa'
+.param set @__p_0_rewritten 'testa%'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NOT NULL AND (@__p_0 = '' OR ("d"."Bar" LIKE @__p_0 || '%' AND substr("d"."Bar", 1, length(@__p_0)) = @__p_0) OR @__p_0 = '')
+WHERE "d"."Bar" IS NOT NULL AND "d"."Bar" LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 testb Result:
@@ -35,11 +35,11 @@ testb Result:
 
 testb SQL:
 ---------------
-.param set @__p_0 'testb'
+.param set @__p_0_rewritten 'testb%'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE "d"."Bar" IS NOT NULL AND (@__p_0 = '' OR ("d"."Bar" LIKE @__p_0 || '%' AND substr("d"."Bar", 1, length(@__p_0)) = @__p_0) OR @__p_0 = '')
+WHERE "d"."Bar" IS NOT NULL AND "d"."Bar" LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_StringContains_Expression_NET8_0.snap

@@ -17,7 +17,7 @@ a SQL:
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 = '' OR instr("d"."Bar", @__p_0) > 0
+WHERE instr("d"."Bar", @__p_0) > 0
 ---------------
 
 b Result:
@@ -39,7 +39,7 @@ b SQL:
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 = '' OR instr("d"."Bar", @__p_0) > 0
+WHERE instr("d"."Bar", @__p_0) > 0
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_StringEndsWith_Expression_NET8_0.snap

@@ -13,11 +13,11 @@ atest Result:
 
 atest SQL:
 ---------------
-.param set @__p_0 'atest'
+.param set @__p_0_rewritten '%atest'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 = '' OR substr("d"."Bar", -length(@__p_0)) = @__p_0 OR @__p_0 = ''
+WHERE "d"."Bar" LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 btest Result:
@@ -35,11 +35,11 @@ btest Result:
 
 btest SQL:
 ---------------
-.param set @__p_0 'btest'
+.param set @__p_0_rewritten '%btest'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 = '' OR substr("d"."Bar", -length(@__p_0)) = @__p_0 OR @__p_0 = ''
+WHERE "d"."Bar" LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_StringNoContains_Expression_NET8_0.snap

@@ -17,7 +17,7 @@ a SQL:
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE NOT (@__p_0 = '' OR instr("d"."Bar", @__p_0) > 0)
+WHERE NOT (instr("d"."Bar", @__p_0) > 0)
 ---------------
 
 b Result:
@@ -39,7 +39,7 @@ b SQL:
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE NOT (@__p_0 = '' OR instr("d"."Bar", @__p_0) > 0)
+WHERE NOT (instr("d"."Bar", @__p_0) > 0)
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_StringNotEndsWith_Expression_NET8_0.snap

@@ -13,11 +13,11 @@ atest Result:
 
 atest SQL:
 ---------------
-.param set @__p_0 'atest'
+.param set @__p_0_rewritten '%atest'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 <> '' AND substr("d"."Bar", -length(@__p_0)) <> @__p_0 AND @__p_0 <> ''
+WHERE "d"."Bar" NOT LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 btest Result:
@@ -35,11 +35,11 @@ btest Result:
 
 btest SQL:
 ---------------
-.param set @__p_0 'btest'
+.param set @__p_0_rewritten '%btest'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 <> '' AND substr("d"."Bar", -length(@__p_0)) <> @__p_0 AND @__p_0 <> ''
+WHERE "d"."Bar" NOT LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_StringNotStartsWith_Expression_NET8_0.snap

@@ -13,11 +13,11 @@ testa Result:
 
 testa SQL:
 ---------------
-.param set @__p_0 'testa'
+.param set @__p_0_rewritten 'testa%'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 <> '' AND ("d"."Bar" NOT LIKE @__p_0 || '%' OR substr("d"."Bar", 1, length(@__p_0)) <> @__p_0) AND @__p_0 <> ''
+WHERE "d"."Bar" NOT LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 testb Result:
@@ -35,11 +35,11 @@ testb Result:
 
 testb SQL:
 ---------------
-.param set @__p_0 'testb'
+.param set @__p_0_rewritten 'testb%'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 <> '' AND ("d"."Bar" NOT LIKE @__p_0 || '%' OR substr("d"."Bar", 1, length(@__p_0)) <> @__p_0) AND @__p_0 <> ''
+WHERE "d"."Bar" NOT LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 null

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorStringTests.Create_StringStartsWith_Expression_NET8_0.snap

@@ -13,11 +13,11 @@ testa Result:
 
 testa SQL:
 ---------------
-.param set @__p_0 'testa'
+.param set @__p_0_rewritten 'testa%'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 = '' OR ("d"."Bar" LIKE @__p_0 || '%' AND substr("d"."Bar", 1, length(@__p_0)) = @__p_0) OR @__p_0 = ''
+WHERE "d"."Bar" LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 testb Result:
@@ -35,11 +35,11 @@ testb Result:
 
 testb SQL:
 ---------------
-.param set @__p_0 'testb'
+.param set @__p_0_rewritten 'testb%'
 
 SELECT "d"."Id", "d"."Bar"
 FROM "Data" AS "d"
-WHERE @__p_0 = '' OR ("d"."Bar" LIKE @__p_0 || '%' AND substr("d"."Bar", 1, length(@__p_0)) = @__p_0) OR @__p_0 = ''
+WHERE "d"."Bar" LIKE @__p_0_rewritten ESCAPE '\'
 ---------------
 
 null

src/HotChocolate/Fusion/test/Composition.Tests/__snapshots__/DescriptionMergeTests.Output_Rewrite_Nullability_For_Output_Types.graphql

@@ -54,4 +54,6 @@ input FooInput {
 enum Foo {
   "Bar enum value"
   BAR
+    @source(subgraph: "A")
+    @source(subgraph: "B")
 }

src/HotChocolate/Language/src/Language.SyntaxTree/DirectiveLocation.cs

@@ -128,6 +128,7 @@ private static IEnumerable<DirectiveLocation> GetAll()
         yield return FragmentDefinition;
         yield return FragmentSpread;
         yield return InlineFragment;
+        yield return VariableDefinition;
         yield return Schema;
         yield return Scalar;
         yield return Object;

src/HotChocolate/Language/test/Language.Tests/Parser/SchemaParserTests.cs

@@ -149,4 +149,17 @@ public void OneGraph_Schema()
         // assert
         document.ToString().MatchSnapshot();
     }
+
+    [Fact]
+    public void Parse_Directive_With_VariableDefinition()
+    {
+        // arrange
+        const string sourceText = "directive @foo(a: String) on VARIABLE_DEFINITION";
+
+        // act
+        var document = Utf8GraphQLParser.Parse(sourceText);
+
+        // assert
+        document.ToString().MatchSnapshot();
+    }
 }

src/HotChocolate/Language/test/Language.Tests/Parser/__snapshots__/SchemaParserTests.Parse_Directive_With_VariableDefinition.snap

@@ -0,0 +1 @@
+directive @foo(a: String) on VARIABLE_DEFINITION