NH-3996 - Add new PostgreSql83 Dialect which supports XML type

hazzik · hazzik · commit 0d071ffaf2ea · 2017-04-28T17:34:06.000+12:00
diff --git a/doc/reference/modules/configuration.xml b/doc/reference/modules/configuration.xml
@@ -675,6 +675,13 @@ ISession session = sessions.OpenSession(conn);
                                 available in PostgreSQL 8.2.
                             </entry>
                         </row>
+                        <row>
+                            <entry>PostgreSQL 8.3</entry> 
+                            <entry><literal>NHibernate.Dialect.PostgreSQL83Dialect</literal></entry>
+                            <entry>
+                                This dialect supports <literal>XML</literal> type.
+                            </entry>
+                        </row>
                         <row>
                             <entry>MySQL 3 or 4</entry> 
                             <entry><literal>NHibernate.Dialect.MySQLDialect</literal></entry>
diff --git a/src/NHibernate.Config.Templates/PostgreSQL.cfg.xml b/src/NHibernate.Config.Templates/PostgreSQL.cfg.xml
@@ -10,6 +10,6 @@ for your own use before compile tests in VisualStudio.
 		<property name="connection.connection_string">
 			Server=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;
 		</property>
-		<property name="dialect">NHibernate.Dialect.PostgreSQL82Dialect</property>
+		<property name="dialect">NHibernate.Dialect.PostgreSQL83Dialect</property>
 	</session-factory>
-</hibernate-configuration>
+</hibernate-configuration>
diff --git a/src/NHibernate.Test/DbScripts/PostgreSQL83DialectLinqReadonlyCreateScript.sql b/src/NHibernate.Test/DbScripts/PostgreSQL83DialectLinqReadonlyCreateScript.sql
diff --git a/src/NHibernate.Test/DbScripts/PostgreSQL83DialectLinqReadonlyDropScript.sql b/src/NHibernate.Test/DbScripts/PostgreSQL83DialectLinqReadonlyDropScript.sql
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3850/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3850/Fixture.cs
@@ -9,6 +9,7 @@
 using NHibernate.Dialect;
 using NHibernate.Driver;
 using NHibernate.Linq;
+using NHibernate.SqlTypes;
 using NHibernate.Util;
 using NUnit.Framework;
 
@@ -22,20 +23,10 @@ public class Fixture : BugTestCase
 		private const int _totalEntityCount = 10;
 		private readonly DateTime _testDate = DateTime.Now;
 		private readonly DateTimeOffset _testDateWithOffset = DateTimeOffset.Now;
-		
+
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
-			var typeNames = (TypeNames)typeof(Dialect.Dialect).GetField("_typeNames", ReflectHelper.AnyVisibilityInstance).GetValue(Dialect);
-			try
-			{
-				typeNames.Get(DbType.DateTimeOffset);
-			}
-			catch (ArgumentException)
-			{
-				return false;
-			}
-
-			return true;
+			return TestDialect.SupportsSqlType(new SqlType(DbType.DateTimeOffset));
 		}
 
 		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -1435,7 +1435,7 @@
     <Compile Include="TestCaseMappingByCode.cs" />
     <Compile Include="TestDialect.cs" />
     <Compile Include="TestDialects\MsSql2008TestDialect.cs" />
-    <Compile Include="TestDialects\PostgreSQL82TestDialect.cs" />
+    <Compile Include="TestDialects\PostgreSQL83TestDialect.cs" />
     <Compile Include="TestDialects\SQLiteTestDialect.cs" />
     <Compile Include="Tools\hbm2ddl\SchemaExportTests\ExportToFileFixture.cs" />
     <Compile Include="TransformTests\ImplementationOfEqualityTests.cs" />
@@ -3518,10 +3518,10 @@
     <Content Include="DbScripts\MsSql2012DialectLinqReadonlyDropScript.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="DbScripts\PostgreSQL82DialectLinqReadonlyCreateScript.sql">
+    <Content Include="DbScripts\PostgreSQL83DialectLinqReadonlyCreateScript.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="DbScripts\PostgreSQL82DialectLinqReadonlyDropScript.sql">
+    <Content Include="DbScripts\PostgreSQL83DialectLinqReadonlyDropScript.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="DynamicEntity\package.html" />
diff --git a/src/NHibernate.Test/TestDialects/PostgreSQL83TestDialect.cs b/src/NHibernate.Test/TestDialects/PostgreSQL83TestDialect.cs
@@ -5,9 +5,9 @@
 
 namespace NHibernate.Test.TestDialects
 {
-	public class PostgreSQL82TestDialect : TestDialect
+	public class PostgreSQL83TestDialect : TestDialect
 	{
-        public PostgreSQL82TestDialect(Dialect.Dialect dialect)
+        public PostgreSQL83TestDialect(Dialect.Dialect dialect)
             : base(dialect)
         {
         }
diff --git a/src/NHibernate/Dialect/PostgreSQL83Dialect.cs b/src/NHibernate/Dialect/PostgreSQL83Dialect.cs
@@ -0,0 +1,19 @@
+using System.Data;
+
+namespace NHibernate.Dialect
+{
+	/// <summary>
+	/// An SQL dialect for PostgreSQL 8.3 and above.
+	/// </summary>
+	/// <remarks>
+	/// PostgreSQL 8.3 supports xml type
+	/// </remarks>
+	public class PostgreSQL83Dialect : PostgreSQL82Dialect
+	{
+		public PostgreSQL83Dialect()
+		{
+			//https://www.postgresql.org/docs/8.3/static/datatype-xml.html
+			RegisterColumnType(DbType.Xml, "xml");
+		}
+	}
+}
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
@@ -144,6 +144,7 @@
     <Compile Include="Connection\DriverConnectionProvider.cs" />
     <Compile Include="Connection\IConnectionProvider.cs" />
     <Compile Include="Connection\UserSuppliedConnectionProvider.cs" />
+    <Compile Include="Dialect\PostgreSQL83Dialect.cs" />
     <Compile Include="Tool\hbm2ddl\IDatabaseMetadata.cs" />
     <Compile Include="Util\DelegateHelper.cs" />
     <Compile Include="Dialect\BitwiseFunctionOperation.cs" />
diff --git a/teamcity.build b/teamcity.build
@@ -139,7 +139,7 @@
 
 	<target name="setup-teamcity-postgresql">
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.NpgsqlDriver" />
-		<property name="nhibernate.dialect"							value="NHibernate.Dialect.PostgreSQL82Dialect" />
+		<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" />
 		<copy todir="${bin.dir}">
 			<fileset basedir="${root.dir}/lib/teamcity/postgresql">

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`namespace NHibernate.Test.TestDialects`
`7`	`7`	`{`
`8`		`- public class PostgreSQL82TestDialect : TestDialect`
	`8`	`+ public class PostgreSQL83TestDialect : TestDialect`
`9`	`9`	`{`
`10`		`- public PostgreSQL82TestDialect(Dialect.Dialect dialect)`
	`10`	`+ public PostgreSQL83TestDialect(Dialect.Dialect dialect)`
`11`	`11`	`: base(dialect)`
`12`	`12`	`{`
`13`	`13`	`}`