NH-1316 - Fix returing generated identity for PostgreSQL

Fixes #1201

src/NHibernate.Test/Async/NHSpecificTest/NH2204/Fixture.cs → src/NHibernate.Test/Async/NHSpecificTest/NH1316/Fixture.cs

@@ -14,7 +14,7 @@
 using NHibernate.Dialect;
 
 
-namespace NHibernate.Test.NHSpecificTest.NH2204
+namespace NHibernate.Test.NHSpecificTest.NH1316
 {
 	using System.Threading.Tasks;
 	[TestFixture]
@@ -66,7 +66,7 @@ protected override void OnTearDown()
 
 
 		[Test]
-		public async Task KnownFailure_Correct_Id_Returned_When_Using_TriggerAsync()
+		public async Task Correct_Id_Returned_When_Using_TriggerAsync()
 		{
 			//We expected this test to fail - if the problem has been fixed, clean-up the test.
 			var entity1 = new Parent {Name = "Parent1_0"}; // when saved this entity should have the id of 1
@@ -100,13 +100,10 @@ public async Task KnownFailure_Correct_Id_Returned_When_Using_TriggerAsync()
 				await (s.SaveAsync(entity3));
 				await (s.FlushAsync());
 
-				Warn.Unless(
+				Assert.That(
 					entity3.Id,
 					Is.EqualTo(3),
 					"oh uh - it would appear that lastval() is not our friend when a trigger updates other sequences.");
-
-				// now would be a good time to look at the data in the tables and see that they have the IDs as expected
-				// which are not the same as those returned by nhibernate
 			}
 		}
 	}

src/NHibernate.Test/NHSpecificTest/NH2204/Fixture.cs → src/NHibernate.Test/NHSpecificTest/NH1316/Fixture.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Data.Common;
-using NUnit.Framework;
 using NHibernate.Dialect;
+using NUnit.Framework;
 
-
-namespace NHibernate.Test.NHSpecificTest.NH2204
+namespace NHibernate.Test.NHSpecificTest.NH1316
 {
 	[TestFixture]
 	public class Fixture : BugTestCase
@@ -55,7 +53,7 @@ protected override void OnTearDown()
 
 
 		[Test]
-		public void KnownFailure_Correct_Id_Returned_When_Using_Trigger()
+		public void Correct_Id_Returned_When_Using_Trigger()
 		{
 			//We expected this test to fail - if the problem has been fixed, clean-up the test.
 			var entity1 = new Parent {Name = "Parent1_0"}; // when saved this entity should have the id of 1
@@ -89,13 +87,10 @@ public void KnownFailure_Correct_Id_Returned_When_Using_Trigger()
 				s.Save(entity3);
 				s.Flush();
 
-				Warn.Unless(
+				Assert.That(
 					entity3.Id,
 					Is.EqualTo(3),
 					"oh uh - it would appear that lastval() is not our friend when a trigger updates other sequences.");
-
-				// now would be a good time to look at the data in the tables and see that they have the IDs as expected
-				// which are not the same as those returned by nhibernate
 			}
 		}
 	}

src/NHibernate.Test/NHSpecificTest/NH1316/Mappings.hbm.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH1316">
+
+  <class name="Parent">
+    <id name="Id">
+      <generator class="native" />
+
+    </id>
+    <property name="Name" />
+
+  </class>
+
+
+  <class name="ParentHistory" table="parent_history">
+    <id name="HistId">
+      <generator class="native" />
+    </id>
+
+    <property name="HistWhen" />
+    <property name="Id" />
+    <property name="Name" />
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH1316/Model.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH1316
+{
+	public class Parent
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+
+	public class ParentHistory
+	{
+		public virtual int HistId { get; set; }
+		public virtual DateTime HistWhen { get; set; }
+
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+}

src/NHibernate/Dialect/Dialect.cs

@@ -976,7 +976,7 @@ public virtual bool HasDataTypeInIdentityColumn
 		}
 
 		/// <summary> 
-		/// Provided we <see cref="SupportsInsertSelectIdentity"/>, then attch the
+		/// Provided we <see cref="SupportsInsertSelectIdentity"/>, then attach the
 		/// "select identity" clause to the  insert statement.
 		/// </summary>
 		/// <param name="insertString">The insert command </param>
@@ -990,6 +990,22 @@ public virtual SqlString AppendIdentitySelectToInsert(SqlString insertString)
 			return insertString;
 		}
 
