Fix odbc tests

maca88 · maca88 · commit 010cf850b3ac · 2020-08-22T13:53:52.000+02:00
diff --git a/src/NHibernate.Test/Async/Linq/ParameterTests.cs b/src/NHibernate.Test/Async/Linq/ParameterTests.cs
@@ -16,6 +16,7 @@
 using System.Text.RegularExpressions;
 using NHibernate.Dialect;
 using NHibernate.DomainModel.Northwind.Entities;
+using NHibernate.Driver;
 using NHibernate.Engine.Query;
 using NHibernate.Linq;
 using NHibernate.Util;
@@ -318,6 +319,7 @@ public async Task CompareFloatingPointParameterWithIntegralAndFloatingPointColum
 				{db.NumericEntities.Where(o => o.NullableDouble == doubleParam || o.Integer != doubleParam), "Double"},
 				{db.NumericEntities.Where(o => o.NullableDouble == doubleParam || o.NullableInteger == doubleParam), "Double"}
 			};
+			var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;
 
 			foreach (var pair in queriables)
 			{
@@ -329,7 +331,7 @@ public async Task CompareFloatingPointParameterWithIntegralAndFloatingPointColum
 					{
 						var matches = Regex.Matches(sql, @"cast\([\w\d]+\..+\)");
 						Assert.That(matches.Count, Is.EqualTo(1));
-						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));
+						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));
 					}));
 			}
 		}
@@ -361,6 +363,7 @@ public async Task CompareFloatingPointParameterWithDifferentFloatingPointColumns
 			var sameType = Sfi.Dialect.TryGetCastTypeName(NHibernateUtil.Single.SqlType, out var singleCast) &&
 			               Sfi.Dialect.TryGetCastTypeName(NHibernateUtil.Double.SqlType, out var doubleCast) &&
 			               singleCast == doubleCast;
+			var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;
 
 			foreach (var pair in queriables)
 			{
@@ -375,7 +378,7 @@ public async Task CompareFloatingPointParameterWithDifferentFloatingPointColumns
 							: Regex.Matches(sql, @"cast\(((@|\?|:)p\d+|\?)\s+as.*\)");
 						// SQLiteDialect uses sql cast for transparentcast method
 						Assert.That(matches.Count, Is.EqualTo(sameType && !(Sfi.Dialect is SQLiteDialect) ? 0 : 1));
-						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));
+						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));
 					}));
 			}
 		}
@@ -408,6 +411,7 @@ public async Task CompareIntegralParameterWithIntegralAndFloatingPointColumnsAsy
 				{db.NumericEntities.Where(o => o.NullableLong == longParam || o.Decimal != longParam), "Int64"},
 				{db.NumericEntities.Where(o => o.NullableLong == longParam || o.NullableSingle > longParam), "Int64"}
 			};
+			var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;
 
 			foreach (var pair in queriables)
 			{
@@ -419,7 +423,7 @@ public async Task CompareIntegralParameterWithIntegralAndFloatingPointColumnsAsy
 					{
 						var matches = Regex.Matches(sql, @"cast\(((@|\?|:)p\d+|\?)\s+as.*\)");
 						Assert.That(matches.Count, Is.EqualTo(1));
-						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));
+						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));
 					}));
 			}
 		}
diff --git a/src/NHibernate.Test/Linq/ParameterTests.cs b/src/NHibernate.Test/Linq/ParameterTests.cs
@@ -6,6 +6,7 @@
 using System.Text.RegularExpressions;
 using NHibernate.Dialect;
 using NHibernate.DomainModel.Northwind.Entities;
+using NHibernate.Driver;
 using NHibernate.Engine.Query;
 using NHibernate.Linq;
 using NHibernate.Util;
@@ -306,6 +307,7 @@ public void CompareFloatingPointParameterWithIntegralAndFloatingPointColumns()
 				{db.NumericEntities.Where(o => o.NullableDouble == doubleParam || o.Integer != doubleParam), "Double"},
 				{db.NumericEntities.Where(o => o.NullableDouble == doubleParam || o.NullableInteger == doubleParam), "Double"}
 			};
