From c6640f231605b8e788d7233dc8d0658c4c603cf9 Mon Sep 17 00:00:00 2001 From: tohidemyname Date: Sat, 29 Jun 2024 08:48:09 +0800 Subject: [PATCH 1/6] A possible bug --- .../NHSpecificTest/NHNewBug/Child.cs | 18 +++++++ .../NHSpecificTest/NHNewBug/ContainedChild.cs | 35 +++++++++++++ .../NHNewBug/ManyToOneFixture.cs | 49 +++++++++++++++++++ .../NHSpecificTest/NHNewBug/Mappings.hbm.xml | 31 ++++++++++++ .../NHSpecificTest/NHNewBug/Parent.cs | 32 ++++++++++++ 5 files changed, 165 insertions(+) create mode 100644 src/NHibernate.Test/NHSpecificTest/NHNewBug/Child.cs create mode 100644 src/NHibernate.Test/NHSpecificTest/NHNewBug/ContainedChild.cs create mode 100644 src/NHibernate.Test/NHSpecificTest/NHNewBug/ManyToOneFixture.cs create mode 100644 src/NHibernate.Test/NHSpecificTest/NHNewBug/Mappings.hbm.xml create mode 100644 src/NHibernate.Test/NHSpecificTest/NHNewBug/Parent.cs diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/Child.cs b/src/NHibernate.Test/NHSpecificTest/NHNewBug/Child.cs new file mode 100644 index 0000000000..0b10d0ac32 --- /dev/null +++ b/src/NHibernate.Test/NHSpecificTest/NHNewBug/Child.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NHibernate.Test.NHSpecificTest.NHNewBug +{ + public class Child + { + private int id; + public virtual int Id + { + get { return id; } + set { id = value; } + } + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/ContainedChild.cs b/src/NHibernate.Test/NHSpecificTest/NHNewBug/ContainedChild.cs new file mode 100644 index 0000000000..6c0e439dac --- /dev/null +++ b/src/NHibernate.Test/NHSpecificTest/NHNewBug/ContainedChild.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using NHibernate.UserTypes; + +namespace NHibernate.Test.NHSpecificTest.NHNewBug +{ + public class ContainedChild + { + private int id; + public virtual int Id + { + get { return id; } + set { id = value; } + } + private Child child; + + public ContainedChild() + { + } + + public ContainedChild(Child child) + { + this.child = child; + } + + public virtual Child Child + { + get { return child; } + set { child = value; } + } + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/ManyToOneFixture.cs b/src/NHibernate.Test/NHSpecificTest/NHNewBug/ManyToOneFixture.cs new file mode 100644 index 0000000000..e959522514 --- /dev/null +++ b/src/NHibernate.Test/NHSpecificTest/NHNewBug/ManyToOneFixture.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using NUnit.Framework; + +/* 项目“NHibernate.Test (net48)”的未合并的更改 +在此之前: +using NHibernate.Test.NHSpecificTest; +在此之后: +using NHibernate.Test.NHSpecificTest; +using NHibernate; +using NHibernate.Test; +using NHibernate.Test.MappingTest; +using NHibernate.Test.NHSpecificTest.NHNewBug; +*/ +using NHibernate.Test.NHSpecificTest; + +namespace NHibernate.Test.NHSpecificTest.NHNewBug +{ + + + + + + + + [TestFixture] + internal class ManyToOneFixture : BugTestCase + { + [Test] + public void AccessIdOfManyToOneInEmbeddable() + { + ISession s = OpenSession(); + ITransaction t = s.BeginTransaction(); + Parent p = new Parent(); + p.ContainedChildren.Add(new ContainedChild(new Child())); + s.Persist(p); + t.Commit(); + var list = s.CreateQuery("from Parent p join p.ContainedChildren c where c.Child.Id is not null").List(); + Assert.AreNotEqual(0, list.Count); + s.Delete(p); + t.Commit(); + s.Close(); + } + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/Mappings.hbm.xml b/src/NHibernate.Test/NHSpecificTest/NHNewBug/Mappings.hbm.xml new file mode 100644 index 0000000000..cbc2370ff3 --- /dev/null +++ b/src/NHibernate.Test/NHSpecificTest/NHNewBug/Mappings.hbm.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/Parent.cs b/src/NHibernate.Test/NHSpecificTest/NHNewBug/Parent.cs new file mode 100644 index 0000000000..91899840d8 --- /dev/null +++ b/src/NHibernate.Test/NHSpecificTest/NHNewBug/Parent.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NHibernate.Test.NHSpecificTest.NHNewBug +{ + public class Parent + { + private int id; + private ContainedChild containedChild; + private ISet containedChildren = new HashSet(); + + public virtual int Id + { + get { return id; } + set { id = value; } + } + + public virtual ContainedChild ContainedChild + { + get { return containedChild; } + set { containedChild = value; } + } + public virtual ISet ContainedChildren + { + get { return containedChildren; } + set { containedChildren = value; } + } + } +} From 0f89eb930be8cf5f9071fef18efb1c36419deb10 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 29 Jun 2024 00:54:58 +0000 Subject: [PATCH 2/6] Generate async files --- .../NHNewBug/ManyToOneFixture.cs | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs new file mode 100644 index 0000000000..3a0c6626e2 --- /dev/null +++ b/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs @@ -0,0 +1,59 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by AsyncGenerator. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using NUnit.Framework; + +/* 项目“NHibernate.Test (net48)”的未合并的更改 +在此之前: +using NHibernate.Test.NHSpecificTest; +在此之后: +using NHibernate.Test.NHSpecificTest; +using NHibernate; +using NHibernate.Test; +using NHibernate.Test.MappingTest; +using NHibernate.Test.NHSpecificTest.NHNewBug; +*/ +using NHibernate.Test.NHSpecificTest; + +namespace NHibernate.Test.NHSpecificTest.NHNewBug +{ + + + + + + + + [TestFixture] + internal class ManyToOneFixtureAsync : BugTestCase + { + [Test] + public async Task AccessIdOfManyToOneInEmbeddableAsync() + { + ISession s = OpenSession(); + ITransaction t = s.BeginTransaction(); + Parent p = new Parent(); + p.ContainedChildren.Add(new ContainedChild(new Child())); + await (s.PersistAsync(p)); + await (t.CommitAsync()); + var list = await (s.CreateQuery("from Parent p join p.ContainedChildren c where c.Child.Id is not null").ListAsync()); + Assert.AreNotEqual(0, list.Count); + await (s.DeleteAsync(p)); + await (t.CommitAsync()); + s.Close(); + } + } +} From ad91c6d78c7742b7f3e32522d64679fe21dd3ac6 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 3 Jul 2024 09:16:15 +1000 Subject: [PATCH 3/6] Delete src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs --- .../NHNewBug/ManyToOneFixture.cs | 59 ------------------- 1 file changed, 59 deletions(-) delete mode 100644 src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs deleted file mode 100644 index 3a0c6626e2..0000000000 --- a/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs +++ /dev/null @@ -1,59 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by AsyncGenerator. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using NUnit.Framework; - -/* 项目“NHibernate.Test (net48)”的未合并的更改 -在此之前: -using NHibernate.Test.NHSpecificTest; -在此之后: -using NHibernate.Test.NHSpecificTest; -using NHibernate; -using NHibernate.Test; -using NHibernate.Test.MappingTest; -using NHibernate.Test.NHSpecificTest.NHNewBug; -*/ -using NHibernate.Test.NHSpecificTest; - -namespace NHibernate.Test.NHSpecificTest.NHNewBug -{ - - - - - - - - [TestFixture] - internal class ManyToOneFixtureAsync : BugTestCase - { - [Test] - public async Task AccessIdOfManyToOneInEmbeddableAsync() - { - ISession s = OpenSession(); - ITransaction t = s.BeginTransaction(); - Parent p = new Parent(); - p.ContainedChildren.Add(new ContainedChild(new Child())); - await (s.PersistAsync(p)); - await (t.CommitAsync()); - var list = await (s.CreateQuery("from Parent p join p.ContainedChildren c where c.Child.Id is not null").ListAsync()); - Assert.AreNotEqual(0, list.Count); - await (s.DeleteAsync(p)); - await (t.CommitAsync()); - s.Close(); - } - } -} From 7e3dea96986abf704899ad73c6757c9ff39a69fb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 2 Jul 2024 23:18:08 +0000 Subject: [PATCH 4/6] Generate async files --- .../NHNewBug/ManyToOneFixture.cs | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs new file mode 100644 index 0000000000..3a0c6626e2 --- /dev/null +++ b/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs @@ -0,0 +1,59 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by AsyncGenerator. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using NUnit.Framework; + +/* 项目“NHibernate.Test (net48)”的未合并的更改 +在此之前: +using NHibernate.Test.NHSpecificTest; +在此之后: +using NHibernate.Test.NHSpecificTest; +using NHibernate; +using NHibernate.Test; +using NHibernate.Test.MappingTest; +using NHibernate.Test.NHSpecificTest.NHNewBug; +*/ +using NHibernate.Test.NHSpecificTest; + +namespace NHibernate.Test.NHSpecificTest.NHNewBug +{ + + + + + + + + [TestFixture] + internal class ManyToOneFixtureAsync : BugTestCase + { + [Test] + public async Task AccessIdOfManyToOneInEmbeddableAsync() + { + ISession s = OpenSession(); + ITransaction t = s.BeginTransaction(); + Parent p = new Parent(); + p.ContainedChildren.Add(new ContainedChild(new Child())); + await (s.PersistAsync(p)); + await (t.CommitAsync()); + var list = await (s.CreateQuery("from Parent p join p.ContainedChildren c where c.Child.Id is not null").ListAsync()); + Assert.AreNotEqual(0, list.Count); + await (s.DeleteAsync(p)); + await (t.CommitAsync()); + s.Close(); + } + } +} From b07563fd6ac3da97f9eee7ed12663f6043dbd1a7 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 3 Jul 2024 09:20:43 +1000 Subject: [PATCH 5/6] Change bug namespace --- .../Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs | 4 ++-- .../NHSpecificTest/{NHNewBug => GH3569}/Child.cs | 2 +- .../NHSpecificTest/{NHNewBug => GH3569}/ContainedChild.cs | 2 +- .../NHSpecificTest/{NHNewBug => GH3569}/ManyToOneFixture.cs | 4 ++-- .../NHSpecificTest/{NHNewBug => GH3569}/Mappings.hbm.xml | 2 +- .../NHSpecificTest/{NHNewBug => GH3569}/Parent.cs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename src/NHibernate.Test/NHSpecificTest/{NHNewBug => GH3569}/Child.cs (82%) rename src/NHibernate.Test/NHSpecificTest/{NHNewBug => GH3569}/ContainedChild.cs (90%) rename src/NHibernate.Test/NHSpecificTest/{NHNewBug => GH3569}/ManyToOneFixture.cs (90%) rename src/NHibernate.Test/NHSpecificTest/{NHNewBug => GH3569}/Mappings.hbm.xml (91%) rename src/NHibernate.Test/NHSpecificTest/{NHNewBug => GH3569}/Parent.cs (92%) diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs index 3a0c6626e2..76e1660ab8 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs @@ -24,11 +24,11 @@ using NHibernate; using NHibernate.Test; using NHibernate.Test.MappingTest; -using NHibernate.Test.NHSpecificTest.NHNewBug; +using NHibernate.Test.NHSpecificTest.GH3569; */ using NHibernate.Test.NHSpecificTest; -namespace NHibernate.Test.NHSpecificTest.NHNewBug +namespace NHibernate.Test.NHSpecificTest.GH3569 { diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/Child.cs b/src/NHibernate.Test/NHSpecificTest/GH3569/Child.cs similarity index 82% rename from src/NHibernate.Test/NHSpecificTest/NHNewBug/Child.cs rename to src/NHibernate.Test/NHSpecificTest/GH3569/Child.cs index 0b10d0ac32..def90de9af 100644 --- a/src/NHibernate.Test/NHSpecificTest/NHNewBug/Child.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH3569/Child.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace NHibernate.Test.NHSpecificTest.NHNewBug +namespace NHibernate.Test.NHSpecificTest.GH3569 { public class Child { diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/ContainedChild.cs b/src/NHibernate.Test/NHSpecificTest/GH3569/ContainedChild.cs similarity index 90% rename from src/NHibernate.Test/NHSpecificTest/NHNewBug/ContainedChild.cs rename to src/NHibernate.Test/NHSpecificTest/GH3569/ContainedChild.cs index 6c0e439dac..03ac0be8dc 100644 --- a/src/NHibernate.Test/NHSpecificTest/NHNewBug/ContainedChild.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH3569/ContainedChild.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using NHibernate.UserTypes; -namespace NHibernate.Test.NHSpecificTest.NHNewBug +namespace NHibernate.Test.NHSpecificTest.GH3569 { public class ContainedChild { diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/ManyToOneFixture.cs b/src/NHibernate.Test/NHSpecificTest/GH3569/ManyToOneFixture.cs similarity index 90% rename from src/NHibernate.Test/NHSpecificTest/NHNewBug/ManyToOneFixture.cs rename to src/NHibernate.Test/NHSpecificTest/GH3569/ManyToOneFixture.cs index e959522514..f71c08f329 100644 --- a/src/NHibernate.Test/NHSpecificTest/NHNewBug/ManyToOneFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH3569/ManyToOneFixture.cs @@ -14,11 +14,11 @@ using NHibernate; using NHibernate.Test; using NHibernate.Test.MappingTest; -using NHibernate.Test.NHSpecificTest.NHNewBug; +using NHibernate.Test.NHSpecificTest.GH3569; */ using NHibernate.Test.NHSpecificTest; -namespace NHibernate.Test.NHSpecificTest.NHNewBug +namespace NHibernate.Test.NHSpecificTest.GH3569 { diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/Mappings.hbm.xml b/src/NHibernate.Test/NHSpecificTest/GH3569/Mappings.hbm.xml similarity index 91% rename from src/NHibernate.Test/NHSpecificTest/NHNewBug/Mappings.hbm.xml rename to src/NHibernate.Test/NHSpecificTest/GH3569/Mappings.hbm.xml index cbc2370ff3..78099ac198 100644 --- a/src/NHibernate.Test/NHSpecificTest/NHNewBug/Mappings.hbm.xml +++ b/src/NHibernate.Test/NHSpecificTest/GH3569/Mappings.hbm.xml @@ -1,7 +1,7 @@ + namespace="NHibernate.Test.NHSpecificTest.GH3569"> diff --git a/src/NHibernate.Test/NHSpecificTest/NHNewBug/Parent.cs b/src/NHibernate.Test/NHSpecificTest/GH3569/Parent.cs similarity index 92% rename from src/NHibernate.Test/NHSpecificTest/NHNewBug/Parent.cs rename to src/NHibernate.Test/NHSpecificTest/GH3569/Parent.cs index 91899840d8..3504b1746b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NHNewBug/Parent.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH3569/Parent.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace NHibernate.Test.NHSpecificTest.NHNewBug +namespace NHibernate.Test.NHSpecificTest.GH3569 { public class Parent { From 18c4b75f540b561e4b1c1291757464c3c21c941d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 2 Jul 2024 23:25:09 +0000 Subject: [PATCH 6/6] Generate async files --- .../Async/NHSpecificTest/{NHNewBug => GH3569}/ManyToOneFixture.cs | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/NHibernate.Test/Async/NHSpecificTest/{NHNewBug => GH3569}/ManyToOneFixture.cs (100%) diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH3569/ManyToOneFixture.cs similarity index 100% rename from src/NHibernate.Test/Async/NHSpecificTest/NHNewBug/ManyToOneFixture.cs rename to src/NHibernate.Test/Async/NHSpecificTest/GH3569/ManyToOneFixture.cs