[Nhibernate-commit] SF.net SVN: nhibernate:[3675] trunk/nhibernate/src/NHibernate/Engine/Query/ NativeSQLQueryPlan.cs

[<fab...@us...>]

Revision: 3675
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3675&view=rev
Author:   fabiomaulo
Date:     2008-07-26 05:36:34 +0000 (Sat, 26 Jul 2008)

Log Message:
-----------
Merge r3674 (fix NH-1406)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs

Modified: trunk/nhibernate/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs	2008-07-26 05:34:08 UTC (rev 3674)
+++ trunk/nhibernate/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs	2008-07-26 05:36:34 UTC (rev 3675)
@@ -131,6 +131,8 @@
 				throw new ArgumentException("callable not yet supported for native queries");
 			}
 
+			RowSelection selection = queryParameters.RowSelection;
+
 			int result;
 			try
 			{
@@ -142,6 +144,11 @@
 
 				try
 				{
+					if (selection != null && selection.Timeout != RowSelection.NoValue)
+					{
+						// NH Difference : set Timeout for native query
+						ps.CommandTimeout = selection.Timeout;
+					}
 					int col = 0; // NH Different (initialized to 1 in JAVA)
 					col += BindPositionalParameters(ps, queryParameters, col, session);
 					BindNamedParameters(ps, queryParameters.NamedParameters, col, session);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.