Merge branch 'main' of https://github.com/SimonCropp/GraphQL.EntityFramework

SimonCropp · SimonCropp · commit f6889c0db170 · 2022-11-14T20:01:55.000+11:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;NU5104;CS1573</NoWarn>
-    <Version>21.0.0</Version>
+    <Version>21.1.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>EntityFrameworkCore, EntityFramework, GraphQL</PackageTags>
     <ImplicitUsings>true</ImplicitUsings>
diff --git a/src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj b/src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj
@@ -8,9 +8,9 @@
     <PackageReference Include="Fody" Version="6.6.4" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="GraphQL" Version="7.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
     <PackageReference Include="Nullability" Version="2.0.4" />
-    <PackageReference Include="ProjectDefaults" Version="1.0.81" PrivateAssets="all" />
+    <PackageReference Include="ProjectDefaults" Version="1.0.82" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
     <Using Include="System.Linq.Expressions" />
     <Using Include="GraphQL.Types" />
diff --git a/src/SampleWeb.Tests/SampleWeb.Tests.csproj b/src/SampleWeb.Tests/SampleWeb.Tests.csproj
@@ -5,12 +5,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="GraphQL" Version="7.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
     <PackageReference Include="Xunit" Version="2.4.2" />
-    <PackageReference Include="Verify.Xunit" Version="18.3.0" />
+    <PackageReference Include="Verify.Xunit" Version="19.1.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <ProjectReference Include="..\SampleWeb\SampleWeb.csproj" />
-    <PackageReference Include="ProjectDefaults" Version="1.0.81" PrivateAssets="all" />
+    <PackageReference Include="ProjectDefaults" Version="1.0.82" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/SampleWeb/SampleWeb.csproj b/src/SampleWeb/SampleWeb.csproj
@@ -5,13 +5,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="wwwroot\" />
-    <PackageReference Include="EfLocalDb" Version="13.9.4" />
+    <PackageReference Include="EfLocalDb" Version="14.0.0" />
     <PackageReference Include="graphiql" Version="2.0.0" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="7.1.1" />
     <PackageReference Include="GraphQL" Version="7.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
     <ProjectReference Include="..\GraphQL.EntityFramework\GraphQL.EntityFramework.csproj" />
-    <PackageReference Include="ProjectDefaults" Version="1.0.81" PrivateAssets="all" />
+    <PackageReference Include="ProjectDefaults" Version="1.0.82" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/Snippets/Snippets.csproj b/src/Snippets/Snippets.csproj
@@ -5,12 +5,12 @@
   <ItemGroup>
     <PackageReference Include="GraphQL" Version="7.1.1" />
     <PackageReference Include="MarkdownSnippets.MsBuild" Version="24.5.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
     <PackageReference Include="Xunit" Version="2.4.2" />
-    <PackageReference Include="Verify.Xunit" Version="18.3.0" />
+    <PackageReference Include="Verify.Xunit" Version="19.1.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <ProjectReference Include="..\GraphQL.EntityFramework\GraphQL.EntityFramework.csproj" />
-    <PackageReference Include="ProjectDefaults" Version="1.0.81" PrivateAssets="all" />
+    <PackageReference Include="ProjectDefaults" Version="1.0.82" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/Tests/IntegrationTests/IntegrationTests.LogQuery.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.LogQuery.verified.txt
@@ -15,7 +15,7 @@
       Text:
 SELECT [p].[Id], [p].[Property]
 FROM [ParentEntities] AS [p]
-WHERE (([p].[Property] IS NOT NULL) AND ([p].[Property] LIKE N'Valu%')) AND ([p].[Property] LIKE N'%ue3')
+WHERE ([p].[Property] IS NOT NULL) AND ([p].[Property] LIKE N'Valu%') AND ([p].[Property] LIKE N'%ue3')
     }
   ]
 }
diff --git a/src/Tests/IntegrationTests/IntegrationTests.ManyToManyLeftWhereAndInclude.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.ManyToManyLeftWhereAndInclude.verified.txt
@@ -32,7 +32,7 @@ WHERE EXISTS (
     SELECT 1
     FROM [ManyToManyMiddleEntities] AS [m0]
     INNER JOIN [ManyToManyLeftEntities] AS [m1] ON [m0].[ManyToManyLeftEntityId] = [m1].[Id]
-    WHERE ([m].[Id] = [m0].[ManyToManyRightEntityId]) AND ([m1].[LeftName] = N'Left2'))
+    WHERE [m].[Id] = [m0].[ManyToManyRightEntityId] AND [m1].[LeftName] = N'Left2')
 ORDER BY [m].[Id], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId]
     }
   ]
diff --git a/src/Tests/IntegrationTests/IntegrationTests.ManyToManyRightWhereAndInclude.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.ManyToManyRightWhereAndInclude.verified.txt
@@ -32,7 +32,7 @@ WHERE EXISTS (
     SELECT 1
     FROM [ManyToManyMiddleEntities] AS [m0]
     INNER JOIN [ManyToManyRightEntities] AS [m1] ON [m0].[ManyToManyRightEntityId] = [m1].[Id]
-    WHERE ([m].[Id] = [m0].[ManyToManyLeftEntityId]) AND ([m1].[RightName] = N'Right2'))
+    WHERE [m].[Id] = [m0].[ManyToManyLeftEntityId] AND [m1].[RightName] = N'Right2')
 ORDER BY [m].[Id], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId]
     }
   ]