+			var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;
 
 			foreach (var pair in queriables)
 			{
@@ -317,7 +319,7 @@ public void CompareFloatingPointParameterWithIntegralAndFloatingPointColumns()
 					{
 						var matches = Regex.Matches(sql, @"cast\([\w\d]+\..+\)");
 						Assert.That(matches.Count, Is.EqualTo(1));
-						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));
+						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));
 					});
 			}
 		}
@@ -349,6 +351,7 @@ public void CompareFloatingPointParameterWithDifferentFloatingPointColumns()
 			var sameType = Sfi.Dialect.TryGetCastTypeName(NHibernateUtil.Single.SqlType, out var singleCast) &&
 			               Sfi.Dialect.TryGetCastTypeName(NHibernateUtil.Double.SqlType, out var doubleCast) &&
 			               singleCast == doubleCast;
+			var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;
 
 			foreach (var pair in queriables)
 			{
@@ -363,7 +366,7 @@ public void CompareFloatingPointParameterWithDifferentFloatingPointColumns()
 							: Regex.Matches(sql, @"cast\(((@|\?|:)p\d+|\?)\s+as.*\)");
 						// SQLiteDialect uses sql cast for transparentcast method
 						Assert.That(matches.Count, Is.EqualTo(sameType && !(Sfi.Dialect is SQLiteDialect) ? 0 : 1));
-						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));
+						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));
 					});
 			}
 		}
@@ -396,6 +399,7 @@ public void CompareIntegralParameterWithIntegralAndFloatingPointColumns()
 				{db.NumericEntities.Where(o => o.NullableLong == longParam || o.Decimal != longParam), "Int64"},
 				{db.NumericEntities.Where(o => o.NullableLong == longParam || o.NullableSingle > longParam), "Int64"}
 			};
+			var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;
 
 			foreach (var pair in queriables)
 			{
@@ -407,7 +411,7 @@ public void CompareIntegralParameterWithIntegralAndFloatingPointColumns()
 					{
 						var matches = Regex.Matches(sql, @"cast\(((@|\?|:)p\d+|\?)\s+as.*\)");
 						Assert.That(matches.Count, Is.EqualTo(1));
-						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));
+						Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));
 					});
 			}
 		}
diff --git a/src/NHibernate/Linq/Visitors/ParameterTypeLocator.cs b/src/NHibernate/Linq/Visitors/ParameterTypeLocator.cs
@@ -141,8 +141,8 @@ internal static void SetParameterTypes(
 					}
 				}
 
