Merge pull request #567 from cloudscribe/feature/566

JimKerslake · web-flow · commit 82099ea6ffd6 · 2023-03-31T14:31:51.000+01:00
#566 query splitting
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.Common/ContentHistoryQueries.cs b/src/cloudscribe.SimpleContent.Storage.EFCore.Common/ContentHistoryQueries.cs
@@ -61,7 +61,7 @@ public async Task<PagedResult<ContentHistory>> GetByContent(
                     .Take(pageSize)
                     ;
 
-                result.Data = await query.AsNoTracking().ToListAsync<ContentHistory>(cancellationToken).ConfigureAwait(false);
+                result.Data = await query.AsNoTracking().AsSingleQuery().ToListAsync<ContentHistory>(cancellationToken).ConfigureAwait(false);
                 result.TotalItems = await _db.ContentHistory
                     .Where(x =>
                         x.ProjectId == projectId
@@ -108,7 +108,7 @@ public async Task<PagedResult<ContentHistory>> GetList(
                     .Take(pageSize)
                     ;
 
-                result.Data = await query.AsNoTracking().ToListAsync<ContentHistory>(cancellationToken).ConfigureAwait(false);
+                result.Data = await query.AsNoTracking().AsSingleQuery().ToListAsync<ContentHistory>(cancellationToken).ConfigureAwait(false);
                 result.TotalItems = await _db.ContentHistory
                     .Where(x =>
                         x.ProjectId == projectId
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.Common/PostQueries.cs b/src/cloudscribe.SimpleContent.Storage.EFCore.Common/PostQueries.cs
@@ -165,6 +165,7 @@ public async Task<PagedPostResult> GetPosts(
 
                 var posts = await query
                     .AsNoTracking()
+                    .AsSingleQuery()
                     .Skip(offset)
                     .Take(pageSize)
                     .ToListAsync<IPost>(cancellationToken)
@@ -336,6 +337,7 @@ public async Task<PagedPostResult> GetPosts(
                 int offset = (pageSize * pageNumber) - pageSize;
                 var posts = await query
                     .AsNoTracking()
+                    .AsSingleQuery()
                     .Skip(offset)
                     .Take(pageSize)
                     .ToListAsync<IPost>();
@@ -453,6 +455,7 @@ public async Task<PostResult> GetPostBySlug(
 
                     result.PreviousPost = await db.Posts
                         .AsNoTracking()
+                        .AsSingleQuery()
                         .Where(p =>
                         p.BlogId == blogId
                         && p.PubDate < cutoff
@@ -464,6 +467,7 @@ public async Task<PostResult> GetPostBySlug(
 
                     result.NextPost = await db.Posts
                         .AsNoTracking()
+                        .AsSingleQuery()
                         .Where(p =>
                         p.BlogId == blogId
                         && p.PubDate > cutoff
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.Common/cloudscribe.SimpleContent.Storage.EFCore.Common.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.Common/cloudscribe.SimpleContent.Storage.EFCore.Common.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>base package - Entity Framework Core implementation of cloudscribe SimpleContent commands and queries</Description>
-    <Version>6.0.1</Version>
+    <Version>6.0.2</Version>
     <TargetFramework>net6.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;commands;queries;ef</PackageTags>
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/ServiceCollectionExtensions.cs b/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/ServiceCollectionExtensions.cs
@@ -34,6 +34,8 @@ public static IServiceCollection AddCloudscribeSimpleContentEFStorageMSSQL(
                     optionsBuilder.UseSqlServer(connectionString,
                    sqlServerOptionsAction: sqlOptions =>
                    {
+                       sqlOptions.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+
                        if (maxConnectionRetryCount > 0)
                        {
                            //Configuring Connection Resiliency: https://docs.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency 
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/cloudscribe.SimpleContent.Storage.EFCore.MSSQL.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/cloudscribe.SimpleContent.Storage.EFCore.MSSQL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MSSQL Entity Framework Core implementation of cloudscribe SimpleContent commands and queries</Description>
-    <Version>6.0.1</Version>
+    <Version>6.0.2</Version>
     <TargetFramework>net6.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;commands;queries;ef</PackageTags>
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/ServiceCollectionExtensions.cs b/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/ServiceCollectionExtensions.cs
@@ -33,6 +33,8 @@ public static IServiceCollection AddCloudscribeSimpleContentPostgreSqlStorage(
                     options.UseNpgsql(connectionString,
                     npgsqlOptionsAction: sqlOptions =>
                     {
+                        sqlOptions.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+
                         if (maxConnectionRetryCount > 0)
                         {
                             //Configuring Connection Resiliency: https://docs.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency 
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>PostgreSql Entity Framework Core implementation of cloudscribe SimpleContent commands and queries</Description>
-    <Version>6.0.2</Version>
+    <Version>6.0.3</Version>
     <TargetFramework>net6.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;commands;queries;ef</PackageTags>
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.pgsql/ServiceCollectionExtensions.cs b/src/cloudscribe.SimpleContent.Storage.EFCore.pgsql/ServiceCollectionExtensions.cs
@@ -34,6 +34,8 @@ public static IServiceCollection AddCloudscribeSimpleContentEFStoragePostgreSql(
                     options.UseNpgsql(connectionString,
                     npgsqlOptionsAction: sqlOptions =>
                     {
+                        sqlOptions.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+
                         if (maxConnectionRetryCount > 0)
                         {
                             //Configuring Connection Resiliency: https://docs.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency 
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.pgsql/cloudscribe.SimpleContent.Storage.EFCore.pgsql.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.pgsql/cloudscribe.SimpleContent.Storage.EFCore.pgsql.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>PostgreSql Entity Framework Core implementation of cloudscribe SimpleContent commands and queries</Description>
-    <Version>6.0.1</Version>
+    <Version>6.0.2</Version>
     <TargetFramework>net6.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;commands;queries;ef</PackageTags>

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ public static IServiceCollection AddCloudscribeSimpleContentEFStorageMSSQL(`
`34`	`34`	`optionsBuilder.UseSqlServer(connectionString,`
`35`	`35`	`sqlServerOptionsAction: sqlOptions =>`
`36`	`36`	`{`
	`37`	`+ sqlOptions.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);`
	`38`	`+`
`37`	`39`	`if (maxConnectionRetryCount > 0)`
`38`	`40`	`{`
`39`	`41`	`//Configuring Connection Resiliency: https://docs.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ public static IServiceCollection AddCloudscribeSimpleContentPostgreSqlStorage(`
`33`	`33`	`options.UseNpgsql(connectionString,`
`34`	`34`	`npgsqlOptionsAction: sqlOptions =>`
`35`	`35`	`{`
	`36`	`+ sqlOptions.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);`
	`37`	`+`
`36`	`38`	`if (maxConnectionRetryCount > 0)`
`37`	`39`	`{`
`38`	`40`	`//Configuring Connection Resiliency: https://docs.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency`