-
Couldn't load subscription status.
- Fork 14
Drop support for net7, upgrade dependencies #17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
12 changes: 6 additions & 6 deletions
12
...workCore.UseRowNumberForPaging.Test/EntityFrameworkCore.UseRowNumberForPaging.Test.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 10 additions & 16 deletions
26
EntityFrameworkCore.UseRowNumberForPaging.Test/NotUseRowNumberDbContext.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,15 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.EntityFrameworkCore; | ||
| using Microsoft.EntityFrameworkCore; | ||
|
|
||
| namespace EntityFrameworkCore.UseRowNumberForPaging | ||
| namespace EntityFrameworkCore.UseRowNumberForPaging; | ||
|
|
||
| public class NotUseRowNumberDbContext : DbContext | ||
| { | ||
| public class NotUseRowNumberDbContext : DbContext | ||
| { | ||
| public DbSet<Blog> Blogs { get; set; } | ||
| public DbSet<Blog> Blogs { get; set; } | ||
| public DbSet<Author> Authors { get; set; } | ||
|
|
||
| protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) | ||
| { | ||
| optionsBuilder.UseSqlServer( | ||
| @"Server=(localdb)\mssqllocaldb;Database=Blogging;Integrated Security=True"); | ||
| } | ||
| protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) | ||
| { | ||
| optionsBuilder.UseSqlServer( | ||
| @"Server=(localdb)\mssqllocaldb;Database=Blogging;Integrated Security=True"); | ||
| } | ||
|
|
||
| } |
64 changes: 64 additions & 0 deletions
64
EntityFrameworkCore.UseRowNumberForPaging.Test/SimpleTestCases.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| using System.Linq; | ||
| using Microsoft.EntityFrameworkCore; | ||
| using Shouldly; | ||
| using Xunit; | ||
|
|
||
| namespace EntityFrameworkCore.UseRowNumberForPaging.Test; | ||
|
|
||
| public class SimpleTestCases | ||
| { | ||
| [Fact] | ||
| public void With_TrivialOk() | ||
| { | ||
| using (var dbContext = new UseRowNumberDbContext()) | ||
| { | ||
| var rawSql = dbContext.Blogs.Where(i => i.BlogId > 1).Skip(0).Take(10).ToQueryString(); | ||
| rawSql.ShouldContain("ROW_NUMBER"); | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Without_TrivialOk() | ||
| { | ||
| using (var dbContext = new NotUseRowNumberDbContext()) | ||
| { | ||
| var rawSql = dbContext.Blogs.Where(i => i.BlogId > 1).Skip(0).Take(10).ToQueryString(); | ||
| rawSql.ShouldContain("OFFSET"); | ||
| rawSql.ShouldNotContain("ROW_NUMBER"); | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public void With_NoSkipClause_OrderDesc_NoRowNumber() | ||
| { | ||
| using var dbContext = new UseRowNumberDbContext(); | ||
| var rawSql = dbContext.Blogs.Where(i => i.BlogId > 1).OrderByDescending(o => o.Rating).Take(20).ToQueryString(); | ||
| rawSql.ShouldNotContain("ROW_NUMBER"); | ||
| rawSql.ShouldContain("TOP"); | ||
| rawSql.ShouldContain("ORDER BY"); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void With_OrderDesc_UsesRowNumber() | ||
| { | ||
| using var dbContext = new UseRowNumberDbContext(); | ||
| var rawSql = dbContext.Blogs.Where(i => i.BlogId > 1).OrderByDescending(o => o.Rating).Skip(20).Take(20).ToQueryString(); | ||
| rawSql.ShouldContain("ROW_NUMBER"); | ||
| rawSql.ShouldContain("ORDER BY"); | ||
| rawSql.ShouldContain("TOP"); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void With_Order_SplitQuery_UsesRowNumber() | ||
| { | ||
| using var dbContext = new UseRowNumberDbContext(); | ||
| var rawSql = dbContext.Blogs.Include(b => b.Author).Where(i => i.BlogId > 1) | ||
| .OrderBy(a => a.Author.ContributingSince) | ||
| .OrderByDescending(o => o.Rating) | ||
| .Skip(30).Take(15) | ||
| .AsSplitQuery().ToQueryString(); | ||
| rawSql.ShouldContain("ROW_NUMBER"); | ||
| rawSql.ShouldContain("ORDER BY"); | ||
| rawSql.ShouldContain("TOP"); | ||
| } | ||
| } |
32 changes: 0 additions & 32 deletions
32
EntityFrameworkCore.UseRowNumberForPaging.Test/UnitTest1.cs
This file was deleted.
Oops, something went wrong.
41 changes: 23 additions & 18 deletions
41
EntityFrameworkCore.UseRowNumberForPaging.Test/UseRowNumberDbContext.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,32 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.EntityFrameworkCore; | ||
|
|
||
| namespace EntityFrameworkCore.UseRowNumberForPaging | ||
| { | ||
| public class UseRowNumberDbContext : DbContext | ||
| { | ||
| public DbSet<Blog> Blogs { get; set; } | ||
| namespace EntityFrameworkCore.UseRowNumberForPaging; | ||
|
|
||
| protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) | ||
| { | ||
| optionsBuilder.UseSqlServer( | ||
| @"Server=(localdb)\mssqllocaldb;Database=Blogging;Integrated Security=True", i => i.UseRowNumberForPaging()); | ||
| } | ||
| } | ||
| public class UseRowNumberDbContext : DbContext | ||
| { | ||
| public DbSet<Blog> Blogs { get; set; } | ||
| public DbSet<Author> Authors { get; set; } | ||
|
|
||
| public class Blog | ||
| protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) | ||
| { | ||
| public int BlogId { get; set; } | ||
| public string Url { get; set; } | ||
| public int Rating { get; set; } | ||
| optionsBuilder.UseSqlServer( | ||
| @"Server=(localdb)\mssqllocaldb;Database=Blogging;Integrated Security=True", i => i.UseRowNumberForPaging()); | ||
| } | ||
| } | ||
|
|
||
| public class Blog | ||
| { | ||
| public int BlogId { get; set; } | ||
| public string Url { get; set; } | ||
| public int Rating { get; set; } | ||
| public virtual Author Author { get; set; } | ||
| } | ||
| public class Author | ||
| { | ||
| public int AuthorId { get; set; } | ||
| public string Name { get; set; } | ||
| public DateOnly ContributingSince { get; set; } | ||
| public virtual List<Blog> Blogs { get; set; } | ||
| } |
29 changes: 15 additions & 14 deletions
29
EntityFrameworkCore.UseRowNumberForPaging/EntityFrameworkCore.UseRowNumberForPaging.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
EntityFrameworkCore.UseRowNumberForPaging/Offset2RowNumberConvertVisitor.net8.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| #if !NET9_0_OR_GREATER | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Linq.Expressions; | ||
| using System.Reflection; | ||
| using Microsoft.EntityFrameworkCore.Query; | ||
| using Microsoft.EntityFrameworkCore.Query.SqlExpressions; | ||
|
|
||
| namespace EntityFrameworkCore.UseRowNumberForPaging; | ||
|
|
||
| internal class Offset2RowNumberConvertVisitor : ExpressionVisitor | ||
| { | ||
| private static readonly MethodInfo GenerateOuterColumnAccessor; | ||
| private static readonly Type TableReferenceExpressionType; | ||
|
|
||
| static Offset2RowNumberConvertVisitor() | ||
| { | ||
| var method = typeof(SelectExpression).GetMethod("GenerateOuterColumn", BindingFlags.NonPublic | BindingFlags.Instance); | ||
| if (!typeof(ColumnExpression).IsAssignableFrom(method?.ReturnType)) | ||
| { | ||
| throw new InvalidOperationException("SelectExpression.GenerateOuterColum() was not found"); | ||
| } | ||
|
|
||
| TableReferenceExpressionType = method.GetParameters().First().ParameterType; | ||
| GenerateOuterColumnAccessor = method; | ||
| } | ||
|
|
||
| private readonly Expression root; | ||
| private readonly ISqlExpressionFactory sqlExpressionFactory; | ||
|
|
||
| public Offset2RowNumberConvertVisitor(Expression root, ISqlExpressionFactory sqlExpressionFactory) | ||
| { | ||
| this.root = root; | ||
| this.sqlExpressionFactory = sqlExpressionFactory; | ||
| } | ||
|
|
||
| protected override Expression VisitExtension(Expression node) | ||
| { | ||
| if (node is ShapedQueryExpression shapedQueryExpression) | ||
| { | ||
| return shapedQueryExpression.Update(Visit(shapedQueryExpression.QueryExpression), Visit(shapedQueryExpression.ShaperExpression)); | ||
| } | ||
| if (node is SelectExpression se) | ||
| { | ||
| return VisitSelect(se); | ||
| } | ||
| return base.VisitExtension(node); | ||
| } | ||
|
|
||
| private Expression VisitSelect(SelectExpression selectExpression) | ||
| { | ||
| var oldOffset = selectExpression.Offset; | ||
| if (oldOffset == null) | ||
| return selectExpression; | ||
| var oldLimit = selectExpression.Limit; | ||
| var oldOrderings = selectExpression.Orderings; | ||
| var newOrderings = oldOrderings.Count > 0 && (oldLimit != null || selectExpression == root) | ||
| ? oldOrderings.ToList() | ||
| : new List<OrderingExpression>(); | ||
| // Change SelectExpression | ||
| selectExpression = selectExpression.Update(projections: selectExpression.Projection.ToList(), | ||
| tables: selectExpression.Tables.ToList(), | ||
| predicate: selectExpression.Predicate, | ||
| groupBy: selectExpression.GroupBy.ToList(), | ||
| having: selectExpression.Having, | ||
| orderings: newOrderings, | ||
| limit: null, | ||
| offset: null); | ||
| var rowOrderings = oldOrderings.Count != 0 ? oldOrderings | ||
| : new[] { new OrderingExpression(new SqlFragmentExpression("(SELECT 1)"), true) }; | ||
|
|
||
| selectExpression.PushdownIntoSubquery(); | ||
|
|
||
| var subQuery = (SelectExpression)selectExpression.Tables[0]; | ||
| var projection = new RowNumberExpression(Array.Empty<SqlExpression>(), rowOrderings, oldOffset.TypeMapping); | ||
| var left = GenerateOuterColumnAccessor.Invoke(subQuery | ||
| , new object[] | ||
| { | ||
| Activator.CreateInstance(TableReferenceExpressionType, new object[] { subQuery,subQuery.Alias! })!, | ||
| projection, | ||
| "row", | ||
| true | ||
| }) as ColumnExpression; | ||
| selectExpression.ApplyPredicate(sqlExpressionFactory.GreaterThan(left!, oldOffset)); | ||
|
|
||
| if (oldLimit != null) | ||
| { | ||
| if (oldOrderings.Count == 0) | ||
| { | ||
| selectExpression.ApplyPredicate(sqlExpressionFactory.LessThanOrEqual(left, sqlExpressionFactory.Add(oldOffset, oldLimit))); | ||
| } | ||
| else | ||
| { | ||
| selectExpression.ApplyLimit(oldLimit); | ||
| } | ||
| } | ||
| return selectExpression; | ||
| } | ||
| } | ||
| #endif | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Rwing specifically this line is incorrect