Skip to content

Commit 2bdc5e0

Browse files
committed
Merge branch 'master' into prefetch-for-delayedquery
2 parents b2311fe + 34bc893 commit 2bdc5e0

15 files changed

+2460
-795
lines changed

ChangeLog/6.0.5_Z_Final.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[main] EntitySet<T>.Prefetch() now re-fetches items in Client profile and in certain transaction isolation levels
2+
[main] Prefetch extension re-fetches EntitySet<T> items in Client profile and in certain transaction isolation levels
3+
[main] SessionScope is not derrived from Scope but stand alone class. Functionality remains the same.
4+
[main] Improved session activation mechanism to work with asynchronous Session opening
5+
[main] Fixed SimpleCommandProcessor internal command allocation issue which caused 'swollowing' of genuin exception
6+
[main] Fixed certain cases of incorrect temporary table column structure while using grouping
7+
[main] Correct command disposal by CommandProcessors
8+
[mysql] Updated client library package
9+
[log4net] Updated log4net package

Orm/Xtensive.Orm.Tests/Issues/IssueGitHub0110_SimpleCommandProcessorOverridesOriginalException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2021 Xtensive LLC.
1+
// Copyright (C) 2020-2021 Xtensive LLC.
22
// This code is distributed under MIT license terms.
33
// See the License.txt file in the project root for more information.
44

Orm/Xtensive.Orm.Tests/Issues/IssueJira0546_IncorrectCachingOfQueries.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (C) 2014-2020 Xtensive LLC.
2-
// This code is distributed under MIT license terms.
3-
// See the License.txt file in the project root for more information.
1+
// Copyright (C) 2014-2021 Xtensive LLC.
2+
// All rights reserved.
3+
// For conditions of distribution and use, see license.
44
// Created by: Alexey Kulakov
55
// Created: 2014.08.08
66

@@ -117,7 +117,7 @@ orderby loc.Id
117117
return result;
118118
}
119119

120-
public IssueJira0546Task (Session session, int startValue)
120+
public IssueJira0546Task(Session session, int startValue)
121121
: base(startValue)
122122
{
123123
this.Session = session;
@@ -284,7 +284,7 @@ private void TaskSequencesGenerator(Session session)
284284
var currentId = 1;
285285
var iterationsCount = 0;
286286
while (currentId<80) {
287-
var task = new IssueJira0546Task (session, currentId);
287+
var task = new IssueJira0546Task(session, currentId);
288288
var previousId = currentId;
289289
currentId = task.GetMinimalLocationIdDelayedApi();
290290
Assert.AreEqual(previousId+1, currentId);
@@ -299,7 +299,7 @@ private void TaskSequencesGenerator(Session session)
299299
currentId = 1;
300300
iterationsCount = 0;
301301
while (currentId < 80) {
302-
var task = new IssueJira0546Task (session, currentId);
302+
var task = new IssueJira0546Task(session, currentId);
303303
var previousId = currentId;
304304
currentId = task.GetMinimalLocationIdFutureApi();
305305
Assert.AreEqual(previousId + 1, currentId);

0 commit comments

Comments
 (0)