NH-4063 - Fix ODBC failing tests.

Author: fredericDelaporte

lib/teamcity/sqlServerOdbc/NHibernate.Test.last-results.xml

@@ -625,7 +625,7 @@ public void Cast()
 			// 1) Has more then 1 argument
 			// 2) The argument separator is "as" (for the other function is ',' or ' ')
 			// 3) The ReturnType is not fixed (depend on a column type)
-			// 4) The 2th argument is parsed by NH and traslated for a specific Dialect (can't be interpreted directly by RDBMS)
+			// 4) The 2th argument is parsed by NH and translated for a specific Dialect (can't be interpreted directly by RDBMS)
 			using (ISession s = OpenSession())
 			{
 				Animal a1 = new Animal("abcdef", 1.3f);
@@ -643,7 +643,7 @@ public void Cast()
 				Assert.AreEqual(1, l.Count);
 				Assert.That(l[0], Is.TypeOf(typeof (double)));
 
-				// Rendered in SELECT using a property in an operation with costant 
+				// Rendered in SELECT using a property in an operation with constants
 				hql = "select cast(7+123-5*a.BodyWeight as Double) from Animal a";
 				l = s.CreateQuery(hql).List();
 				Assert.AreEqual(1, l.Count);
@@ -658,7 +658,7 @@ public void Cast()
 					Assert.That(l[0], Is.TypeOf(typeof(double)));
 				}
 
-				// TODO: Rendered in SELECT using string costant assigned with critic chars (separators)
+				// TODO: Rendered in SELECT using string constant assigned with critic chars (separators)
 
 				// Rendered in WHERE using a property 
 				if (!(Dialect is Oracle8iDialect))
@@ -668,7 +668,7 @@ public void Cast()
 					Assert.AreEqual("abcdef", result.Description);
 				}
 
-				// Rendered in WHERE using a property in an operation with costants
+				// Rendered in WHERE using a property in an operation with constants
 				hql = "from Animal a where cast(7+123-2*a.BodyWeight as Double)>0";
 				result = (Animal)s.CreateQuery(hql).UniqueResult();
 				Assert.AreEqual("abcdef", result.Description);
@@ -694,7 +694,7 @@ public void Cast()
 				Assert.AreEqual(1, l.Count);
 				Assert.That(l[0], Is.TypeOf(typeof(double)));
 
-				// Rendered in GROUP BY using a property in an operation with costant 
+				// Rendered in GROUP BY using a property in an operation with constants
 				hql = "select cast(7+123-5*a.BodyWeight as Double) from Animal a group by cast(7+123-5*a.BodyWeight as Double)";
 				l = s.CreateQuery(hql).List();
 				Assert.AreEqual(1, l.Count);
@@ -719,7 +719,7 @@ public void Cast()
 					Assert.AreEqual(1, l.Count);
 					Assert.That(l[0], Is.TypeOf(typeof(double)));
 
-					// Rendered in HAVING using a property in an operation with costants
+					// Rendered in HAVING using a property in an operation with constants
 					hql =
 						"select cast(7+123.3-1*a.BodyWeight as int) from Animal a group by cast(7+123.3-1*a.BodyWeight as int) having cast(7+123.3-1*a.BodyWeight as int)>0";
 					l = s.CreateQuery(hql).List();
@@ -742,6 +742,9 @@ public void Cast()
 					}
 					catch (ADOException ex)
 					{
+						if (ex.InnerException == null)
+							throw;
+
 						if (Dialect is Oracle8iDialect)
 						{
 							if (!ex.InnerException.Message.StartsWith("ORA-00979"))
@@ -762,7 +765,7 @@ public void Cast()
 							// This test raises an exception in SQL Server because named 
 							// parameters internally are always positional (@p0, @p1, etc.)
 							// and named differently hence they mismatch between GROUP BY and HAVING clauses.
-							if (!ex.InnerException.Message.Equals(msgToCheck))
+							if (!ex.InnerException.Message.Contains(msgToCheck))
 								throw;
 						}
 					}

src/NHibernate.Test/Hql/HQLFunctions.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
+using NHibernate.Dialect;
 using NHibernate.Driver;
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
@@ -33,7 +34,7 @@ protected override string MappingsAssembly
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			// Custom batcher enforces sql server.
-			return dialect.SupportsSqlBatches;
+			return dialect is MsSql2000Dialect;
 		}
 
 		protected override bool AppliesTo(ISessionFactoryImplementor factory)

