Merge branch 'master' of github.com:ServiceStack/ServiceStack.OrmLite

Author: mythz

src/ServiceStack.OrmLite.PostgreSQL.Tests/OrmLiteInsertTests.cs

@@ -113,10 +113,10 @@ public void Can_retrieve_LastInsertId_from_inserted_table()
                 var row2 = new ModelWithIdAndName1() { Name = "B", Id = 5 };
 
                 var row1LastInsertId = db.Insert(row1, selectIdentity: true);
-                Assert.That(db.GetLastSql(), Is.StringEnding(") RETURNING id"));
+                Assert.That(db.GetLastSql(), Is.StringMatching("\\) RETURNING \"?id"));
 
                 var row2LastInsertId = db.Insert(row2, selectIdentity: true);
-                Assert.That(db.GetLastSql(), Is.StringEnding(") RETURNING id"));
+                Assert.That(db.GetLastSql(), Is.StringMatching("\\) RETURNING \"?id"));
 
                 var insertedRow1 = db.SingleById<ModelWithIdAndName1>(row1LastInsertId);
                 var insertedRow2 = db.SingleById<ModelWithIdAndName1>(row2LastInsertId);

src/ServiceStack.OrmLite.SqlServer.Converters/SqlServerHierarchyIdTypeConverter.cs

@@ -16,7 +16,7 @@ public SqlServerHierarchyIdTypeConverter() : base()
 
         public override string ColumnDefinition
         {
-            get { return "HIERARCHYID"; }
+            get { return "hierarchyid"; }
         }
 
         public override DbType DbType