Specify to TypeValue whether the value is a list or not

fredericDelaporte · fredericDelaporte · commit abed56295096 · 2018-05-10T14:10:09.000+02:00
diff --git a/src/NHibernate/Async/Collection/AbstractPersistentCollection.cs b/src/NHibernate/Async/Collection/AbstractPersistentCollection.cs
@@ -193,15 +193,15 @@ protected virtual async Task<ICollection> GetOrphansAsync(ICollection oldElement
 				if (current != null && await (ForeignKeys.IsNotTransientSlowAsync(entityName, current, session, cancellationToken)).ConfigureAwait(false))
 				{
 					object currentId = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, current, session, cancellationToken)).ConfigureAwait(false);
-					currentIds.Add(new TypedValue(idType, currentId));
+					currentIds.Add(new TypedValue(idType, currentId, false));
 				}
 			}
 
 			// iterate over the *old* list
 			foreach (object old in oldElements)
 			{
 				object oldId = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, old, session, cancellationToken)).ConfigureAwait(false);
-				if (!currentIds.Contains(new TypedValue(idType, oldId)))
+				if (!currentIds.Contains(new TypedValue(idType, oldId, false)))
 				{
 					res.Add(old);
 				}
diff --git a/src/NHibernate/Async/Loader/Collection/CollectionLoader.cs b/src/NHibernate/Async/Loader/Collection/CollectionLoader.cs
@@ -32,4 +32,4 @@ public virtual Task InitializeAsync(object id, ISessionImplementor session, Canc
 			return LoadCollectionAsync(session, id, KeyType, cancellationToken);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Collection/AbstractPersistentCollection.cs b/src/NHibernate/Collection/AbstractPersistentCollection.cs
@@ -720,15 +720,15 @@ protected virtual ICollection GetOrphans(ICollection oldElements, ICollection cu
 				if (current != null && ForeignKeys.IsNotTransientSlow(entityName, current, session))
 				{
 					object currentId = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, current, session);
-					currentIds.Add(new TypedValue(idType, currentId));
+					currentIds.Add(new TypedValue(idType, currentId, false));
 				}
 			}
 
 			// iterate over the *old* list
 			foreach (object old in oldElements)
 			{
 				object oldId = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, old, session);
-				if (!currentIds.Contains(new TypedValue(idType, oldId)))
+				if (!currentIds.Contains(new TypedValue(idType, oldId, false)))
 				{
 					res.Add(old);
 				}
diff --git a/src/NHibernate/Criterion/InExpression.cs b/src/NHibernate/Criterion/InExpression.cs
@@ -135,15 +135,15 @@ private List<TypedValue> GetParameterTypedValues(ICriteria criteria, ICriteriaQu
 						object subval = _values[j] == null
 											? null
 											: actype.GetPropertyValues(_values[j])[i];
-						list.Add(new TypedValue(types[i], subval));
+						list.Add(new TypedValue(types[i], subval, false));
 					}
 				}
 
 				return list;
 			}
 			else
 			{
-				return _values.Select(v => new TypedValue(type, v)).ToList();
+				return _values.Select(v => new TypedValue(type, v, false)).ToList();
 			}
 		}
 
