PostgreSQL test support.

SVN: trunk@5409

Author: patearl

ShowBuildMenu.bat

@@ -181,15 +181,17 @@ echo B.  NHibernate Trunk - Firebird (32-bit)
 echo C.  NHibernate Trunk - Firebird (64-bit)
 echo D.  NHibernate Trunk - SQLite (32-bit)
 echo E.  NHibernate Trunk - SQLite (64-bit)
+echo F.  NHibernate Trunk - PostgreSQL
 echo.
 
 if exist %SYSTEMROOT%\System32\choice.exe ( goto teamcity-menu-prompt-choice )
 goto teamcity-menu-prompt-set
 
 :teamcity-menu-prompt-choice
-choice /C:abcde
+choice /C:abcdef
 
 if errorlevel 255 goto end
+if errorlevel 6 goto teamcity-postgresql
 if errorlevel 5 goto teamcity-sqlite64
 if errorlevel 4 goto teamcity-sqlite32
 if errorlevel 3 goto teamcity-firebird64
@@ -198,13 +200,14 @@ if errorlevel 1 goto teamcity-trunk
 if errorlevel 0 goto end
 
 :teamcity-menu-prompt-set
-set /p OPT=[A, B, C, D, E]? 
+set /p OPT=[A, B, C, D, E, F]? 
 
 if /I "%OPT%"=="A" goto teamcity-trunk
 if /I "%OPT%"=="B" goto teamcity-firebird32
 if /I "%OPT%"=="C" goto teamcity-firebird64
 if /I "%OPT%"=="D" goto teamcity-sqlite32
 if /I "%OPT%"=="E" goto teamcity-sqlite64
+if /I "%OPT%"=="F" goto teamcity-postgresql
 goto teamcity-menu-prompt-set
 
 :teamcity-trunk
@@ -227,6 +230,10 @@ goto end
 %NANT% /f:teamcity.build -D:skip.manual=true -D:CCNetLabel=-1 -D:config.teamcity=sqlite64
 goto end
 
+:teamcity-postgresql
+%NANT% /f:teamcity.build -D:skip.manual=true -D:CCNetLabel=-1 -D:config.teamcity=postgresql
+goto end
+
 :end
 popd
 pause

lib/teamcity/postgresql/Mono.Security.dll

@@ -2508,6 +2508,12 @@
     <EmbeddedResource Include="DriverTest\SqlServerCeEntity.hbm.xml" />
     <EmbeddedResource Include="CollectionTest\NullableValueTypeElementMapFixture.hbm.xml" />
     <EmbeddedResource Include="DriverTest\EntityForMs2008.hbm.xml" />
+    <Content Include="DbScripts\PostgreSQL82DialectLinqReadonlyCreateScript.sql">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="DbScripts\PostgreSQL82DialectLinqReadonlyDropScript.sql">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="DynamicEntity\package.html" />
     <EmbeddedResource Include="NHSpecificTest\NH2341\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2228\Mappings.hbm.xml" />

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

@@ -57,6 +57,9 @@
     <Reference Include="FirebirdSql.Data.FirebirdClient">
       <HintPath>..\..\lib\teamcity\firebird\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
+    <Reference Include="Npgsql">
+      <HintPath>..\..\lib\teamcity\postgresql\Npgsql.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>

lib/teamcity/postgresql/Npgsql.dll

@@ -8,13 +8,15 @@
 		<property name="assembly.is-cls-compliant" value="true" />
 		<property name="clover.instrument" value="false" />
 		<copy file="${root.dir}/lib/teamcity/firebird/FirebirdSql.Data.FirebirdClient.dll" todir="${bin.dir}" />
+		<copy file="${root.dir}/lib/teamcity/postgresql/Npgsql.dll" todir="${bin.dir}" />
 		<assemblyfileset id="project.references" basedir="${bin.dir}">
 			<include name="System.dll" />
 			<include name="System.Core.dll" />
 			<include name="System.Data.dll" />
 			<include name="NHibernate.dll" />
 			<include name="nunit.framework.dll" />
 			<include name="FirebirdSql.Data.FirebirdClient.dll" />
+			<include name="Npgsql.dll" />
 		</assemblyfileset>
 	</target>
 	<target name="generate-assemblyinfo" depends="init common.generate-assemblyinfo" />

src/NHibernate.Test/DbScripts/PostgreSQL82DialectLinqReadonlyCreateScript.sql

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
+using Npgsql;
 using NUnit.Framework;
 using FirebirdSql.Data.FirebirdClient;
 
@@ -17,6 +18,7 @@ static DatabaseSetup()
 			SetupMethods.Add("NHibernate.Driver.SqlClientDriver", SetupSqlServer);
 			SetupMethods.Add("NHibernate.Driver.FirebirdClientDriver", SetupFirebird);
 			SetupMethods.Add("NHibernate.Driver.SQLite20Driver", SetupNoop);
+			SetupMethods.Add("NHibernate.Driver.NpgsqlDriver", SetupNpgsql);
 		}
 
 		[Test]
@@ -64,6 +66,32 @@ private static void SetupFirebird(Cfg.Configuration cfg)
 			FbConnection.CreateDatabase("Database=NHibernate.fdb;ServerType=1");
 		}
 
+		private static void SetupNpgsql(Cfg.Configuration cfg)
+		{
+			var connStr = cfg.Properties[Cfg.Environment.ConnectionString];
+
+			using (var conn = new NpgsqlConnection(connStr.Replace("Database=nhibernate", "Database=postgres")))
+			{
+				conn.Open();
+
+				using (var cmd = conn.CreateCommand())
+				{
+					cmd.CommandText = "drop database nhibernate";
+
+					try
+					{
+						cmd.ExecuteNonQuery();
+					}
+					catch (Exception)
+					{
+					}
+
+					cmd.CommandText = "create database nhibernate";
+					cmd.ExecuteNonQuery();
+				}
+			}
+		}
+
 		private static void SetupNoop(Cfg.Configuration cfg)
 		{
 		}

src/NHibernate.Test/DbScripts/PostgreSQL82DialectLinqReadonlyDropScript.sql

@@ -91,6 +91,21 @@
 		<property name="teamcity.last.result" value="${root.dir}/lib/teamcity/sqlite/NHibernate.Test.last-results.xml" />
 	</target>
 
+	<target name="setup-teamcity-postgresql">
+		<property name="nunit-console" value="${tools.dir}/NUnit/nunit-console.exe" />
+		<property name="nunit.found" value="true" />
+		<property name="nhibernate.connection.driver_class"				value="NHibernate.Driver.NpgsqlDriver" />
+		<property name="nhibernate.dialect"												value="NHibernate.Dialect.PostgreSQL82Dialect" />
+		<property name="nhibernate.connection.connection_string"	value="Host=localhost;Port=5433;Database=nhibernate;Username=nhibernate;Password=nhdbpass" />
+		<copy todir="${bin.dir}">
+			<fileset basedir="${root.dir}/lib/teamcity/postgresql">
+				<include name="*.dll"/>
+			</fileset>
+		</copy>
+		<property name="NHibernate.Test.IgnoreFail" value="true" />
+		<property name="teamcity.last.result" value="${root.dir}/lib/teamcity/postgresql/NHibernate.Test.last-results.xml" />
+	</target>
+
 	<script language="C#" prefix="testResult">
 		<references>
 			<include name="System.dll" />