Improve one-to-one handling in queries #2084

bahusoid · 2019-03-23T12:27:53Z

Added proper column span calculation (mapping related checks extracted to GetOwnerColumnSpan);
Adjusted OneToOneType to be properly handled as parameter and projection in queries;

Allows using one-to-one association in entity comparisons (fixes NH-3778 - Crash when performing a Linq query on a one-to-one mapped reference #1368)
Fixes one-to-one handling for composite keys (fixes NH-3469 - Impossible to load one-to-one association with LINQ for composite-id #1309)
Fixes one-to-one projections (fixes One-to-one properties not appearing in Select() projection result set #2064, fixes NH-3178 - Exception when using one-to-one properties in a criteria projections #1125)

src/NHibernate.Test/Associations/OneToOneFixture.cs

hazzik · 2019-03-26T10:43:04Z

Does it actually make sense to return 0 in GetColumnSpan for OneToOne type?

hazzik · 2019-03-26T10:46:28Z

What about criteria? Do the same queries work there?

bahusoid · 2019-03-26T10:47:31Z

Does it actually make sense to return 0 in GetColumnSpan for OneToOne type?

Yeah otherwise owner entity thinks that one-to-one entity requires N columns in owner table. And it breaks some other checks in multiple places.

src/NHibernate/Type/OneToOneType.cs

src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs

hazzik · 2019-03-26T11:08:59Z

Yeah otherwise owner entity thinks that one-to-one entity requires N columns in owner table. And it breaks some other checks in multiple places.

Can we instead find places where it expects 0? I don't really like inconsistency between GetColumnSpan, SqlTypes and NullSafeGet. It is breaking the contract.

hazzik · 2019-03-26T11:11:53Z

src/NHibernate/Type/OneToOneType.cs

@@ -44,7 +44,8 @@ public override void NullSafeSet(DbCommand st, object value, int index, bool[] s

 		public override void NullSafeSet(DbCommand cmd, object value, int index, ISessionImplementor session)
 		{
-			//nothing to do


Do we need to make same change to the another overload of NullSafeSet?

No. Other method is about preparing command for owner table. At least from what I've seen in tests.

src/NHibernate/Type/OneToOneType.cs

src/NHibernate.Test/Associations/OneToOneFixture.cs

hazzik · 2019-03-26T12:11:12Z

How will this work with your other PR #2081?

bahusoid · 2019-03-26T15:07:17Z

How will this work with your other PR #2081?

It's unrelated. #2081 is about forcing join for association. Join for association is not affected by this PR. This pr fixes various explicit comparisons with one-to-one association (via parameter, null, other join...)

…rameterColumnSpan Implement one-to-one handling without owner (to make it work in projections)

bahusoid · 2019-03-26T15:19:44Z

src/NHibernate/Type/OneToOneType.cs

@@ -92,6 +96,16 @@ public override ForeignKeyDirection ForeignKeyDirection

 		public override object Hydrate(DbDataReader rs, string[] names, ISessionImplementor session, object owner)
 		{
+			if (owner == null && names.Length > 0)


This also fixes #2064. But #2082 still can be applied as it optimizes processing a bit by avoiding loaded entities "rehydrating".

bahusoid · 2019-03-26T15:21:21Z

src/NHibernate/Type/IType.cs

@@ -7,10 +7,10 @@ namespace NHibernate.Type
 {
 	internal static class TypeExtensions
 	{
-		public static int GetParameterColumnSpan(this IType type, IMapping sessionFactory)
+		public static int GetOwnerColumnSpan(this IType type, IMapping sessionFactory)


Not sure if it makes sense to add it to IType interface.

bahusoid · 2019-03-26T16:22:58Z

Can we instead find places where it expects 0

Done. Introduced GetOwnerColumnSpan for such places.

What about criteria? Do the same queries work there?

Yes. It works with latest commit. Tests added.

hazzik · 2019-03-26T22:32:10Z

src/NHibernate/Mapping/SimpleValue.cs

@@ -324,7 +324,7 @@ public bool IsSimpleValue

 		public virtual bool IsValid(IMapping mapping)
 		{
-			return ColumnSpan == Type.GetColumnSpan(mapping);
+			return ColumnSpan == Type.GetOwnerColumnSpan(mapping);


This will break something called "SpecialOneToOneType".

Which seems to be unsupported anyway.

Yeah. For the code below ColumnSpan is always 0. So it's never used.

nhibernate-core/src/NHibernate/Mapping/OneToOne.cs

Lines 91 to 103 in c8b9ae6

if (ColumnSpan > 0)

{

return

new SpecialOneToOneType(ReferencedEntityName, foreignKeyType, referencedPropertyName, IsLazy, UnwrapProxy,

entityName, propertyName);

}

else

{

return

TypeFactory.OneToOne(ReferencedEntityName, foreignKeyType, referencedPropertyName, IsLazy, UnwrapProxy,

entityName, propertyName);

}

}

Though I restored original behavior just in case...

I think we should override logic for onetone.

I've added GetOwnerColumnSpan override to SpecialOneToOne in my latest commit. Or did you mean something else?

I was thinking to implement override for IsValid in OneToOne to handle this logic. But it's ok.

Improve one-to-one handling in queries

55ffdb6

bahusoid commented Mar 23, 2019

View reviewed changes

src/NHibernate.Test/Associations/OneToOneFixture.cs Show resolved Hide resolved

hazzik previously approved these changes Mar 26, 2019

View reviewed changes

hazzik added t: Improvement c: Core p: Major labels Mar 26, 2019

hazzik self-requested a review March 26, 2019 10:43

This comment has been minimized.

Sign in to view

hazzik reviewed Mar 26, 2019

View reviewed changes

src/NHibernate/Type/OneToOneType.cs Show resolved Hide resolved

hazzik reviewed Mar 26, 2019

View reviewed changes

src/NHibernate/Type/OneToOneType.cs Show resolved Hide resolved

hazzik reviewed Mar 26, 2019

View reviewed changes

src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

hazzik reviewed Mar 26, 2019

View reviewed changes

src/NHibernate/Type/OneToOneType.cs Show resolved Hide resolved

hazzik reviewed Mar 26, 2019

View reviewed changes

src/NHibernate.Test/Associations/OneToOneFixture.cs Outdated Show resolved Hide resolved

bahusoid mentioned this pull request Mar 26, 2019

Fix cacheable CreateSQLQuery throws on query with AddJoin #2088

Merged

Apply "Reversed fix": add and use GetOwnerColumnSpan instead of GetPa…

25584b0

…rameterColumnSpan Implement one-to-one handling without owner (to make it work in projections)

bahusoid dismissed hazzik’s stale review via 25584b0 March 26, 2019 15:15

bahusoid commented Mar 26, 2019

View reviewed changes

Clean up

d20d91b

hazzik reviewed Mar 26, 2019

View reviewed changes

Fix for SpecialOneToOneType and more clean up

00893e7

hazzik approved these changes Mar 27, 2019

View reviewed changes

hazzik merged commit 95d38c1 into nhibernate:master Mar 27, 2019

hazzik added this to the 5.3 milestone Mar 27, 2019

hazzik added the r: Fixed label Mar 27, 2019

bahusoid mentioned this pull request Apr 5, 2020

Use entities prepared by Loader in hql select projections #2082

Merged

bahusoid mentioned this pull request Jan 27, 2021

Fix dynamic delete for one-to-one association #2652

Merged

	if (ColumnSpan > 0)
	{
	return
	new SpecialOneToOneType(ReferencedEntityName, foreignKeyType, referencedPropertyName, IsLazy, UnwrapProxy,
	entityName, propertyName);
	}
	else
	{
	return
	TypeFactory.OneToOne(ReferencedEntityName, foreignKeyType, referencedPropertyName, IsLazy, UnwrapProxy,
	entityName, propertyName);
	}
	}

Improve one-to-one handling in queries #2084

Improve one-to-one handling in queries #2084

Uh oh!

Conversation

bahusoid commented Mar 23, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

hazzik commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hazzik commented Mar 26, 2019

Uh oh!

bahusoid commented Mar 26, 2019 • edited by hazzik Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

hazzik commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

Choose a reason for hiding this comment

Uh oh!

bahusoid Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

hazzik commented Mar 26, 2019

Uh oh!

bahusoid commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bahusoid commented Mar 26, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hazzik Mar 27, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bahusoid commented Mar 23, 2019 •

edited

Loading

hazzik commented Mar 26, 2019 •

edited

Loading

bahusoid commented Mar 26, 2019 •

edited by hazzik

Loading

hazzik commented Mar 26, 2019 •

edited

Loading

bahusoid Mar 26, 2019 •

edited

Loading

bahusoid commented Mar 26, 2019 •

edited

Loading

hazzik Mar 27, 2019 •

edited

Loading