Skip to content

Commit 07411d3

Browse files
hazzikhazzik
committed
Regenerate code
1 parent b836c7d commit 07411d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+95
-893
lines changed

‎src/NHibernate.DomainModel/Async/CustomPersister.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@ namespace NHibernate.DomainModel
1818
[System.CodeDom.Compiler.GeneratedCode("AsyncGenerator", "1.0.0")]
1919
public partial class CustomPersister : IEntityPersister
2020
{
21-
public Task<int[]> FindDirtyAsync(object[] currentState, object[] previousState, object entity, ISessionImplementor session)
22-
{
23-
try
24-
{
25-
return Task.FromResult<int[]>(FindDirty(currentState, previousState, entity, session));
26-
}
27-
catch (Exception ex)
28-
{
29-
return TaskHelper.FromException<int[]>(ex);
30-
}
31-
}
32-
3321
public Task<int[]> FindModifiedAsync(object[] old, object[] current, object entity, ISessionImplementor session)
3422
{
3523
try

‎src/NHibernate.Test/Async/BulkManipulation/BaseFixture.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System.Collections;
2+
using NHibernate.Hql.Ast.ANTLR;
23
using System.Collections.Generic;
34
using NHibernate.Util;
5+
using System.Threading.Tasks;
46

57
namespace NHibernate.Test.BulkManipulation
68
{
@@ -28,5 +30,12 @@ protected override void Configure(Cfg.Configuration configuration)
2830
}
2931
}
3032
}
33+
34+
public string GetSql(string query)
35+
{
36+
var qt = new QueryTranslatorImpl(null, new HqlParseEngine(query, false, sessions).Parse(), emptyfilters, sessions);
37+
qt.Compile(null, false);
38+
return qt.SQLString;
39+
}
3140
}
3241
}

‎src/NHibernate.Test/Async/Hql/Ast/BaseFixture.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using System.Collections;
22
using System.Collections.Generic;
3+
using NHibernate.Hql.Ast.ANTLR;
34
using NHibernate.Util;
4-
using Exception = System.Exception;
5+
using System.Threading.Tasks;
56

67
namespace NHibernate.Test.Hql.Ast
78
{
@@ -29,5 +30,17 @@ protected override void Configure(Cfg.Configuration configuration)
2930
}
3031
}
3132
}
33+
34+
public string GetSql(string query)
35+
{
36+
return GetSql(query, null);
37+
}
38+
39+
public string GetSql(string query, IDictionary<string, string> replacements)
40+
{
41+
var qt = new QueryTranslatorImpl(null, new HqlParseEngine(query, false, sessions).Parse(), emptyfilters, sessions);
42+
qt.Compile(replacements, false);
43+
return qt.SQLString;
44+
}
3245
}
3346
}

‎src/NHibernate.Test/Async/Hql/Ast/QuerySubstitutionTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using NUnit.Framework;
44
using NHibernate.Cfg.Loquacious;
55
using System.Threading.Tasks;
6+
using Exception = System.Exception;
7+
using NHibernate.Util;
68

79
namespace NHibernate.Test.Hql.Ast
810
{

‎src/NHibernate.Test/Async/NHSpecificTest/NH3386/Fixture.cs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,21 @@ protected override async Task OnTearDownAsync()
4242
}
4343

4444
[Test]
45-
public void ShouldSupportNonRuntimeExtensionWithoutEntityReference()
45+
public async Task ShouldSupportNonRuntimeExtensionWithoutEntityReferenceAsync()
4646
{
4747
var sqlInterceptor = new SqlInterceptor();
48-
using (var session = OpenSession(sqlInterceptor))
49-
using (session.BeginTransaction())
50-
{
51-
var result = session.Query<Entity>().OrderBy(e => SqlServerFunction.NewID());
52-
Assert.DoesNotThrowAsync(() => result.ToListAsync());
53-
Assert.That(sqlInterceptor.Sql.ToString(), Does.Contain(nameof(SqlServerFunction.NewID)).IgnoreCase);
54-
}
48+
using (ISession session = OpenSession(sqlInterceptor))
49+
using (session.BeginTransaction())
50+
{
51+
var result = session.Query<Entity>().OrderBy(e => SqlServerFunction.NewID());
52+
Assert.DoesNotThrowAsync(() =>
53+
{
54+
result.ToList();
55+
}
56+
57+
);
58+
Assert.That(sqlInterceptor.Sql.ToString(), Does.Contain(nameof(SqlServerFunction.NewID)).IgnoreCase);
59+
}
5560
}
5661
}
5762
}

‎src/NHibernate.Test/Async/TypesTest/Int64TypeFixture.cs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using NUnit.Framework;
66
using NHibernate.Engine;
77
using System.Threading.Tasks;
8+
using NHibernate.Util;
89

910
namespace NHibernate.Test.TypesTest
1011
{
@@ -29,20 +30,6 @@ public async Task SeedAsync()
2930
Assert.IsTrue(await (type.SeedAsync(null)) is Int64, "seed should be int64");
3031
}
3132