diff --git a/src/NHibernate/Criterion/LikeExpression.cs b/src/NHibernate/Criterion/LikeExpression.cs
@@ -27,7 +27,7 @@ public LikeExpression(string propertyName, string value, char? escapeChar, bool
 		{
 			this.projection = Projections.Property(propertyName);
 			this.value = value;
-			typedValue = new TypedValue(NHibernateUtil.String, this.value);
+			typedValue = new TypedValue(NHibernateUtil.String, this.value, false);
 
 			this.escapeChar = escapeChar;
 			this.ignoreCase = ignoreCase;
@@ -37,7 +37,7 @@ public LikeExpression(IProjection projection, string value, MatchMode matchMode)
 		{
 			this.projection = projection;
 			this.value = matchMode.ToMatchString(value);
-			typedValue = new TypedValue(NHibernateUtil.String, this.value);
+			typedValue = new TypedValue(NHibernateUtil.String, this.value, false);
 		}
 
 
@@ -112,4 +112,4 @@ public override string ToString()
 			return projection + " like " + value;
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Engine/TypedValue.cs b/src/NHibernate/Engine/TypedValue.cs
@@ -17,20 +17,30 @@ public sealed class TypedValue
 		private readonly object value;
 		private readonly IEqualityComparer<TypedValue> comparer;
 
-		// "value is ICollection": minimal logic, may not catch all cases, like HashSet<T>. Prefer
-		// directly calling "TypedValue(IType type, object value, bool isList)" when knowing what is value.
-		public TypedValue(IType type, object value) : this (type, value, value is ICollection)
+		/// <summary>
+		/// Constructor for typed value that may represent a simple value or a list value (for a parameter list).
+		/// If knowing what is value, use <see cref="TypedValue(IType, object, bool)"/> instead.
+		/// </summary>
+		/// <param name="type">The type of the value (or of its elements if it is a list value)</param>
+		/// <param name="value">The value.</param>
+		/// <remarks>The logic for infering if the value should be considered as a list value is minimal and will not
+		/// catch all cases, like hashset.</remarks>
+		public TypedValue(IType type, object value) : this (type, value, !type.IsCollectionType && value is ICollection && !type.ReturnedClass.IsArray)
 		{
 		}
 
+		/// <summary>
+		/// Construct a typed value.
+		/// </summary>
+		/// <param name="type">The type of the value (or of its elements if it is a list value)</param>
+		/// <param name="value">The value.</param>
+		/// <param name="isList"><see langword="true" /> if the value is a list value (for a parameter list),
+		/// <see langword="false" /> otherwise.</param>
 		public TypedValue(IType type, object value, bool isList)
 		{
 			this.type = type;
 			this.value = value;
-			if (isList && !type.IsCollectionType && !type.ReturnedClass.IsArray)
-				comparer = new ParameterListComparer();
-			else
-				comparer = new DefaultComparer();
+			comparer = isList ? (IEqualityComparer<TypedValue>) new ParameterListComparer() : new DefaultComparer();
 		}
 
 		public object Value
diff --git a/src/NHibernate/Impl/AbstractQueryImpl.cs b/src/NHibernate/Impl/AbstractQueryImpl.cs
@@ -241,7 +241,7 @@ private string ExpandParameterList(string query, string name, TypedValue typedLi
 			var type = typedList.Type;
 
 			var typedValues = (from object value in vals
-							   select new TypedValue(type, value))
+							   select new TypedValue(type, value, false))
 				.ToList();
 
 			if (typedValues.Count == 1)
@@ -300,7 +300,7 @@ public IQuery SetParameter(string name, object val, IType type)
 			}
 			else
 			{
-				namedParameters[name] = new TypedValue(type, val);
+				namedParameters[name] = new TypedValue(type, val, false);
 				return this;
 			}
 		}
diff --git a/src/NHibernate/Impl/ExpressionQueryImpl.cs b/src/NHibernate/Impl/ExpressionQueryImpl.cs
@@ -52,7 +52,7 @@ protected override IQueryExpression ExpandParameters(IDictionary<string, TypedVa
 				var type = me.Value.Type;
 
 				var typedValues = (from object value in vals
-								   select new TypedValue(type, value))
+								   select new TypedValue(type, value, false))
 					.ToList();
 
 				if (typedValues.Count == 1)
diff --git a/src/NHibernate/Loader/Collection/CollectionLoader.cs b/src/NHibernate/Loader/Collection/CollectionLoader.cs
@@ -92,7 +92,7 @@ protected SqlString GetSubSelectWithLimits(SqlString subquery, ICollection<IPara
 					var skipParameter = new NamedParameterSpecification(1, 0, skipParameterName) { ExpectedType = NHibernateUtil.Int32 };
 					skipSqlParameter = Parameter.Placeholder;
 					skipSqlParameter.BackTrack = skipParameter.GetIdsForBackTrack(sessionFactory).First();
-					parameters.Add(skipParameterName, new TypedValue(skipParameter.ExpectedType, skip.Value));
+					parameters.Add(skipParameterName, new TypedValue(skipParameter.ExpectedType, skip.Value, false));
 					parameterSpecs.Add(skipParameter);
 				}
 				if (take.HasValue)
@@ -101,7 +101,7 @@ protected SqlString GetSubSelectWithLimits(SqlString subquery, ICollection<IPara
 					var takeParameter = new NamedParameterSpecification(1, 0, takeParameterName) { ExpectedType = NHibernateUtil.Int32 };
 					takeSqlParameter = Parameter.Placeholder;
 					takeSqlParameter.BackTrack = takeParameter.GetIdsForBackTrack(sessionFactory).First();
-					parameters.Add(takeParameterName, new TypedValue(takeParameter.ExpectedType, take.Value));
+					parameters.Add(takeParameterName, new TypedValue(takeParameter.ExpectedType, take.Value, false));
 					parameterSpecs.Add(takeParameter);
 				}
 
