Skip to content

Commit ffd7774

Browse files
hazzikhazzik
committed
Merge remote-tracking branch 'origin/master' into gh-869 
2 parents 1d5d8ad + 89a79d2 commit ffd7774

File tree

8 files changed

+60
-46
lines changed

8 files changed

+60
-46
lines changed

‎src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<None Include="..\NHibernate.Test\App.config" Link="App.config" />
3333
</ItemGroup>
3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
36-
<PackageReference Include="Microsoft.VisualBasic" Version="10.2.0" />
37-
<PackageReference Include="NUnit" Version="3.12.0" />
38-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
35+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
36+
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
37+
<PackageReference Include="NUnit" Version="3.13.2" />
38+
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
3939
</ItemGroup>
4040
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
41-
<PackageReference Include="NUnitLite" Version="3.12.0" />
41+
<PackageReference Include="NUnitLite" Version="3.13.2" />
4242
</ItemGroup>
4343
<ItemGroup>
4444
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />

‎src/NHibernate.Test/Async/NHSpecificTest/GH1413/FixtureByCode.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010

1111
using NHibernate.Cfg.MappingSchema;
12+
using NHibernate.Engine;
1213
using NHibernate.Mapping.ByCode;
1314
using NUnit.Framework;
1415

@@ -26,7 +27,7 @@ protected override HbmMapping GetMappings()
2627
var mapper = new ModelMapper();
2728
mapper.Class<EntityParent>(rc =>
2829
{
29-
rc.Id(x => x.Id, m => m.Generator(Generators.Native));
30+
rc.Id(x => x.Id, m => m.Generator(Generators.Identity));
3031
rc.Property(x => x.Name);
3132
rc.Bag(x => x.Children, m =>
3233
{
@@ -38,7 +39,7 @@ protected override HbmMapping GetMappings()
3839

3940
mapper.Class<EntityChild>(rc =>
4041
{
41-
rc.Id(x => x.Id, m => m.Generator(Generators.Native));
42+
rc.Id(x => x.Id, m => m.Generator(Generators.Identity));
4243
rc.Property(x => x.Name);
4344
});
4445

@@ -74,13 +75,12 @@ protected override void OnTearDown()
7475
}
7576
}
7677

77-
[Test]
78-
[KnownBug("#1413")]
79-
public async Task SessionIsDirtyShouldNotTriggerCascadeSavingAsync()
78+
[Theory]
79+
public async Task SessionIsDirtyShouldNotTriggerCascadeSavingAsync(bool beginTransaction)
8080
{
8181
Sfi.Statistics.IsStatisticsEnabled = true;
8282
using (var session = OpenSession())
83-
using (session.BeginTransaction())
83+
using (beginTransaction ? session.BeginTransaction() : null)
8484
{
8585
var parent = await (GetParentAsync(session));
8686
var entityChild = new EntityChild
@@ -95,11 +95,14 @@ public async Task SessionIsDirtyShouldNotTriggerCascadeSavingAsync()
9595
var isDirty = await (session.IsDirtyAsync());
9696

9797
Assert.That(Sfi.Statistics.EntityInsertCount, Is.EqualTo(0), "Dirty has triggered an insert");
98-
Assert.That(
99-
entityChild.Id,
100-
Is.EqualTo(0),
101-
"Transient objects should not be saved by ISession.IsDirty() call (expected 0 as Id)");
10298
Assert.That(isDirty, "ISession.IsDirty() call should return true.");
99+
if (Dialect.SupportsIdentityColumns)
100+
{
101+
Assert.That(
102+
entityChild.Id,
103+
Is.EqualTo(0),
104+
"Transient objects should not be saved by ISession.IsDirty() call (expected 0 as Id)");
105+
}
103106
}
104107
}
105108

‎src/NHibernate.Test/NHSpecificTest/GH1413/FixtureByCode.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using NHibernate.Cfg.MappingSchema;
2+
using NHibernate.Engine;
23
using NHibernate.Mapping.ByCode;
34
using NUnit.Framework;
45

@@ -14,7 +15,7 @@ protected override HbmMapping GetMappings()
1415
var mapper = new ModelMapper();
1516
mapper.Class<EntityParent>(rc =>
1617
{
17-
rc.Id(x => x.Id, m => m.Generator(Generators.Native));
18+
rc.Id(x => x.Id, m => m.Generator(Generators.Identity));
1819
rc.Property(x => x.Name);
1920
rc.Bag(x => x.Children, m =>
2021
{
@@ -26,7 +27,7 @@ protected override HbmMapping GetMappings()
2627

2728
mapper.Class<EntityChild>(rc =>
2829
{
29-
rc.Id(x => x.Id, m => m.Generator(Generators.Native));
30+
rc.Id(x => x.Id, m => m.Generator(Generators.Identity));
3031
rc.Property(x => x.Name);
3132
});
3233

@@ -62,13 +63,12 @@ protected override void OnTearDown()
6263
}
6364
}
6465

65-
[Test]
66-
[KnownBug("#1413")]
67-
public void SessionIsDirtyShouldNotTriggerCascadeSaving()
66+
[Theory]
67+
public void SessionIsDirtyShouldNotTriggerCascadeSaving(bool beginTransaction)
6868
{
6969
Sfi.Statistics.IsStatisticsEnabled = true;
7070
using (var session = OpenSession())
71-
using (session.BeginTransaction())
71+
using (beginTransaction ? session.BeginTransaction() : null)
7272
{
7373
var parent = GetParent(session);
7474
var entityChild = new EntityChild
@@ -83,11 +83,14 @@ public void SessionIsDirtyShouldNotTriggerCascadeSaving()
8383
var isDirty = session.IsDirty();
8484

8585
Assert.That(Sfi.Statistics.EntityInsertCount, Is.EqualTo(0), "Dirty has triggered an insert");
86-
Assert.That(
87-
entityChild.Id,
88-
Is.EqualTo(0),
89-
"Transient objects should not be saved by ISession.IsDirty() call (expected 0 as Id)");
9086
Assert.That(isDirty, "ISession.IsDirty() call should return true.");
87+
if (Dialect.SupportsIdentityColumns)
88+
{
89+
Assert.That(
90+
entityChild.Id,
91+
Is.EqualTo(0),
92+
"Transient objects should not be saved by ISession.IsDirty() call (expected 0 as Id)");
93+
}
9194
}
9295
}
9396

‎src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@
5555
</ItemGroup>
5656
<ItemGroup>
5757
<PackageReference Include="log4net" Version="2.0.12" />
58-
<PackageReference Include="Microsoft.AspNetCore.OData" Version="7.3.0" />
59-
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.0.19269.1" />
58+
<PackageReference Include="Microsoft.AspNetCore.OData" Version="7.5.8" />
59+
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
6060
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.109.2" />
61-
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.11" />
62-
<PackageReference Include="NSubstitute" Version="3.1.0" />
63-
<PackageReference Include="NUnit" Version="3.12.0" />
64-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
65-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
61+
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.9" />
62+
<PackageReference Include="NSubstitute" Version="4.2.2" />
63+
<PackageReference Include="NUnit" Version="3.13.2" />
64+
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
65+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
6666
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.3.0" />
6767
<PackageReference Include="Npgsql" Version="4.0.3" />
6868
<PackageReference Include="MySql.Data" Version="8.0.22" />
@@ -77,12 +77,12 @@
7777
<PackageReference Include="Oracle.ManagedDataAccess" Version="12.1.2400" />
7878
</ItemGroup>
7979
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
80-
<PackageReference Include="System.CodeDom" Version="4.4.0" />
81-
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
80+
<PackageReference Include="System.CodeDom" Version="4.7.0" />
81+
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
8282
<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
83-
<PackageReference Include="System.Data.Odbc" Version="4.5.0" />
83+
<PackageReference Include="System.Data.Odbc" Version="4.7.0" />
8484
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
85-
<PackageReference Include="NUnitLite" Version="3.12.0" />
85+
<PackageReference Include="NUnitLite" Version="3.13.2" />
8686
</ItemGroup>
8787
<ItemGroup Condition=" '$(NuGetPackageRoot)' != '' ">
8888
<NativeBinaries Include="$(NuGetPackageRoot)microsoft.sqlserver.compact\4.0.8876.1\NativeBinaries\**\*.*" />

‎src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<ProjectReference Include="..\NHibernate.Test\NHibernate.Test.csproj" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="NUnit" Version="3.12.0" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
18+
<PackageReference Include="NUnit" Version="3.13.2" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
2020
</ItemGroup>
2121
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
22-
<PackageReference Include="NUnitLite" Version="3.12.0" />
22+
<PackageReference Include="NUnitLite" Version="3.13.2" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

‎src/NHibernate/Async/Event/Default/DefaultDirtyCheckEventListener.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010

1111
using System;
12+
using NHibernate.Engine;
13+
using NHibernate.Util;
1214

1315
namespace NHibernate.Event.Default
1416
{

‎src/NHibernate/Event/Default/DefaultDirtyCheckEventListener.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System;
2+
using NHibernate.Engine;
3+
using NHibernate.Util;
24

35
namespace NHibernate.Event.Default
46
{
@@ -11,6 +13,10 @@ public partial class DefaultDirtyCheckEventListener : AbstractFlushingEventListe
1113
{
1214
private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(DefaultDirtyCheckEventListener));
1315

16+
protected override object Anything => IdentityMap.Instantiate(10);
17+
18+
protected override CascadingAction CascadingAction => CascadingAction.Persist;
19+
1420
public virtual void OnDirtyCheck(DirtyCheckEvent @event)
1521
{
1622
int oldSize = @event.Session.ActionQueue.CollectionRemovalsCount;

‎src/NHibernate/NHibernate.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<PackageDescription>NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed, fully featured and used in thousands of successful projects.</PackageDescription>
1414
<PackageTags>ORM; O/RM; DataBase; DAL; ObjectRelationalMapping; NHibernate; ADO.Net; Core</PackageTags>
15-
<LangVersion>7.2</LangVersion>
15+
<LangVersion>7.3</LangVersion>
1616
</PropertyGroup>
1717

1818
<ItemGroup>
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Antlr3.CodeGenerator" Version="3.5.2-beta1">
36+
<PackageReference Include="Antlr3.CodeGenerator" Version="3.5.2-rc1">
3737
<PrivateAssets>All</PrivateAssets>
3838
</PackageReference>
3939
<PackageReference Include="Antlr3.Runtime" Version="[3.5.1, 4.0)" />
@@ -51,14 +51,14 @@
5151
</ItemGroup>
5252

5353
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
54-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
54+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
5555
</ItemGroup>
5656

5757
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
58-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
59-
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
60-
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
61-
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
58+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
59+
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
60+
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
61+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
6262
</ItemGroup>
6363

6464
<ItemGroup>

0 commit comments

Comments
 (0)