NH-4004 - More SqlCe tests fixes.

Author: fredericDelaporte

src/NHibernate.Test/CompositeId/CompositeIdFixture.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using NHibernate.Dialect;
 using NUnit.Framework;
 
 namespace NHibernate.Test.CompositeId
@@ -29,6 +30,12 @@ protected override string CacheConcurrencyStrategy
 			get { return null; }
 		}
 
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			// Order uses a scalar sub-select formula.
+			return Dialect.SupportsScalarSubSelects;
+		}
+
 		[Test]
 		public void CompositeIds()
 		{

src/NHibernate.Test/Hql/Ast/HqlFixture.cs

@@ -74,188 +74,95 @@ public void OrderByPropertiesImplicitlySpecifiedInTheSelect()
 			{
 				s.CreateQuery("select distinct z from Animal a join a.zoo as z order by z.name").List();
 			}
-		} 
+		}
 
 		[Test]
 		public void CaseClauseInSelect()
 		{
 			// NH-322
-			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				s.Save(new Animal {BodyWeight = 12, Description = "Polliwog"});
-				s.Transaction.Commit();
-			}
-		
-			using (ISession s = OpenSession())
+			using (var s = OpenSession())
 			{
-				var l = s.CreateQuery("select a.id, case when a.description = 'Polliwog' then 2 else 0 end from Animal a").List();
+				var l = s
+					.CreateQuery("select a.id, case when a.description = 'Polliwog' then 2 else 0 end from Animal a where a.id = :id")
+					.SetInt64("id", _polliwog.Id)
+					.List();
 				var element = (IList)l[0];
 				Assert.That(element[1], Is.EqualTo(2));
 
 				// work with alias
-				l = s.CreateQuery("select a.id, case when a.description = 'Polliwog' then 2 else 0 end as value from Animal a").List();
+				l = s
+					.CreateQuery("select a.id, case when a.description = 'Polliwog' then 2 else 0 end as value from Animal a where a.id = :id")
+					.SetInt64("id", _polliwog.Id)
+					.List();
 				element = (IList)l[0];
 				Assert.That(element[1], Is.EqualTo(2));
 			}
