NH-3488 - fix dialect dependent failures, first round, to be squashed.

Author: fredericDelaporte

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

@@ -12,11 +12,6 @@ namespace NHibernate.Test.Hql.Ast
 	[TestFixture]
 	public class BulkManipulation : BaseFixture
 	{
-		public ISession OpenNewSession()
-		{
-			return OpenSession();
-		}
-
 		#region Non-exists
 
 		[Test]
@@ -932,6 +927,11 @@ public void DeleteOnDiscriminatorSubclass()
 		[Test]
 		public void DeleteOnJoinedSubclass()
 		{
+			if (!Dialect.SupportsTemporaryTables)
+			{
+				Assert.Ignore("Cannot perform multi-table deletes using dialect not supporting temp tables.");
+			}
+
 			var data = new TestData(this);
 			data.Prepare();
 
@@ -956,6 +956,11 @@ public void DeleteOnJoinedSubclass()
 		[Test]
 		public void DeleteOnMappedJoin()
 		{
+			if (!Dialect.SupportsTemporaryTables)
+			{
+				Assert.Ignore("Cannot perform multi-table deletes using dialect not supporting temp tables.");
+			}
+
 			var data = new TestData(this);
 			data.Prepare();
 
@@ -975,6 +980,11 @@ public void DeleteOnMappedJoin()
 		[Test]
 		public void DeleteUnionSubclassAbstractRoot()
 		{
+			if (!Dialect.SupportsTemporaryTables)
+			{
+				Assert.Ignore("Cannot perform multi-table deletes using dialect not supporting temp tables.");
+			}
+
 			var data = new TestData(this);
 			data.Prepare();
 
@@ -997,6 +1007,11 @@ public void DeleteUnionSubclassAbstractRoot()
 		[Test]
 		public void DeleteUnionSubclassConcreteSubclass()
 		{
+			if (!Dialect.SupportsTemporaryTables)
+			{
+				Assert.Ignore("Cannot perform multi-table deletes using dialect not supporting temp tables.");
+			}
+
 			var data = new TestData(this);
 			data.Prepare();
 
@@ -1040,6 +1055,11 @@ public void DeleteUnionSubclassLeafSubclass()
 		[Test]
 		public void DeleteRestrictedOnManyToOne()
 		{
+			if (!Dialect.SupportsTemporaryTables)
+			{
+				Assert.Ignore("Cannot perform multi-table deletes using dialect not supporting temp tables.");
+			}
+
 			var data = new TestData(this);
 			data.Prepare();
 
@@ -1089,7 +1109,7 @@ public TestData(BulkManipulation tc)
 
 			public void Prepare()
 			{
-				ISession s = tc.OpenNewSession();
+				ISession s = tc.OpenSession();
 				ITransaction txn = s.BeginTransaction();
 
 				Polliwog = new Animal {BodyWeight = 12, Description = "Polliwog"};
@@ -1152,19 +1172,27 @@ public void Prepare()
 
 			public void Cleanup()
 			{
-				ISession s = tc.OpenNewSession();
-				ITransaction txn = s.BeginTransaction();
-
-				// workaround awesome HSQLDB "feature"
-				s.CreateQuery("delete from Animal where mother is not null or father is not null").ExecuteUpdate();
-				s.CreateQuery("delete from Animal").ExecuteUpdate();
-				s.CreateQuery("delete from Zoo").ExecuteUpdate();
-				s.CreateQuery("delete from Joiner").ExecuteUpdate();
-				s.CreateQuery("delete from Vehicle").ExecuteUpdate();
-				s.CreateQuery("delete from BooleanLiteralEntity").ExecuteUpdate();
-
-				txn.Commit();
-				s.Close();
+				if (!tc.Dialect.SupportsTemporaryTables)
+				{
+					// Give-up usual cleanup due to TPC: cannot perform multi-table deletes using dialect not supporting temp tables
+					tc.DropSchema();
+					tc.CreateSchema();
+					return;
+				}
+				using (var s = tc.OpenSession())
+				using (var txn = s.BeginTransaction())
+				{
+					// workaround awesome HSQLDB "feature"
+					s.CreateQuery("delete from Animal where mother is not null or father is not null").ExecuteUpdate();
+					s.CreateQuery("delete from Animal").ExecuteUpdate();
+					s.CreateQuery("delete from Zoo").ExecuteUpdate();
+					s.CreateQuery("delete from Joiner").ExecuteUpdate();
+					s.CreateQuery("delete from Vehicle").ExecuteUpdate();
+					s.CreateQuery("delete from BooleanLiteralEntity").ExecuteUpdate();
+
+					txn.Commit();
+					s.Close();
+				}
 			}
 		}
 	}

src/NHibernate.Test/NHSpecificTest/NH3488/Domain/EntityWithCrazyCompositeKey.hbm.xml

@@ -3,15 +3,16 @@
 	assembly="NHibernate.Test"
 	namespace="NHibernate.Test.NHSpecificTest.NH3488.Domain">
 
-	<class name="EntityWithCrazyCompositeKey">
-		<composite-id name="Id" class="CrazyCompositeKey">
-			<key-property name="Id" column="id"/>
-			<key-property name="OtherId" column="other_id"/>
-		</composite-id>
-		<property name="Name"/>
+  <class name="EntityWithCrazyCompositeKey">
+    <composite-id name="Id" class="CrazyCompositeKey">
+      <key-property name="Id" column="id"/>
+      <key-property name="OtherId" column="other_id"/>
+    </composite-id>
+    <property name="Name"/>
   </class>
-
-  <class name="EntityReferencingEntityWithCrazyCompositeKey">
+  
+  <!-- Oracle and Firebird does not allow names longer than 30 characters.-->
+  <class name="EntityReferencingEntityWithCrazyCompositeKey" table="EntRefEntWithCrazyCompKey">
     <id type="long" name="Id">
       <generator class="native" />
     </id>