32-
[Test]
33-
public async Task NullableWrapperDirtyAsync()
34-
{
35-
Int64Type type = (Int64Type)NHibernateUtil.Int64;
36-
long ? nullLong = null;
37-
long ? valueLong = 5;
38-
long ? fiveAgain = 5;
39-
using (ISession s = OpenSession())
40-
{
41-
Assert.IsTrue(await (type.IsDirtyAsync(nullLong, valueLong, (ISessionImplementor)s)), "should be dirty - null to '5'");
42-
Assert.IsFalse(await (type.IsDirtyAsync(valueLong, fiveAgain, (ISessionImplementor)s)), "should not be dirty - 5 to 5");
43-
}
44-
}
45-
4633
protected override IList Mappings
4734
{
4835
get

‎src/NHibernate/Async/Collection/AbstractPersistentCollection.cs

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,15 @@ protected virtual async Task<ICollection> GetOrphansAsync(ICollection oldElement
249249
{
250250
if (current != null && await (ForeignKeys.IsNotTransientAsync(entityName, current, null, session)))
251251
{
252-
object currentId = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, current, session));
252+
object currentId = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, current, session);
253253
currentIds.Add(new TypedValue(idType, currentId));
254254
}
255255
}
256256

257257
// iterate over the *old* list
258258
foreach (object old in oldElements)
259259
{
260-
object oldId = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, old, session));
260+
object oldId = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, old, session);
261261
if (!currentIds.Contains(new TypedValue(idType, oldId)))
262262
{
263263
res.Add(old);
@@ -272,7 +272,7 @@ public async Task IdentityRemoveAsync(IList list, object obj, string entityName,
272272
if (obj != null && await (ForeignKeys.IsNotTransientAsync(entityName, obj, null, session)))
273273
{
274274
IType idType = session.Factory.GetEntityPersister(entityName).IdentifierType;
275-
object idOfCurrent = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, obj, session));
275+
object idOfCurrent = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, obj, session);
276276
List<object> toRemove = new List<object>(list.Count);
277277
foreach (object current in list)
278278
{
@@ -281,7 +281,7 @@ public async Task IdentityRemoveAsync(IList list, object obj, string entityName,
281281
continue;
282282
}
283283

284-
object idOfOld = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, current, session));
284+
object idOfOld = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, current, session);
285285
if (idType.IsEqual(idOfCurrent, idOfOld, session.Factory))
286286
{
287287
toRemove.Add(current);
@@ -302,26 +302,13 @@ public async Task IdentityRemoveAsync(IList list, object obj, string entityName,
302302
/// <returns></returns>
303303
public abstract Task<object> DisassembleAsync(ICollectionPersister persister);
304304
/// <summary>
305-
/// Get all the elements that need deleting
306-
/// </summary>
307-
public abstract Task<IEnumerable> GetDeletesAsync(ICollectionPersister persister, bool indexIsFormula);
308-
public abstract Task<bool> EqualsSnapshotAsync(ICollectionPersister persister);
309-
/// <summary>
310305
/// Read the state of the collection from a disassembled cached value.
311306
/// </summary>
312307
/// <param name = "persister"></param>
313308
/// <param name = "disassembled"></param>
314309
/// <param name = "owner"></param>
315310
public abstract Task InitializeFromCacheAsync(ICollectionPersister persister, object disassembled, object owner);
316311
/// <summary>
317-
/// Do we need to update this element?
318-
/// </summary>
319-
/// <param name = "entry"></param>
320-
/// <param name = "i"></param>
321-
/// <param name = "elemType"></param>
322-
/// <returns></returns>
323-
public abstract Task<bool> NeedsUpdatingAsync(object entry, int i, IType elemType);
324-
/// <summary>
325312
/// Reads the row from the <see cref = "DbDataReader"/>.
326313
/// </summary>
327314
/// <param name = "reader">The DbDataReader that contains the value of the Identifier</param>
@@ -330,14 +317,6 @@ public async Task IdentityRemoveAsync(IList list, object obj, string entityName,
330317
/// <param name = "owner">The owner of this Collection.</param>
331318
/// <returns>The object that was contained in the row.</returns>
332319
public abstract Task<object> ReadFromAsync(DbDataReader reader, ICollectionPersister role, ICollectionAliases descriptor, object owner);
333-
/// <summary>
334-
/// Do we need to insert this element?
335-
/// </summary>
336-
/// <param name = "entry"></param>
337-
/// <param name = "i"></param>
338-
/// <param name = "elemType"></param>
339-
/// <returns></returns>
340-
public abstract Task<bool> NeedsInsertingAsync(object entry, int i, IType elemType);
341320
/*
342321
* These were needed by Hibernate because Java's collections provide methods
343322
* to get sublists, modify a collection with an iterator - all things that

‎src/NHibernate/Async/Collection/Generic/PersistentGenericBag.cs

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,6 @@ public override async Task<object> DisassembleAsync(ICollectionPersister persist
2828
return result;
2929
}
3030

31-
public override Task<bool> EqualsSnapshotAsync(ICollectionPersister persister)
32-
{
33-
try
34-
{
35-
return Task.FromResult<bool>(EqualsSnapshot(persister));
36-
}
37-
catch (Exception ex)
38-
{
39-
return TaskHelper.FromException<bool>(ex);
40-
}
41-
}
42-
43-
public override Task<IEnumerable> GetDeletesAsync(ICollectionPersister persister, bool indexIsFormula)
44-
{
45-
try
46-
{
47-
return Task.FromResult<IEnumerable>(GetDeletes(persister, indexIsFormula));
48-
}
49-
catch (Exception ex)
50-
{
51-
return TaskHelper.FromException<IEnumerable>(ex);
52-
}
53-
}
54-
5531
public override async Task<ICollection> GetOrphansAsync(object snapshot, string entityName)
5632
{
5733
var sn = (ICollection)snapshot;
@@ -79,30 +55,6 @@ public override async Task InitializeFromCacheAsync(ICollectionPersister persist
7955
}
8056
}
8157

82-
public override Task<bool> NeedsInsertingAsync(object entry, int i, IType elemType)
83-
{
84-
try
85-
{
86-
return Task.FromResult<bool>(NeedsInserting(entry, i, elemType));
87-
}
88-
catch (Exception ex)
89-
{
90-
return TaskHelper.FromException<bool>(ex);
91-
}
92-
}
93-
94-
public override Task<bool> NeedsUpdatingAsync(object entry, int i, IType elemType)
95-
{
96-
try
97-
{
98-
return Task.FromResult<bool>(NeedsUpdating(entry, i, elemType));
99-
}
100-
catch (Exception ex)
101-
{
102-
return TaskHelper.FromException<bool>(ex);
103-
}
104-
}
105-
10658
public override async Task<object> ReadFromAsync(DbDataReader reader, ICollectionPersister role, ICollectionAliases descriptor, object owner)
10759
{
10860
// note that if we load this collection from a cartesian product

‎src/NHibernate/Async/Collection/Generic/PersistentGenericIdentifierBag.cs

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using NHibernate.Persister.Collection;
1212
using NHibernate.Type;
1313
using System.Threading.Tasks;
14-
using NHibernate.Util;
1514

1615
namespace NHibernate.Collection.Generic
1716
{
@@ -50,71 +49,6 @@ public override async Task<object> DisassembleAsync(ICollectionPersister persist
5049
return result;
5150
}
5251

53-
public override async Task<bool> EqualsSnapshotAsync(ICollectionPersister persister)
54-
{
55-
IType elementType = persister.ElementType;
56-
var snap = (ISet<SnapshotElement>)GetSnapshot();
57-
if (snap.Count != _values.Count)
58-
{
59-
return false;
60-
}
61-
62-
for (int i = 0; i < _values.Count; i++)
63-
{
64-
object val = _values[i];
65-
object id = GetIdentifier(i);
66-
object old = snap.Where(x => Equals(x.Id, id)).Select(x => x.Value).FirstOrDefault();
67-
if (await (elementType.IsDirtyAsync(old, val, Session)))
68-
{
69-
return false;
70-
}
71-
}
72-
73-
return true;
74-
}
75-
76-
public override Task<IEnumerable> GetDeletesAsync(ICollectionPersister persister, bool indexIsFormula)
77-
{
78-
try
79-
{
80-
return Task.FromResult<IEnumerable>(GetDeletes(persister, indexIsFormula));
81-
}
82-
catch (Exception ex)
83-
{
84-
return TaskHelper.FromException<IEnumerable>(ex);
85-
}
86-
}
87-
88-
public override Task<bool> NeedsInsertingAsync(object entry, int i, IType elemType)
89-
{
90-
try
91-
{
92-
return Task.FromResult<bool>(NeedsInserting(entry, i, elemType));
93-
}
94-
catch (Exception ex)
95-
{
96-
return TaskHelper.FromException<bool>(ex);
97-
}
98-
}
99-
100-
public override async Task<bool> NeedsUpdatingAsync(object entry, int i, IType elemType)
101-
{
102-
if (entry == null)
103-
{
104-
return false;
105-
}
106-
107-
var snap = (ISet<SnapshotElement>)GetSnapshot();
108-
object id = GetIdentifier(i);
109-
if (id == null)
110-
{
111-
return false;
112-
}
113-
114-
object old = snap.Where(x => Equals(x.Id, id)).Select(x => x.Value).FirstOrDefault();
115-
return old != null && await (elemType.IsDirtyAsync(old, entry, Session));
116-
}
117-
11852
public override async Task<object> ReadFromAsync(DbDataReader reader, ICollectionPersister persister, ICollectionAliases descriptor, object owner)
11953
{
12054
object element = await (persister.ReadElementAsync(reader, owner, descriptor.SuffixedElementAliases, Session));

0 commit comments

Comments
 (0)