Support an arbitrary length for CultureInfoType

doc/reference/modules/basic_mapping.xml

@@ -3919,7 +3919,8 @@
                         <row>
                             <entry><literal>CultureInfo</literal></entry>
                             <entry><literal>System.Globalization.CultureInfo</literal></entry>
-                            <entry><literal>DbType.String</literal> - 5 chars for culture</entry>
+                            <entry><literal>DbType.String</literal> - 5 chars for culture by default;
+                              can be modified by the <literal>length</literal> mapping attribute.</entry>
                             <entry>Default when no <literal>type</literal> attribute specified.</entry>
                         </row>
                         <row>

src/NHibernate.Test/Async/TypesTest/AbstractDateTimeTypeFixture.cs

@@ -69,14 +69,10 @@ protected override void OnSetUp()
 
 		protected override void OnTearDown()
 		{
-			base.OnTearDown();
-
-			using (var s = OpenSession())
-			using (var t = s.BeginTransaction())
-			{
-				s.CreateQuery("delete from DateTimeClass").ExecuteUpdate();
-				t.Commit();
-			}
+			using var s = OpenSession();
+			using var t = s.BeginTransaction();
+			s.CreateQuery("delete from DateTimeClass").ExecuteUpdate();
+			t.Commit();
 		}
 
 		protected override void DropSchema()

src/NHibernate.Test/Async/TypesTest/CultureInfoTypeFixture.cs

@@ -0,0 +1,105 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Globalization;
+using NHibernate.Dialect;
+using NHibernate.Type;
+using NUnit.Framework;
+
+namespace NHibernate.Test.TypesTest
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class CultureInfoTypeFixtureAsync : TypeFixtureBase
+	{
+		protected override string TypeName => "CultureInfo";
+
+		[Test]
+		public async Task ReadWriteBasicCultureAsync()
+		{
+			Guid id;
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = new CultureInfoClass { BasicCulture = CultureInfo.GetCultureInfo("en-US") };
+				await (s.SaveAsync(entity));
+				id = entity.Id;
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = await (s.GetAsync<CultureInfoClass>(id));
+				Assert.That(entity.BasicCulture, Is.Not.Null);
+				Assert.That(entity.BasicCulture.Name, Is.EqualTo("en-US"));
+				Assert.That(entity.BasicCulture, Is.EqualTo(CultureInfo.GetCultureInfo("en-US")));
+				entity.BasicCulture = CultureInfo.GetCultureInfo("fr-BE");
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = await (s.GetAsync<CultureInfoClass>(id));
+				Assert.That(entity.BasicCulture.Name, Is.EqualTo("fr-BE"));
+				Assert.That(entity.BasicCulture, Is.EqualTo(CultureInfo.GetCultureInfo("fr-BE")));
+				entity.BasicCulture = null;
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = await (s.GetAsync<CultureInfoClass>(id));
+				Assert.That(entity.BasicCulture, Is.Null);
+				await (t.CommitAsync());
+			}
+		}
+
+		[Test]
+		public async Task ReadWriteExtendedCultureAsync()
+		{
+			Guid id;
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = new CultureInfoClass { ExtendedCulture = CultureInfo.GetCultureInfo("en-US-posix") };
+				await (s.SaveAsync(entity));
+				id = entity.Id;
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = await (s.GetAsync<CultureInfoClass>(id));
+				Assert.That(entity.ExtendedCulture, Is.Not.Null);
+				// Under Windows, it is named en-US-posix, but en-US-POSIX under Linux.
+				Assert.That(entity.ExtendedCulture.Name, Is.EqualTo("en-US-posix").IgnoreCase);
+				Assert.That(entity.ExtendedCulture, Is.EqualTo(CultureInfo.GetCultureInfo("en-US-posix")));
+				await (t.CommitAsync());
+			}
+		}
+
+		[Test]
+		public async Task WriteTooLongCultureAsync()
+		{
+			if (Dialect is SQLiteDialect)
+				Assert.Ignore("SQLite has no length limited string type.");
+			using var s = OpenSession();
+			using var t = s.BeginTransaction();
+			var entity = new CultureInfoClass { BasicCulture = CultureInfo.GetCultureInfo("en-US-posix") };
+			await (s.SaveAsync(entity));
+			Assert.That(t.Commit, Throws.Exception);
+		}
+	}
+}

