NH-2127 - OutputParamReturningDelegate.ExecuteAndExtract converts return value to correct type

hazzik · hazzik · commit d9ee4696bb0c · 2015-03-03T01:06:49.000+13:00
diff --git a/src/NHibernate/Id/Insert/OutputParamReturningDelegate.cs b/src/NHibernate/Id/Insert/OutputParamReturningDelegate.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Data;
 using NHibernate.Dialect;
 using NHibernate.Engine;
@@ -61,7 +62,7 @@ protected internal override IDbCommand Prepare(SqlCommandInfo insertSQL, ISessio
 		public override object ExecuteAndExtract(IDbCommand insert, ISessionImplementor session)
 		{
 			session.Batcher.ExecuteNonQuery(insert);
-			return ((IDbDataParameter)insert.Parameters[driveGeneratedParamName]).Value;
+			return Convert.ChangeType(((IDbDataParameter) insert.Parameters[driveGeneratedParamName]).Value, Persister.IdentifierType.ReturnedClass);
 		}
 
 		#endregion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Data;`
`2`	`3`	`using NHibernate.Dialect;`
`3`	`4`	`using NHibernate.Engine;`
`@@ -61,7 +62,7 @@ protected internal override IDbCommand Prepare(SqlCommandInfo insertSQL, ISessio`
`61`	`62`	`public override object ExecuteAndExtract(IDbCommand insert, ISessionImplementor session)`
`62`	`63`	`{`
`63`	`64`	`session.Batcher.ExecuteNonQuery(insert);`
`64`		`- return ((IDbDataParameter)insert.Parameters[driveGeneratedParamName]).Value;`
	`65`	`+ return Convert.ChangeType(((IDbDataParameter) insert.Parameters[driveGeneratedParamName]).Value, Persister.IdentifierType.ReturnedClass);`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`#endregion`