src/NHibernate.Test/Insertordering/InsertOrderingFixture.cs

@@ -11,6 +11,7 @@ protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.FormatSql, "false");
 		}
+
 		[Test]
 		public void Bug()
 		{
@@ -23,8 +24,11 @@ public void Bug()
 						.SetParameter("filternull", !filter.HasValue)
 						.SetParameter("filterval", filter.HasValue ? filter.Value : 0).List<xchild>();
 					var message = ls.GetWholeLog();
-				    string paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
-					Assert.That(message, Does.Contain("xchild0_.ParentId=xparent1_.Id and (" + paramPrefix + "p0=" + Dialect.ToBooleanValueString(true) + " or xparent1_.A<" + paramPrefix + "p1)"));
+					var paramFormatter = (ISqlParameterFormatter)Sfi.ConnectionProvider.Driver;
+					Assert.That(message, Does.Contain(
+						"xchild0_.ParentId=xparent1_.Id and (" +
+						$"{paramFormatter.GetParameterName(0)}={Dialect.ToBooleanValueString(true)} or " +
+						$"xparent1_.A<{paramFormatter.GetParameterName(1)})"));
 				}
 			}
 		}

src/NHibernate.Test/NHSpecificTest/NH1444/Fixture.cs

@@ -1,6 +1,8 @@
 using System.Data;
 using NHibernate.Cfg;
 using NHibernate.Dialect;
+using NHibernate.Driver;
+using NHibernate.Engine;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
 
@@ -125,6 +127,13 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 			return dialect is MsSql2005Dialect;
 		}
 
+		protected override bool AppliesTo(ISessionFactoryImplementor factory)
+		{
+			// SQLUpdateConflictToStaleStateExceptionConverter is specific to Sql client driver, and does not work
+			// with Odbc (and likeley Oledb).
+			return factory.ConnectionProvider.Driver is SqlClientDriver;
+		}
+
 		private void SetAllowSnapshotIsolation(bool on)
 		{
 			using (ISession session = OpenSession())

src/NHibernate.Test/NHSpecificTest/NH1553/MsSQL/SnapshotIsolationUpdateConflictTest.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using NHibernate.Dialect;
+using NHibernate.Driver;
+using NHibernate.Engine;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH1756
@@ -12,6 +14,25 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 			return dialect is MsSql2000Dialect;
 		}
 
+		protected override bool AppliesTo(ISessionFactoryImplementor factory)
+		{
+			// ODBC driver DateTime handling with SQL Server 2008+ Client is broken and forbids using it as a time stamp
+			// generated on db-side.
+			// Due to NH-3895, we have to force the scale on date-time parameters to 3 (3 significant fractional seconds digits)
+			// when using ODBC + SQL Server 2008+, otherwise DateTime values having milliseconds will be rejected. But the SQL
+			// Server DateTime does not have actually a one millisecond resolution (it has 3.333), causing ODBC to convert the
+			// parameter to DateTime2. A DateTime value ending by 3ms (indeed 3.333) or 7ms (indeed 6.666) is
+			// to be transmitted as having 3ms or 7ms and will match if transmitted as a DateTime. But when transmitted as
+			// DateTime2, it will no more be considered equal, causing the test to be flaky and failing two thirds of tries.
+			// Example failing update captured with profiler:
+			// exec sp_executesql N'UPDATE book SET name_column = @P1 WHERE id = @P2 AND version_column = @P3',
+			//     N'@P1 nvarchar(18),@P2 int,@P3 datetime2',N'modified test book',1,'2017-08-02 16:37:16.0630000'
+			// Setting the scale to 2 still causes failure for two thirds of tries, due to 3ms/7ms being truncated in such case
+			// with ODBC and SQL Server 2008+ Client, which is rejected bu ODBC.
+			// (Affects DbVersionFixture too.)
+			return !(factory.ConnectionProvider.Driver is OdbcDriver);
+		}
+
 		[Test]
 		public void SaveTransient_Then_Update_Ok()
 		{

src/NHibernate.Test/NHSpecificTest/NH1756/Fixture.cs

@@ -4,7 +4,8 @@ namespace NHibernate.Test.NHSpecificTest.NH1850
 {
 	using System;
 	using AdoNet;
-	using Environment=NHibernate.Cfg.Environment;
+	using NHibernate.Engine;
+	using Environment = NHibernate.Cfg.Environment;
 
 	[TestFixture]
 	public class Fixture:BugTestCase
@@ -14,9 +15,18 @@ protected override void Configure(NHibernate.Cfg.Configuration configuration)
 			configuration.SetProperty(Environment.BatchSize, "1");
 		}
 
-		protected override bool AppliesTo(Dialect.Dialect dialect)
+		protected override bool AppliesTo(ISessionFactoryImplementor factory)
 		{
-			return dialect.SupportsSqlBatches;
+			// This test heavily depends on the batcher implementation.
+			// The MySql one likely does not issue the expected logs, but is in fact unused
+			// (driver does not supply it, it needs to be explicitly configured).
+			// The Oracle one logs twice, causing the expected count to not match.
+			// The non batching one just does one single log instead of many.
+			// (This test has never test anything else than SQL Server because it was previously
+			// applied according to dialect.SupportsSqlBatches which is utterly unrelated to
+			// the batcher and just tell about "GO" SQL Server Client tools convention. This was
+			// causing it to fail with ODBC + SQL Server, since ODBC uses the non batching batcher.)
+			return factory.Settings.BatcherFactory is SqlClientBatchingBatcherFactory;
 		}
 
 		[Test]

src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs

@@ -1,3 +1,5 @@
+using NHibernate.Driver;
+using NHibernate.Engine;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH1981
@@ -11,6 +13,13 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 			return !(dialect is Dialect.FirebirdDialect);
 		}
 
