Skip to content

Full control of entities fetching in Criteria #1599

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.

Sign up for GitHub

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 11 commits into from
May 23, 2018
Merged

Full control of entities fetching in Criteria #1599

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ef0e6cf
Full control of entities fetching in Criteria
bahusoid Mar 8, 2018
73c1983
ISupportSelectModeCriteria.SetSelectMode should return ICriteria
bahusoid Mar 11, 2018
474b96a
Fixed Clone for SelectMode
bahusoid May 15, 2018
a76b037
Do additional clean-up
fredericDelaporte May 16, 2018
c5a5c12
Load missing entities instead of yielding null
fredericDelaporte May 17, 2018
d3791db
Test ChildFetch for not proxified entity
bahusoid May 17, 2018
225c29b
Fix a typo in a comment
fredericDelaporte May 17, 2018
358d27a
renamed With -> Fetch
bahusoid May 17, 2018
f76cc21
Obsoleted old SetFetchMode/Fetch
bahusoid May 19, 2018
c096716
Obsolete more previous fetches members
fredericDelaporte May 22, 2018
2184f5a
Renamed enums
bahusoid May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ public async Task ProjectionsTestAsync()

object g = await (s.CreateCriteria(typeof(Student))
.Add(Expression.IdEq(667L))
.SetFetchMode("enrolments", FetchMode.Join)
.Fetch("enrolments")
//.setFetchMode("enrolments.course", FetchMode.JOIN) //TODO: would love to make that work...
.UniqueResultAsync());
Assert.AreSame(gavin, g);
Expand Down Expand Up @@ -1279,7 +1279,7 @@ public async Task CloningProjectionsTestAsync()

ICriteria criteriaToClone6 = s.CreateCriteria(typeof(Student))
.Add(Expression.IdEq(667L))
.SetFetchMode("enrolments", FetchMode.Join);
.Fetch("enrolments");
object g = await (CriteriaTransformer.Clone(criteriaToClone6)
.UniqueResultAsync());
Assert.AreSame(gavin, g);
Expand Down Expand Up @@ -2426,7 +2426,7 @@ public async Task SubcriteriaJoinTypesAsync()
}

result = await (session.CreateCriteria(typeof(Student))
.SetFetchMode("PreferredCourse", FetchMode.Join)
.Fetch("PreferredCourse")
.CreateCriteria("PreferredCourse", JoinType.LeftOuterJoin)
.AddOrder(Order.Asc("CourseCode"))
.ListAsync());
Expand All @@ -2436,7 +2436,7 @@ public async Task SubcriteriaJoinTypesAsync()
Assert.IsNotNull(result[2]);

result = await (session.CreateCriteria(typeof(Student))
.SetFetchMode("PreferredCourse", FetchMode.Join)
.Fetch("PreferredCourse")
.CreateAlias("PreferredCourse", "pc", JoinType.LeftOuterJoin)
.AddOrder(Order.Asc("pc.CourseCode"))
.ListAsync());
Expand Down
2 changes: 1 addition & 1 deletion src/NHibernate.Test/Async/Criteria/Lambda/IntegrationFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public async Task OverrideEagerJoinAsync()
{
var persons =
await (s.QueryOver<Parent>()
.Fetch(p => p.Children).Lazy
.Fetch(SelectMode.SkipJoin, p => p.Children)
.ListAsync());

Assert.That(persons.Count, Is.EqualTo(1));
Expand Down
Loading