-
-			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				s.CreateQuery("delete from Animal").ExecuteUpdate();
-				s.Transaction.Commit();
-			}
 		}
 
 		[Test]
 		public void MultipleParametersInCaseStatement()
 		{
-			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				s.Save(new Animal { BodyWeight = 12, Description = "Polliwog" });
-				s.Transaction.Commit();
-			}
-
-			try
-			{
-				using (ISession s = OpenSession())
-				{
-					var result = s.CreateQuery("select case when 'b' = ? then 2 when 'b' = ? then 1 else 0 end from Animal a")
-						.SetParameter(0, "a")
-						.SetParameter(1, "b")
-						.SetMaxResults(1)
-						.UniqueResult();
-					Assert.AreEqual(1, result);
-				}
-			}
-			finally
+			using (var s = OpenSession())
 			{
-				using (ISession s = OpenSession())
-				using (s.BeginTransaction())
-				{
-					s.CreateQuery("delete from Animal").ExecuteUpdate();
-					s.Transaction.Commit();
-				}
+				var result = s.CreateQuery("select case when 'b' = ? then 2 when 'b' = ? then 1 else 0 end from Animal a")
+					.SetParameter(0, "a")
+					.SetParameter(1, "b")
+					.SetMaxResults(1)
+					.UniqueResult();
+				Assert.AreEqual(1, result);
 			}
 		}
 
 		[Test]
 		public void ParameterInCaseThenClause()
 		{
-			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				s.Save(new Animal { BodyWeight = 12, Description = "Polliwog" });
-				s.Transaction.Commit();
-			}
-
-			try
-			{
-				using (ISession s = OpenSession())
-				{
-					var result = s.CreateQuery("select case when 2=2 then ? else 0 end from Animal a")
-						.SetParameter(0, 1)
-						.UniqueResult();
-					Assert.AreEqual(1, result);
-				}
-			}
-			finally
+			using (var s = OpenSession())
 			{
-				using (ISession s = OpenSession())
-				using (s.BeginTransaction())
-				{
-					s.CreateQuery("delete from Animal").ExecuteUpdate();
-					s.Transaction.Commit();
-				}
+				var result = s.CreateQuery("select case when 2=2 then ? else 0 end from Animal a")
+					.SetParameter(0, 1)
+					.SetMaxResults(1)
+					.UniqueResult();
+				Assert.AreEqual(1, result);
 			}
 		}
 
 		[Test]
 		public void ParameterInCaseThenAndElseClausesWithCast()
 		{
-			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				s.Save(new Animal { BodyWeight = 12, Description = "Polliwog" });
-				s.Transaction.Commit();
-			}
-
-			try
-			{
-				using (ISession s = OpenSession())
-				{
-					var result = s.CreateQuery("select case when 2=2 then cast(? as integer) else ? end from Animal a")
-						.SetParameter(0, 1)
-						.SetParameter(1, 0)
-						.UniqueResult();
-					Assert.AreEqual(1, result);
-				}
-			}
-			finally
+			using (var s = OpenSession())
 			{
-				using (ISession s = OpenSession())
-				using (s.BeginTransaction())
-				{
-					s.CreateQuery("delete from Animal").ExecuteUpdate();
-					s.Transaction.Commit();
-				}
+				var result = s.CreateQuery("select case when 2=2 then cast(? as integer) else ? end from Animal a")
+					.SetParameter(0, 1)
+					.SetParameter(1, 0)
+					.SetMaxResults(1)
+					.UniqueResult();
+				Assert.AreEqual(1, result);
 			}
 		}
 
 		[Test]
 		public void SubselectAddition()
 		{
-			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				s.Save(new Animal { BodyWeight = 12, Description = "Polliwog" });
-				s.Transaction.Commit();
-			}
+			if (!Dialect.SupportsScalarSubSelects)
+				Assert.Ignore("Dialect does not support scalar sub-select.");
 
-			try
-			{
-				using (ISession s = OpenSession())
-				{
-					var result = s.CreateQuery("select count(a) from Animal a where (select count(a2) from Animal a2) + 1 > 1")
-						.UniqueResult();
-					Assert.AreEqual(1, result);
-				}
-			}
-			finally
+			using (var s = OpenSession())
 			{
-				using (ISession s = OpenSession())
-				using (s.BeginTransaction())
-				{
-					s.CreateQuery("delete from Animal").ExecuteUpdate();
-					s.Transaction.Commit();
-				}
+				var result = s.CreateQuery("select count(a) from Animal a where (select count(a2) from Animal a2) + 1 > 1")
+					.UniqueResult();
+				Assert.AreEqual(4, result);
 			}
 		}
 
 		[Test, Ignore("Not fixed yet.")]
 		public void SumShouldReturnDouble()
 		{
 			// NH-1734
-			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				s.Save(new Human{ IntValue = 11, BodyWeight = 12.5f, Description = "Polliwog" });
-				s.Transaction.Commit();
-			}
-
-			using (ISession s = OpenSession())
+			using (var s = OpenSession())
 			{
 				var l = s.CreateQuery("select sum(a.intValue * a.bodyWeight) from Animal a group by a.id").List();
 				Assert.That(l[0], Is.InstanceOf<Double>());
 			}
-
-			using (ISession s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				s.CreateQuery("delete from Animal").ExecuteUpdate();
-				s.Transaction.Commit();
-			}
 		}
 
 		[Test]