+		protected override bool AppliesTo(ISessionFactoryImplementor factory)
+		{
+			// When not using a named prefix, the driver use positional parameters, causing parameterized
+			// expression used in group by and select to be not be considered as the same expression.
+			return ((DriverBase)factory.ConnectionProvider.Driver).UseNamedPrefixInParameter;
+		}
+
 		protected override void OnSetUp()
 		{
 			using (var s = OpenSession())

src/NHibernate.Test/NHSpecificTest/NH1981/Fixture.cs

@@ -1,7 +1,9 @@
 using NUnit.Framework;
 using NHibernate.Dialect;
+using NHibernate.Driver;
 using NHibernate.Exceptions;
 using NHibernate.Test.ExceptionsTest;
+using NHibernate.Engine;
 
 namespace NHibernate.Test.NHSpecificTest.NH2020
 {
@@ -21,6 +23,12 @@ protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
 			return dialect is MsSql2000Dialect;
 		}
 
+		protected override bool AppliesTo(ISessionFactoryImplementor factory)
+		{
+			// Use a SQL Server Client exception converter, cannot work for ODBC or OleDb
+			return factory.ConnectionProvider.Driver is SqlClientDriver;
+		}
+
 		protected override void OnTearDown()
 		{
 			using (ISession s = OpenSession())

src/NHibernate.Test/NHSpecificTest/NH2020/Fixture.cs

@@ -1,31 +1,29 @@
-using System;
-using System.Collections.Generic;
+using System.Threading;
 using System.Transactions;
-using NHibernate.Impl;
 using NUnit.Framework;
-using NHibernate.Criterion;
 
 namespace NHibernate.Test.NHSpecificTest.NH2057
 {
 	[TestFixture]
 	public class Fixture : BugTestCase
 	{
 		[Test]
-		[Description("This test fails intermittently on SQL Server ODBC. Not sure why.")]
 		public void WillCloseWhenUsingDTC()
 		{
-			SessionImpl s;
+			ISession s;
 			using (var tx = new TransactionScope())
 			{
-				using (s = (SessionImpl)OpenSession())
+				using (s = OpenSession())
 				{
 					s.Get<Person>(1);
 				}
 				//not closed because the tx is opened yet
-				Assert.False(s.IsClosed);
+				Assert.That(s.IsOpen, Is.True);
 				tx.Complete();
 			}
-			Assert.That(s.IsClosed, Is.True);
+			// ODBC does promote to distributed, causing the completion to happen concurrently to code
+			// following scope disposal. Sleep a bit for accounting for this.
+			Assert.That(() => s.IsOpen, Is.False.After(500, 100));
 		}
 	}
 }