diff --git a/src/Tests/IntegrationTests/IntegrationTests.SingleParent_Child_mutation.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.SingleParent_Child_mutation.verified.txt
@@ -29,16 +29,17 @@ LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
 ORDER BY [t].[Id]
     },
     {
-      HasTransaction: true,
+      HasTransaction: false,
       Parameters: {
         @p0: Foo,
         @p1: Guid_1
       },
       Text:
+SET IMPLICIT_TRANSACTIONS OFF;
 SET NOCOUNT ON;
 UPDATE [ParentEntities] SET [Property] = @p0
+OUTPUT 1
 WHERE [Id] = @p1;
-SELECT @@ROWCOUNT;
     }
   ]
 }
diff --git a/src/Tests/IntegrationTests/IntegrationTests.Where_multiple.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.Where_multiple.verified.txt
@@ -15,7 +15,7 @@
       Text:
 SELECT [p].[Id], [p].[Property]
 FROM [ParentEntities] AS [p]
-WHERE (([p].[Property] IS NOT NULL) AND ([p].[Property] LIKE N'Valu%')) AND ([p].[Property] LIKE N'%ue3')
+WHERE ([p].[Property] IS NOT NULL) AND ([p].[Property] LIKE N'Valu%') AND ([p].[Property] LIKE N'%ue3')
     }
   ]
 }
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -6,15 +6,15 @@
   <ItemGroup>
     <PackageReference Include="GraphQL" Version="7.1.1" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="7.1.1" />
-    <PackageReference Include="EfLocalDb" Version="13.9.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
-    <PackageReference Include="Verify.SqlServer" Version="4.0.0" />
+    <PackageReference Include="EfLocalDb" Version="14.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Verify.SqlServer" Version="4.1.0" />
     <PackageReference Include="Xunit" Version="2.4.2" />
-    <PackageReference Include="Verify.Xunit" Version="18.3.0" />
+    <PackageReference Include="Verify.Xunit" Version="19.1.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <ProjectReference Include="..\GraphQL.EntityFramework\GraphQL.EntityFramework.csproj" />
-    <PackageReference Include="ProjectDefaults" Version="1.0.81" PrivateAssets="all" />
+    <PackageReference Include="ProjectDefaults" Version="1.0.82" PrivateAssets="all" />
 
     <Using Include="GraphQL.EntityFramework" />
     <Using Include="GraphQL" />

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`Text:`
`16`	`16`	`SELECT [p].[Id], [p].[Property]`
`17`	`17`	`FROM [ParentEntities] AS [p]`
`18`		`-WHERE (([p].[Property] IS NOT NULL) AND ([p].[Property] LIKE N'Valu%')) AND ([p].[Property] LIKE N'%ue3')`
	`18`	`+WHERE ([p].[Property] IS NOT NULL) AND ([p].[Property] LIKE N'Valu%') AND ([p].[Property] LIKE N'%ue3')`
`19`	`19`	`}`
`20`	`20`	`]`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ WHERE EXISTS (`
`32`	`32`	`SELECT 1`
`33`	`33`	`FROM [ManyToManyMiddleEntities] AS [m0]`
`34`	`34`	`INNER JOIN [ManyToManyLeftEntities] AS [m1] ON [m0].[ManyToManyLeftEntityId] = [m1].[Id]`
`35`		`- WHERE ([m].[Id] = [m0].[ManyToManyRightEntityId]) AND ([m1].[LeftName] = N'Left2'))`
	`35`	`+ WHERE [m].[Id] = [m0].[ManyToManyRightEntityId] AND [m1].[LeftName] = N'Left2')`
`36`	`36`	`ORDER BY [m].[Id], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId]`
`37`	`37`	`}`
`38`	`38`	`]`
Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,17 @@ LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]`
`29`	`29`	`ORDER BY [t].[Id]`
`30`	`30`	`},`
`31`	`31`	`{`
`32`		`- HasTransaction: true,`
	`32`	`+ HasTransaction: false,`
`33`	`33`	`Parameters: {`
`34`	`34`	`@p0: Foo,`
`35`	`35`	`@p1: Guid_1`
`36`	`36`	`},`
`37`	`37`	`Text:`
	`38`	`+SET IMPLICIT_TRANSACTIONS OFF;`
`38`	`39`	`SET NOCOUNT ON;`
`39`	`40`	`UPDATE [ParentEntities] SET [Property] = @p0`
	`41`	`+OUTPUT 1`
`40`	`42`	`WHERE [Id] = @p1;`
`41`		`-SELECT @@ROWCOUNT;`
`42`	`43`	`}`
`43`	`44`	`]`
`44`	`45`	`}`