-				constantExpressions.Select(o => o.Type.UnwrapIfNullable()).Distinct().Single();
-				var constantExpression = constantExpressions.First(); // TODO: check when types are different
+				// All constant expressions have the same type/value
+				var constantExpression = constantExpressions.First();
 				var constantType = constantExpression.Type.UnwrapIfNullable();
 				IType type = null;
 				if (

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`using System.Text.RegularExpressions;`
`17`	`17`	`using NHibernate.Dialect;`
`18`	`18`	`using NHibernate.DomainModel.Northwind.Entities;`
	`19`	`+using NHibernate.Driver;`
`19`	`20`	`using NHibernate.Engine.Query;`
`20`	`21`	`using NHibernate.Linq;`
`21`	`22`	`using NHibernate.Util;`
`@@ -318,6 +319,7 @@ public async Task CompareFloatingPointParameterWithIntegralAndFloatingPointColum`
`318`	`319`	`{db.NumericEntities.Where(o => o.NullableDouble == doubleParam \|\| o.Integer != doubleParam), "Double"},`
`319`	`320`	`{db.NumericEntities.Where(o => o.NullableDouble == doubleParam \|\| o.NullableInteger == doubleParam), "Double"}`
`320`	`321`	`};`
	`322`	`+ var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;`
`321`	`323`
`322`	`324`	`foreach (var pair in queriables)`
`323`	`325`	`{`
`@@ -329,7 +331,7 @@ public async Task CompareFloatingPointParameterWithIntegralAndFloatingPointColum`
`329`	`331`	`{`
`330`	`332`	`var matches = Regex.Matches(sql, @"cast\([\w\d]+\..+\)");`
`331`	`333`	`Assert.That(matches.Count, Is.EqualTo(1));`
`332`		`- Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));`
	`334`	`+ Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));`
`333`	`335`	`}));`
`334`	`336`	`}`
`335`	`337`	`}`
`@@ -361,6 +363,7 @@ public async Task CompareFloatingPointParameterWithDifferentFloatingPointColumns`
`361`	`363`	`var sameType = Sfi.Dialect.TryGetCastTypeName(NHibernateUtil.Single.SqlType, out var singleCast) &&`
`362`	`364`	`Sfi.Dialect.TryGetCastTypeName(NHibernateUtil.Double.SqlType, out var doubleCast) &&`
`363`	`365`	`singleCast == doubleCast;`
	`366`	`+ var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;`
`364`	`367`
`365`	`368`	`foreach (var pair in queriables)`
`366`	`369`	`{`
`@@ -375,7 +378,7 @@ public async Task CompareFloatingPointParameterWithDifferentFloatingPointColumns`
`375`	`378`	`: Regex.Matches(sql, @"cast\(((@\|\?\|:)p\d+\|\?)\s+as.*\)");`
`376`	`379`	`// SQLiteDialect uses sql cast for transparentcast method`
`377`	`380`	`Assert.That(matches.Count, Is.EqualTo(sameType && !(Sfi.Dialect is SQLiteDialect) ? 0 : 1));`
`378`		`- Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));`
	`381`	`+ Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));`
`379`	`382`	`}));`
`380`	`383`	`}`
`381`	`384`	`}`
`@@ -408,6 +411,7 @@ public async Task CompareIntegralParameterWithIntegralAndFloatingPointColumnsAsy`
`408`	`411`	`{db.NumericEntities.Where(o => o.NullableLong == longParam \|\| o.Decimal != longParam), "Int64"},`
`409`	`412`	`{db.NumericEntities.Where(o => o.NullableLong == longParam \|\| o.NullableSingle > longParam), "Int64"}`
`410`	`413`	`};`
	`414`	`+ var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;`
`411`	`415`
`412`	`416`	`foreach (var pair in queriables)`
`413`	`417`	`{`
`@@ -419,7 +423,7 @@ public async Task CompareIntegralParameterWithIntegralAndFloatingPointColumnsAsy`
`419`	`423`	`{`
`420`	`424`	`var matches = Regex.Matches(sql, @"cast\(((@\|\?\|:)p\d+\|\?)\s+as.*\)");`
`421`	`425`	`Assert.That(matches.Count, Is.EqualTo(1));`
`422`		`- Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));`
	`426`	`+ Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));`
`423`	`427`	`}));`
`424`	`428`	`}`
`425`	`429`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Text.RegularExpressions;`
`7`	`7`	`using NHibernate.Dialect;`
`8`	`8`	`using NHibernate.DomainModel.Northwind.Entities;`
	`9`	`+using NHibernate.Driver;`
`9`	`10`	`using NHibernate.Engine.Query;`
`10`	`11`	`using NHibernate.Linq;`
`11`	`12`	`using NHibernate.Util;`
`@@ -306,6 +307,7 @@ public void CompareFloatingPointParameterWithIntegralAndFloatingPointColumns()`
`306`	`307`	`{db.NumericEntities.Where(o => o.NullableDouble == doubleParam \|\| o.Integer != doubleParam), "Double"},`
`307`	`308`	`{db.NumericEntities.Where(o => o.NullableDouble == doubleParam \|\| o.NullableInteger == doubleParam), "Double"}`
`308`	`309`	`};`
	`310`	`+ var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;`
`309`	`311`
`310`	`312`	`foreach (var pair in queriables)`
`311`	`313`	`{`
`@@ -317,7 +319,7 @@ public void CompareFloatingPointParameterWithIntegralAndFloatingPointColumns()`
`317`	`319`	`{`
`318`	`320`	`var matches = Regex.Matches(sql, @"cast\([\w\d]+\..+\)");`
`319`	`321`	`Assert.That(matches.Count, Is.EqualTo(1));`
`320`		`- Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));`
	`322`	`+ Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));`
`321`	`323`	`});`
`322`	`324`	`}`
`323`	`325`	`}`
`@@ -349,6 +351,7 @@ public void CompareFloatingPointParameterWithDifferentFloatingPointColumns()`
`349`	`351`	`var sameType = Sfi.Dialect.TryGetCastTypeName(NHibernateUtil.Single.SqlType, out var singleCast) &&`
`350`	`352`	`Sfi.Dialect.TryGetCastTypeName(NHibernateUtil.Double.SqlType, out var doubleCast) &&`
`351`	`353`	`singleCast == doubleCast;`
	`354`	`+ var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;`
`352`	`355`
`353`	`356`	`foreach (var pair in queriables)`
`354`	`357`	`{`
`@@ -363,7 +366,7 @@ public void CompareFloatingPointParameterWithDifferentFloatingPointColumns()`
`363`	`366`	`: Regex.Matches(sql, @"cast\(((@\|\?\|:)p\d+\|\?)\s+as.*\)");`
`364`	`367`	`// SQLiteDialect uses sql cast for transparentcast method`
`365`	`368`	`Assert.That(matches.Count, Is.EqualTo(sameType && !(Sfi.Dialect is SQLiteDialect) ? 0 : 1));`
`366`		`- Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));`
	`369`	`+ Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));`
`367`	`370`	`});`
`368`	`371`	`}`
`369`	`372`	`}`
`@@ -396,6 +399,7 @@ public void CompareIntegralParameterWithIntegralAndFloatingPointColumns()`
`396`	`399`	`{db.NumericEntities.Where(o => o.NullableLong == longParam \|\| o.Decimal != longParam), "Int64"},`
`397`	`400`	`{db.NumericEntities.Where(o => o.NullableLong == longParam \|\| o.NullableSingle > longParam), "Int64"}`
`398`	`401`	`};`
	`402`	`+ var odbcDriver = Sfi.ConnectionProvider.Driver is OdbcDriver;`
`399`	`403`
`400`	`404`	`foreach (var pair in queriables)`
`401`	`405`	`{`
`@@ -407,7 +411,7 @@ public void CompareIntegralParameterWithIntegralAndFloatingPointColumns()`
`407`	`411`	`{`
`408`	`412`	`var matches = Regex.Matches(sql, @"cast\(((@\|\?\|:)p\d+\|\?)\s+as.*\)");`
`409`	`413`	`Assert.That(matches.Count, Is.EqualTo(1));`
`410`		`- Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(1));`
	`414`	`+ Assert.That(GetTotalOccurrences(sql, $"Type: {pair.Value}"), Is.EqualTo(odbcDriver ? 2 : 1));`
`411`	`415`	`});`
`412`	`416`	`}`
`413`	`417`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,8 @@ internal static void SetParameterTypes(`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`144`		`- constantExpressions.Select(o => o.Type.UnwrapIfNullable()).Distinct().Single();`
`145`		`- var constantExpression = constantExpressions.First(); // TODO: check when types are different`
	`144`	`+ // All constant expressions have the same type/value`
	`145`	`+ var constantExpression = constantExpressions.First();`
`146`	`146`	`var constantType = constantExpression.Type.UnwrapIfNullable();`
`147`	`147`	`IType type = null;`
`148`	`148`	`if (`