src/NHibernate.Test/Async/TypesTest/DateTimeOffsetTypeFixture.cs

@@ -69,18 +69,6 @@ protected override void OnSetUp()
 			}
 		}
 
-		protected override void OnTearDown()
-		{
-			base.OnTearDown();
-
-			using (var s = OpenSession())
-			using (var t = s.BeginTransaction())
-			{
-				s.CreateQuery("delete from DateTimeOffsetClass").ExecuteUpdate();
-				t.Commit();
-			}
-		}
-
 		protected override void DropSchema()
 		{
 			(Sfi.ConnectionProvider.Driver as ClientDriverWithParamsStats)?.CleanUp();
@@ -354,6 +342,14 @@ public class DateTimeOffsetTypeWithScaleFixtureAsync : DateTimeOffsetTypeFixture
 		// The timestamp rounding in seeding does not account scale.
 		protected override bool RevisionCheck => false;
 
+		protected override void OnTearDown()
+		{
+			using var s = OpenSession();
+			using var t = s.BeginTransaction();
+			s.CreateQuery("delete DateTimeOffsetClass").ExecuteUpdate();
+			t.Commit();
+		}
+
 		[Test]
 		public async Task LowerDigitsAreIgnoredAsync()
 		{

src/NHibernate.Test/Async/TypesTest/DecimalTypeFixture.cs

@@ -54,18 +54,6 @@ protected override void OnSetUp()
 			}
 		}
 
-		protected override void OnTearDown()
-		{
-			base.OnTearDown();
-
-			using (var s = OpenSession())
-			using (var t = s.BeginTransaction())
-			{
-				s.CreateQuery("delete from DecimalClass").ExecuteUpdate();
-				t.Commit();
-			}
-		}
-
 		[Test]
 		public async Task ReadWriteAsync()
 		{

src/NHibernate.Test/Async/TypesTest/EnumStringTypeFixture.cs

@@ -40,14 +40,6 @@ protected override void OnSetUp()
 			s.Close();
 		}
 
-		protected override void OnTearDown()
-		{
-			ISession s = OpenSession();
-			s.Delete("from EnumStringClass");
-			s.Flush();
-			s.Close();
-		}
-
 		[Test]
 		public async Task ReadFromLoadAsync()
 		{

src/NHibernate.Test/Async/TypesTest/GenericEnumStringTypeFixture.cs

@@ -42,14 +42,6 @@ protected override void OnSetUp()
 			s.Close();
 		}
 
-		protected override void OnTearDown()
-		{
-			ISession s = OpenSession();
-			s.Delete("from GenericEnumStringClass");
-			s.Flush();
-			s.Close();
-		}
-
 		[Test]
 		public async Task ReadFromLoadAsync()
 		{

src/NHibernate.Test/Async/TypesTest/StringTypeFixture.cs

@@ -26,14 +26,6 @@ protected override string TypeName
 			get { return "String"; }
 		}
 
-		protected override void OnTearDown()
-		{
-			using (var s = OpenSession())
-			{
-				s.CreateQuery("delete from StringClass").ExecuteUpdate();
-			}
-		}
-
 		[Test]
 		public async Task InsertNullValueAsync()
 		{

src/NHibernate.Test/Async/TypesTest/TimeAsTimeSpanTypeFixture.cs

@@ -50,18 +50,6 @@ protected override string TypeName
 			get { return "TimeAsTimeSpan"; }
 		}
 
