NH-4015 - Update Npgsql and enable DTC for it.

fredericDelaporte · fredericDelaporte · commit 2adba0ba92b3 · 2017-06-02T15:51:39.000+02:00
diff --git a/lib/teamcity/postgresql/Mono.Security.dll b/lib/teamcity/postgresql/Mono.Security.dll
diff --git a/lib/teamcity/postgresql/Npgsql.dll b/lib/teamcity/postgresql/Npgsql.dll
diff --git a/lib/teamcity/postgresql/Npgsql.xml b/lib/teamcity/postgresql/Npgsql.xml
diff --git a/lib/teamcity/postgresql/postgresql_installation.txt b/lib/teamcity/postgresql/postgresql_installation.txt
@@ -6,6 +6,9 @@ Installation steps for PostgreSQL for NH TeamCity:
 3.  Leave the port number at the default (5432), and leave the default locale;
 4.  The setup should install PostgreSQL on the machine;
 5.  Untick the option to install stack-builder at the end (it's not required).
+6.  Find the postgresql.conf file. It lies in the directory for the databases files.
+7.  Edit its max_prepared_transactions parameter to a positive integer. 100 by example. (This enables distributed transactions.)
+8.  Restart PostgreSQL server.
 
 Creating the NH user:
 
diff --git a/src/NHibernate.Config.Templates/PostgreSQL.cfg.xml b/src/NHibernate.Config.Templates/PostgreSQL.cfg.xml
@@ -8,7 +8,7 @@ for your own use before compile tests in VisualStudio.
 	<session-factory name="NHibernate.Test">
 		<property name="connection.driver_class">NHibernate.Driver.NpgsqlDriver</property>
 		<property name="connection.connection_string">
-			Server=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;
+			Server=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Enlist=true;
 		</property>
 		<property name="dialect">NHibernate.Dialect.PostgreSQL83Dialect</property>
 	</session-factory>
diff --git a/src/NHibernate.Test/NHSpecificTest/DtcFailures/DtcFailuresFixture.cs b/src/NHibernate.Test/NHSpecificTest/DtcFailures/DtcFailuresFixture.cs
@@ -276,6 +276,9 @@ public void CanDeleteItemInDtc()
 				}
 			}
 
+			// Dodging "latency" due to db still haven't actually committed a distributed tx after scope disposal.
+			Thread.Sleep(100);
+
 			using (var tx = new TransactionScope())
 			{
 				using (ISession s = OpenSession())
@@ -287,6 +290,9 @@ public void CanDeleteItemInDtc()
 					tx.Complete();
 				}
 			}
+
+			// Dodging "latency" due to db still haven't actually committed a distributed tx after scope disposal.
+			Thread.Sleep(100);
 		}
 
 		[Test]
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -95,6 +95,9 @@
       <HintPath>..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq">
diff --git a/src/NHibernate.Test/TestDialects/PostgreSQL83TestDialect.cs b/src/NHibernate.Test/TestDialects/PostgreSQL83TestDialect.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NHibernate.Test.TestDialects
+﻿namespace NHibernate.Test.TestDialects
 {
 	public class PostgreSQL83TestDialect : TestDialect
 	{
@@ -21,13 +16,5 @@ public override bool SupportsNullCharactersInUtfStrings
         {
             get { return false; }
         }
-
-        /// <summary>
-        /// Npgsql's DTC code seems to be somewhat broken as of 2.0.11.
-        /// </summary>
-        public override bool SupportsDistributedTransactions
-        {
-            get { return false; }
-        }
 	}
 }
diff --git a/src/NHibernate.Test/packages.config b/src/NHibernate.Test/packages.config
@@ -6,4 +6,6 @@
   <package id="NUnit" version="3.6.0" targetFramework="net461" />
   <package id="Remotion.Linq" version="1.15.15.0" targetFramework="net461" />
   <package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net461" />
+  <!-- System.Threading.Tasks.Extensions is required for dynamically loaded Npgsql.dll (Postgresql driver) -->
+  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net461" />
 </packages>
diff --git a/src/NHibernate/Driver/NpgsqlDriver.cs b/src/NHibernate/Driver/NpgsqlDriver.cs
@@ -1,7 +1,5 @@
-using System;
 using System.Data;
 using System.Data.Common;
-using System.Linq;
 
 namespace NHibernate.Driver
 {
diff --git a/teamcity.build b/teamcity.build
@@ -140,7 +140,7 @@
 	<target name="setup-teamcity-postgresql">
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.NpgsqlDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.PostgreSQL83Dialect" />
-		<property name="nhibernate.connection.connection_string"	value="Host=localhost;Port=5432;Database=nhibernate;Username=nhibernate;Password=nhibernate" />
+		<property name="nhibernate.connection.connection_string"	value="Host=localhost;Port=5432;Database=nhibernate;Username=nhibernate;Password=nhibernate;Enlist=true" />
 		<copy todir="${bin.dir}">
 			<fileset basedir="${root.dir}/lib/teamcity/postgresql">
 				<include name="*.dll"/>

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,9 @@ public void CanDeleteItemInDtc()`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`
	`279`	`+ // Dodging "latency" due to db still haven't actually committed a distributed tx after scope disposal.`
	`280`	`+ Thread.Sleep(100);`
	`281`	`+`
`279`	`282`	`using (var tx = new TransactionScope())`
`280`	`283`	`{`
`281`	`284`	`using (ISession s = OpenSession())`
`@@ -287,6 +290,9 @@ public void CanDeleteItemInDtc()`
`287`	`290`	`tx.Complete();`
`288`	`291`	`}`
`289`	`292`	`}`
	`293`	`+`
	`294`	`+ // Dodging "latency" due to db still haven't actually committed a distributed tx after scope disposal.`
	`295`	`+ Thread.Sleep(100);`
`290`	`296`	`}`
`291`	`297`
`292`	`298`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-`
`6`		`-namespace NHibernate.Test.TestDialects`
	`1`	`+namespace NHibernate.Test.TestDialects`
`7`	`2`	`{`
`8`	`3`	`public class PostgreSQL83TestDialect : TestDialect`
`9`	`4`	`{`
`@@ -21,13 +16,5 @@ public override bool SupportsNullCharactersInUtfStrings`
`21`	`16`	`{`
`22`	`17`	`get { return false; }`
`23`	`18`	`}`
`24`		`-`
`25`		`- /// <summary>`
`26`		`- /// Npgsql's DTC code seems to be somewhat broken as of 2.0.11.`
`27`		`- /// </summary>`
`28`		`- public override bool SupportsDistributedTransactions`
`29`		`- {`
`30`		`- get { return false; }`
`31`		`- }`
`32`	`19`	`}`
`33`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`		`-using System;`
`2`	`1`	`using System.Data;`
`3`	`2`	`using System.Data.Common;`
`4`		`-using System.Linq;`
`5`	`3`
`6`	`4`	`namespace NHibernate.Driver`
`7`	`5`	`{`