+		/// <summary> 
+		/// Provided we <see cref="SupportsInsertSelectIdentity"/>, then attach the
+		/// "select identity" clause to the  insert statement.
+		/// </summary>
+		/// <param name="insertString">The insert command </param>
+		/// <param name="identifierColumnName">The identifier name</param>
+		/// <returns> 
+		/// The insert command with any necessary identity select clause attached.
+		/// Note, if <see cref="SupportsInsertSelectIdentity"/> == false then
+		/// the insert-string should be returned without modification.
+		/// </returns>
+		public virtual SqlString AppendIdentitySelectToInsert(SqlString insertString, string identifierColumnName)
+		{
+			return AppendIdentitySelectToInsert(insertString);
+		}
+
 		/// <summary>
 		/// Get the select command to use to retrieve the last generated IDENTITY
 		/// value for a particular table.

src/NHibernate/Dialect/PostgreSQL81Dialect.cs

@@ -109,6 +109,11 @@ public override SqlString AppendIdentitySelectToInsert(SqlString insertSql)
 			return insertSql.Append("; " + IdentitySelectString);
 		}
 
+		public override SqlString AppendIdentitySelectToInsert(SqlString insertString, string identifierColumnName)
+		{
+			return insertString.Append(" returning ").Append(identifierColumnName);
+		}
+
 		public override bool SupportsInsertSelectIdentity
 		{
 			get { return true; }

src/NHibernate/Dialect/PostgreSQLDialect.cs

@@ -175,7 +175,7 @@ public override string GetDropSequenceString(string sequenceName)
 
 		public override SqlString AddIdentifierOutParameterToInsert(SqlString insertString, string identifierColumnName, string parameterName)
 		{
-			return insertString.Append(" returning " + identifierColumnName);
+			return insertString.Append(" returning ").Append(identifierColumnName);
 		}
 
 		public override InsertGeneratedIdentifierRetrievalMethod InsertGeneratedIdentifierRetrievalMethod

src/NHibernate/Id/IdentityGenerator.cs

@@ -60,7 +60,7 @@ public InsertSelectDelegate(IPostInsertIdentityPersister persister, ISessionFact
 
 			public override IdentifierGeneratingInsert PrepareIdentifierGeneratingInsert()
 			{
-				InsertSelectIdentityInsert insert = new InsertSelectIdentityInsert(factory);
+				var insert = new InsertSelectIdentityInsert(factory, persister.RootTableKeyColumnNames[0]);
 				insert.AddIdentityColumn(persister.RootTableKeyColumnNames[0]);
 				return insert;
 			}

src/NHibernate/Id/Insert/InsertSelectIdentityInsert.cs

@@ -1,3 +1,4 @@
+using System;
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
 
@@ -10,14 +11,24 @@ namespace NHibernate.Id.Insert
 	/// </summary>
 	public class InsertSelectIdentityInsert : IdentifierGeneratingInsert
 	{
+		private readonly string _identifierColumnName;
+
+		//Since v5.2
+		[Obsolete("Please use constructor accepting identifierColumnName parameter.")]
 		public InsertSelectIdentityInsert(ISessionFactoryImplementor factory)
 			: base(factory)
 		{
 		}
 
+		public InsertSelectIdentityInsert(ISessionFactoryImplementor factory, string identifierColumnName)
+			: base(factory)
+		{
+			_identifierColumnName = identifierColumnName;
+		}
+
 		public override SqlString ToSqlString()
 		{
-			return Dialect.AppendIdentitySelectToInsert(base.ToSqlString());
+			return Dialect.AppendIdentitySelectToInsert(base.ToSqlString(), _identifierColumnName);
 		}
 	}
 }

src/NHibernate/Id/Insert/ReturningIdentifierInsert.cs

@@ -15,8 +15,8 @@ public class ReturningIdentifierInsert : NoCommentsInsert
 		private readonly string identifierColumnName;
 		private readonly string returnParameterName;
 
-		public ReturningIdentifierInsert(ISessionFactoryImplementor factory, string identifierColumnName,
-		                                 string returnParameterName) : base(factory)
+		public ReturningIdentifierInsert(ISessionFactoryImplementor factory, string identifierColumnName, string returnParameterName)
+			: base(factory)
 		{
 			this.returnParameterName = returnParameterName;
 			this.identifierColumnName = identifierColumnName;