-		protected override void OnTearDown()
-		{
-			base.OnTearDown();
-
-			using (var s = OpenSession())
-			using (var tx = s.BeginTransaction())
-			{
-				s.CreateQuery("delete from TimeAsTimeSpanClass").ExecuteUpdate();
-				tx.Commit();
-			}
-		}
-
 		[Test]
 		public async Task SavingAndRetrievingAsync()
 		{

src/NHibernate.Test/TypesTest/AbstractDateTimeTypeFixture.cs

@@ -57,14 +57,10 @@ protected override void OnSetUp()
 
 		protected override void OnTearDown()
 		{
-			base.OnTearDown();
-
-			using (var s = OpenSession())
-			using (var t = s.BeginTransaction())
-			{
-				s.CreateQuery("delete from DateTimeClass").ExecuteUpdate();
-				t.Commit();
-			}
+			using var s = OpenSession();
+			using var t = s.BeginTransaction();
+			s.CreateQuery("delete from DateTimeClass").ExecuteUpdate();
+			t.Commit();
 		}
 
 		protected override void DropSchema()

src/NHibernate.Test/TypesTest/CultureInfoClass.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Globalization;
+
+namespace NHibernate.Test.TypesTest
+{
+	public class CultureInfoClass
+	{
+		public Guid Id { get; set; }
+		public CultureInfo BasicCulture { get; set; }
+		public CultureInfo ExtendedCulture { get; set; }
+	}
+}

src/NHibernate.Test/TypesTest/CultureInfoClass.hbm.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" default-lazy="false">
+  <class name="NHibernate.Test.TypesTest.CultureInfoClass, NHibernate.Test" table="nh_ci">
+    <id name="Id" generator="guid.comb" />
+
+    <property name="BasicCulture" />
+    <property name="ExtendedCulture" length="11" />
+  </class>
+</hibernate-mapping>

src/NHibernate.Test/TypesTest/CultureInfoTypeFixture.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Globalization;
+using NHibernate.Dialect;
+using NHibernate.Type;
+using NUnit.Framework;
+
+namespace NHibernate.Test.TypesTest
+{
+	[TestFixture]
+	public class CultureInfoTypeFixture : TypeFixtureBase
+	{
+		protected override string TypeName => "CultureInfo";
+
+		[Test]
+		public void ReadWriteBasicCulture()
+		{
+			Guid id;
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = new CultureInfoClass { BasicCulture = CultureInfo.GetCultureInfo("en-US") };
+				s.Save(entity);
+				id = entity.Id;
+				t.Commit();
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = s.Get<CultureInfoClass>(id);
+				Assert.That(entity.BasicCulture, Is.Not.Null);
+				Assert.That(entity.BasicCulture.Name, Is.EqualTo("en-US"));
+				Assert.That(entity.BasicCulture, Is.EqualTo(CultureInfo.GetCultureInfo("en-US")));
+				entity.BasicCulture = CultureInfo.GetCultureInfo("fr-BE");
+				t.Commit();
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = s.Get<CultureInfoClass>(id);
+				Assert.That(entity.BasicCulture.Name, Is.EqualTo("fr-BE"));
+				Assert.That(entity.BasicCulture, Is.EqualTo(CultureInfo.GetCultureInfo("fr-BE")));
+				entity.BasicCulture = null;
+				t.Commit();
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = s.Get<CultureInfoClass>(id);
+				Assert.That(entity.BasicCulture, Is.Null);
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void ReadWriteExtendedCulture()
+		{
+			Guid id;
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = new CultureInfoClass { ExtendedCulture = CultureInfo.GetCultureInfo("en-US-posix") };
+				s.Save(entity);
+				id = entity.Id;
+				t.Commit();
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = s.Get<CultureInfoClass>(id);
+				Assert.That(entity.ExtendedCulture, Is.Not.Null);
+				// Under Windows, it is named en-US-posix, but en-US-POSIX under Linux.
+				Assert.That(entity.ExtendedCulture.Name, Is.EqualTo("en-US-posix").IgnoreCase);
+				Assert.That(entity.ExtendedCulture, Is.EqualTo(CultureInfo.GetCultureInfo("en-US-posix")));
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void WriteTooLongCulture()
+		{
+			if (Dialect is SQLiteDialect)
+				Assert.Ignore("SQLite has no length limited string type.");
+			using var s = OpenSession();
+			using var t = s.BeginTransaction();
+			var entity = new CultureInfoClass { BasicCulture = CultureInfo.GetCultureInfo("en-US-posix") };
+			s.Save(entity);
+			Assert.That(t.Commit, Throws.Exception);
+		}
+
+		[Test]
+		public void AutoDiscoverFromNetType()
+		{
+			// integration test to be 100% sure
+			var propertyType = Sfi.GetEntityPersister(typeof(CultureInfoClass).FullName).GetPropertyType(nameof(CultureInfoClass.BasicCulture));
+			Assert.That(propertyType, Is.InstanceOf<CultureInfoType>());
+		}
+	}
+}