@@ -112,4 +112,4 @@ protected SqlString GetSubSelectWithLimits(SqlString subquery, ICollection<IPara
 			return subquery;
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs b/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs
@@ -815,13 +815,13 @@ public ICollection<NamedParameter> CollectedParameters
 
 		public Parameter CreateSkipParameter(int value)
 		{
-			var typedValue = new TypedValue(NHibernateUtil.Int32, value);
+			var typedValue = new TypedValue(NHibernateUtil.Int32, value, false);
 			return NewQueryParameter("skip_", typedValue).Single();
 		}
 		
 		public Parameter CreateTakeParameter(int value)
 		{
-			var typedValue = new TypedValue(NHibernateUtil.Int32, value);
+			var typedValue = new TypedValue(NHibernateUtil.Int32, value, false);
 			return NewQueryParameter("take_",typedValue).Single();
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -193,15 +193,15 @@ protected virtual async Task<ICollection> GetOrphansAsync(ICollection oldElement`
`193`	`193`	`if (current != null && await (ForeignKeys.IsNotTransientSlowAsync(entityName, current, session, cancellationToken)).ConfigureAwait(false))`
`194`	`194`	`{`
`195`	`195`	`object currentId = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, current, session, cancellationToken)).ConfigureAwait(false);`
`196`		`- currentIds.Add(new TypedValue(idType, currentId));`
	`196`	`+ currentIds.Add(new TypedValue(idType, currentId, false));`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`// iterate over the old list`
`201`	`201`	`foreach (object old in oldElements)`
`202`	`202`	`{`
`203`	`203`	`object oldId = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, old, session, cancellationToken)).ConfigureAwait(false);`
`204`		`- if (!currentIds.Contains(new TypedValue(idType, oldId)))`
	`204`	`+ if (!currentIds.Contains(new TypedValue(idType, oldId, false)))`
`205`	`205`	`{`
`206`	`206`	`res.Add(old);`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,4 @@ public virtual Task InitializeAsync(object id, ISessionImplementor session, Canc`
`32`	`32`	`return LoadCollectionAsync(session, id, KeyType, cancellationToken);`
`33`	`33`	`}`
`34`	`34`	`}`
`35`		`-}`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -720,15 +720,15 @@ protected virtual ICollection GetOrphans(ICollection oldElements, ICollection cu`
`720`	`720`	`if (current != null && ForeignKeys.IsNotTransientSlow(entityName, current, session))`
`721`	`721`	`{`
`722`	`722`	`object currentId = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, current, session);`
`723`		`- currentIds.Add(new TypedValue(idType, currentId));`
	`723`	`+ currentIds.Add(new TypedValue(idType, currentId, false));`
`724`	`724`	`}`
`725`	`725`	`}`
`726`	`726`
`727`	`727`	`// iterate over the old list`
`728`	`728`	`foreach (object old in oldElements)`
`729`	`729`	`{`
`730`	`730`	`object oldId = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, old, session);`
`731`		`- if (!currentIds.Contains(new TypedValue(idType, oldId)))`
	`731`	`+ if (!currentIds.Contains(new TypedValue(idType, oldId, false)))`
