Merge pull request #430 from hazzik/NH-2887

NH-2887 - Allow to use relative URIs with UriType

Author: hazzik

src/NHibernate.Test/TypesTest/UriTypeFixture.cs

@@ -40,6 +40,36 @@ public void ReadWrite()
 			}
 		}
 
+
+		[Test(Description = "NH-2887")]
+		public void ReadWriteRelativeUri()
+		{
+			using (var s = OpenSession())
+			{
+				var entity = new UriClass { Id = 1 };
+				entity.Url = new Uri("/", UriKind.Relative);
+				s.Save(entity);
+				s.Flush();
+			}
+
+			using (var s = OpenSession())
+			{
+				var entity = s.Get<UriClass>(1);
+				Assert.That(entity.Url, Is.Not.Null);
+				Assert.That(entity.Url.OriginalString, Is.EqualTo("/"));
+				entity.Url = new Uri("/2010/10/nhibernate-30-cookbook.html", UriKind.Relative);
+				s.Save(entity);
+				s.Flush();
+			}
+			using (var s = OpenSession())
+			{
+				var entity = s.Get<UriClass>(1);
+				Assert.That(entity.Url.OriginalString, Is.EqualTo("/2010/10/nhibernate-30-cookbook.html"));
+				s.Delete(entity);
+				s.Flush();
+			}
+		}
+
 		[Test]
 		public void InsertNullValue()
 		{

src/NHibernate/Type/UriType.cs

@@ -28,7 +28,7 @@ public override System.Type ReturnedClass
 
 		public object StringToObject(string xml)
 		{
-			return new Uri(xml);
+			return new Uri(xml, UriKind.RelativeOrAbsolute);
 		}
 
 		public override void Set(IDbCommand cmd, object value, int index)