@@ -290,47 +197,92 @@ public void InvalidJoinOnProperty()
 		[Test]
 		public void InsertIntoFromSelect_WithSelectClauseParameters()
 		{
+			CheckSupportOfBulkInsertionWithGeneratedId<Animal>();
+
 			using (ISession s = OpenSession())
 			{
 				using (s.BeginTransaction())
 				{
-					// arrange
-					s.Save(new Animal() {Description = "cat1", BodyWeight = 2.1f});
-					s.Save(new Animal() {Description = "cat2", BodyWeight = 2.5f});
-					s.Save(new Animal() {Description = "cat3", BodyWeight = 2.7f});
-
-					// act
 					s.CreateQuery("insert into Animal (description, bodyWeight) select a.description, :weight from Animal a where a.bodyWeight < :weight")
-						.SetParameter<float>("weight", 5.7f).ExecuteUpdate();
+						.SetParameter("weight", 5.7f).ExecuteUpdate();
 
 					// assert
-					Assert.AreEqual(3, s.CreateCriteria<Animal>().SetProjection(Projections.RowCount())
-					                    .Add(Restrictions.Gt("bodyWeight", 5.5f)).UniqueResult<int>());
-
-					s.CreateQuery("delete from Animal").ExecuteUpdate();
+					Assert.AreEqual(3, s
+						.CreateCriteria<Animal>()
+						.SetProjection(Projections.RowCount())
+						.Add(Restrictions.Gt("bodyWeight", 5.5f))
+						.Add(Restrictions.Lt("bodyWeight", 6f))
+						.UniqueResult<int>());
 					s.Transaction.Commit();
 				}
 			}
 		}
 
-
 		[Test]
 		public void UnaryMinusBeforeParenthesesHandledCorrectly()
 		{
-			using (ISession s = OpenSession())
-			using (ITransaction txn = s.BeginTransaction())
+			using (var s = OpenSession())
+			using (var txn = s.BeginTransaction())
 			{
-				s.Save(new Animal {Description = "cat1", BodyWeight = 1});
-
 				// NH-2290: Unary minus before parentheses wasn't handled correctly (this query returned 0).
-				int actual = s.CreateQuery("select -(1+1) from Animal as h")
-					.List<int>().Single();
+				var actual = s.CreateQuery("select -(1+1) from Animal as h")
+					.List<int>().First();
 				Assert.That(actual, Is.EqualTo(-2));
 
 				// This was the workaround, which of course should still work.
-				int actualWorkaround = s.CreateQuery("select -1*(1+1) from Animal as h")
-					.List<int>().Single();
+				var actualWorkaround = s.CreateQuery("select -1*(1+1) from Animal as h")
+					.List<int>().First();
 				Assert.That(actualWorkaround, Is.EqualTo(-2));
+				txn.Commit();
+			}
+		}
+
+		private void CheckSupportOfBulkInsertionWithGeneratedId<T>()
+		{
+			// Make sure the env supports bulk inserts with generated ids...
+			var persister = Sfi.GetEntityPersister(typeof(T).FullName);
+			var generator = persister.IdentifierGenerator;
+			if (!HqlSqlWalker.SupportsIdGenWithBulkInsertion(generator))
+			{
+				Assert.Ignore($"Identifier generator {generator.GetType().Name} for entity {typeof(T).FullName} does not support bulk insertions.");
+			}
+		}
+
+		private Animal _polliwog;
+
+		protected override void OnSetUp()
+		{
+			using (var s = OpenSession())
+			using (var txn = s.BeginTransaction())
+			{
+				_polliwog = new Animal { BodyWeight = 12, Description = "Polliwog" };
+				s.Save(_polliwog);
+
+				s.Save(new Animal { Description = "cat1", BodyWeight = 2.1f });
+				s.Save(new Animal { Description = "cat2", BodyWeight = 2.5f });
+				s.Save(new Animal { Description = "cat3", BodyWeight = 2.7f });
+
+				txn.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			if (!Dialect.SupportsTemporaryTables)
+			{
+				// Give-up usual cleanup due to TPC: cannot perform multi-table deletes using dialect not supporting temp tables
+				DropSchema();
+				CreateSchema();
+				return;
+			}
+
+			using (var s = OpenSession())
+			using (var txn = s.BeginTransaction())
+			{
+				s.CreateQuery("delete from Animal").ExecuteUpdate();
+
+				txn.Commit();
+				s.Close();
 			}
 		}
 	}