`732`	`732`	`{`
`733`	`733`	`res.Add(old);`
`734`	`734`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,15 +135,15 @@ private List<TypedValue> GetParameterTypedValues(ICriteria criteria, ICriteriaQu`
`135`	`135`	`object subval = _values[j] == null`
`136`	`136`	`? null`
`137`	`137`	`: actype.GetPropertyValues(_values[j])[i];`
`138`		`- list.Add(new TypedValue(types[i], subval));`
	`138`	`+ list.Add(new TypedValue(types[i], subval, false));`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`return list;`
`143`	`143`	`}`
`144`	`144`	`else`
`145`	`145`	`{`
`146`		`- return _values.Select(v => new TypedValue(type, v)).ToList();`
	`146`	`+ return _values.Select(v => new TypedValue(type, v, false)).ToList();`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public LikeExpression(string propertyName, string value, char? escapeChar, bool`
`27`	`27`	`{`
`28`	`28`	`this.projection = Projections.Property(propertyName);`
`29`	`29`	`this.value = value;`
`30`		`- typedValue = new TypedValue(NHibernateUtil.String, this.value);`
	`30`	`+ typedValue = new TypedValue(NHibernateUtil.String, this.value, false);`
`31`	`31`
`32`	`32`	`this.escapeChar = escapeChar;`
`33`	`33`	`this.ignoreCase = ignoreCase;`
`@@ -37,7 +37,7 @@ public LikeExpression(IProjection projection, string value, MatchMode matchMode)`
`37`	`37`	`{`
`38`	`38`	`this.projection = projection;`
`39`	`39`	`this.value = matchMode.ToMatchString(value);`
`40`		`- typedValue = new TypedValue(NHibernateUtil.String, this.value);`
	`40`	`+ typedValue = new TypedValue(NHibernateUtil.String, this.value, false);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`
`@@ -112,4 +112,4 @@ public override string ToString()`
`112`	`112`	`return projection + " like " + value;`
`113`	`113`	`}`
`114`	`114`	`}`
`115`		`-}`
	`115`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ private string ExpandParameterList(string query, string name, TypedValue typedLi`
`241`	`241`	`var type = typedList.Type;`
`242`	`242`
`243`	`243`	`var typedValues = (from object value in vals`
`244`		`- select new TypedValue(type, value))`
	`244`	`+ select new TypedValue(type, value, false))`
`245`	`245`	`.ToList();`
`246`	`246`
`247`	`247`	`if (typedValues.Count == 1)`
`@@ -300,7 +300,7 @@ public IQuery SetParameter(string name, object val, IType type)`
`300`	`300`	`}`
`301`	`301`	`else`
`302`	`302`	`{`
`303`		`- namedParameters[name] = new TypedValue(type, val);`
	`303`	`+ namedParameters[name] = new TypedValue(type, val, false);`
`304`	`304`	`return this;`
`305`	`305`	`}`
`306`	`306`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected SqlString GetSubSelectWithLimits(SqlString subquery, ICollection<IPara`
`92`	`92`	`var skipParameter = new NamedParameterSpecification(1, 0, skipParameterName) { ExpectedType = NHibernateUtil.Int32 };`
`93`	`93`	`skipSqlParameter = Parameter.Placeholder;`
`94`	`94`	`skipSqlParameter.BackTrack = skipParameter.GetIdsForBackTrack(sessionFactory).First();`
`95`		`- parameters.Add(skipParameterName, new TypedValue(skipParameter.ExpectedType, skip.Value));`
	`95`	`+ parameters.Add(skipParameterName, new TypedValue(skipParameter.ExpectedType, skip.Value, false));`
`96`	`96`	`parameterSpecs.Add(skipParameter);`
`97`	`97`	`}`
`98`	`98`	`if (take.HasValue)`
`@@ -101,7 +101,7 @@ protected SqlString GetSubSelectWithLimits(SqlString subquery, ICollection<IPara`
`101`	`101`	`var takeParameter = new NamedParameterSpecification(1, 0, takeParameterName) { ExpectedType = NHibernateUtil.Int32 };`
`102`	`102`	`takeSqlParameter = Parameter.Placeholder;`
`103`	`103`	`takeSqlParameter.BackTrack = takeParameter.GetIdsForBackTrack(sessionFactory).First();`
`104`		`- parameters.Add(takeParameterName, new TypedValue(takeParameter.ExpectedType, take.Value));`
	`104`	`+ parameters.Add(takeParameterName, new TypedValue(takeParameter.ExpectedType, take.Value, false));`
`105`	`105`	`parameterSpecs.Add(takeParameter);`
`106`	`106`	`}`
`107`	`107`
`@@ -112,4 +112,4 @@ protected SqlString GetSubSelectWithLimits(SqlString subquery, ICollection<IPara`
`112`	`112`	`return subquery;`
`113`	`113`	`}`
`114`	`114`	`}`
`115`		`-}`
	`115`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -815,13 +815,13 @@ public ICollection<NamedParameter> CollectedParameters`
`815`	`815`
`816`	`816`	`public Parameter CreateSkipParameter(int value)`
`817`	`817`	`{`
`818`		`- var typedValue = new TypedValue(NHibernateUtil.Int32, value);`
	`818`	`+ var typedValue = new TypedValue(NHibernateUtil.Int32, value, false);`
`819`	`819`	`return NewQueryParameter("skip_", typedValue).Single();`
`820`	`820`	`}`
`821`	`821`
`822`	`822`	`public Parameter CreateTakeParameter(int value)`
`823`	`823`	`{`
`824`		`- var typedValue = new TypedValue(NHibernateUtil.Int32, value);`
	`824`	`+ var typedValue = new TypedValue(NHibernateUtil.Int32, value, false);`
`825`	`825`	`return NewQueryParameter("take_",typedValue).Single();`
`826`	`826`	`}`
`827`	`827`