[Nhibernate-commit] SF.net SVN: nhibernate:[5918] trunk/nhibernate/src/NHibernate/Loader

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

Revision: 5918
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5918&view=rev
Author:   fabiomaulo
Date:     2011-06-13 12:48:08 +0000 (Mon, 13 Jun 2011)

Log Message:
-----------
Refactoring: DRY CriteriaLoader

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs
    trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs

Modified: trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs	2011-06-13 12:31:25 UTC (rev 5917)
+++ trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs	2011-06-13 12:48:08 UTC (rev 5918)
@@ -187,12 +187,11 @@
 
 		public override ISqlCommand CreateSqlCommand(QueryParameters queryParameters, ISessionImplementor session)
 		{
-			// NOTE: repeated code PrepareQueryCommand
 			// A distinct-copy of parameter specifications collected during query construction
 			var parameterSpecs = new HashSet<IParameterSpecification>(translator.CollectedParameterSpecifications);
 			SqlString sqlString = SqlString.Copy();
 
-			// dynamic-filter parameters: during the HQL->SQL parsing, filters can be added as SQL_TOKEN/string and the SqlGenerator will not find it
+			// dynamic-filter parameters: during the Criteria parsing, filters can be added as string.
 			sqlString = ExpandDynamicFilterParameters(sqlString, parameterSpecs, session);
 			AdjustQueryParametersForSubSelectFetching(sqlString, parameterSpecs, session, queryParameters); // NOTE: see TODO below
 
@@ -202,7 +201,7 @@
 			// The PreprocessSQL method can modify the SqlString but should never add parameters (or we have to override it)
 			sqlString = PreprocessSQL(sqlString, queryParameters, session.Factory.Dialect);
 
-			return new SqlCommand.SqlCommandImpl(sqlString, parameterSpecs, queryParameters, session.Factory);
+			return new SqlCommandImpl(sqlString, parameterSpecs, queryParameters, session.Factory);
 		}
 
 		/// <summary>
@@ -219,29 +218,14 @@
 		/// <returns>A CommandWrapper wrapping an IDbCommand that is ready to be executed.</returns>
 		protected internal override IDbCommand PrepareQueryCommand(QueryParameters queryParameters, bool scroll, ISessionImplementor session)
 		{
-			// NOTE: repeated code CreateSqlCommandInfo (here we are reusing some other variables)
-			// A distinct-copy of parameter specifications collected during query construction
-			var parameterSpecs = new HashSet<IParameterSpecification>(translator.CollectedParameterSpecifications);
-			SqlString sqlString = SqlString.Copy();
+			var sqlCommand = (SqlCommandImpl)CreateSqlCommand(queryParameters, session);
+			var parameterSpecs = sqlCommand.Specifications;
+			var sqlString = sqlCommand.Query;
+			var sqlQueryParametersList = sqlCommand.SqlQueryParametersList;
 
-			// dynamic-filter parameters: during the HQL->SQL parsing, filters can be added as SQL_TOKEN/string and the SqlGenerator will not find it
-			sqlString = ExpandDynamicFilterParameters(sqlString, parameterSpecs, session);
-			AdjustQueryParametersForSubSelectFetching(sqlString, parameterSpecs, session, queryParameters); // NOTE: see TODO below
-
-			sqlString = AddLimitsParametersIfNeeded(sqlString, parameterSpecs, queryParameters, session);
-			// TODO: for sub-select fetching we have to try to assign the QueryParameter.ProcessedSQL here (with limits) but only after use IParameterSpecification for any kind of queries
-
-			// The PreprocessSQL method can modify the SqlString but should never add parameters (or we have to override it)
-			sqlString = PreprocessSQL(sqlString, queryParameters, session.Factory.Dialect);
-
-			// After the last modification to the SqlString we can collect all parameters.
-			var sqlQueryParametersList = sqlString.GetParameters().ToList();
-			SqlType[] parameterTypes = parameterSpecs.GetQueryParameterTypes(sqlQueryParametersList, session.Factory);
-
 			parameterSpecs.SetQueryParameterLocations(sqlQueryParametersList, session.Factory);
 
-			IDbCommand command = session.Batcher.PrepareQueryCommand(CommandType.Text, sqlString, parameterTypes);
-
+			IDbCommand command = session.Batcher.PrepareQueryCommand(CommandType.Text, sqlString, sqlCommand.ParameterTypes);
 			try
 			{
 				RowSelection selection = queryParameters.RowSelection;
@@ -250,7 +234,7 @@
 					command.CommandTimeout = selection.Timeout;
 				}
 
-				BindParametersValues(command, sqlQueryParametersList, parameterSpecs, queryParameters, session);
+				sqlCommand.Bind(command, sqlQueryParametersList, 0, session);
 
 				session.Batcher.ExpandQueryParameters(command, sqlString);
 			}
@@ -418,21 +402,5 @@
 			}
 			return sqlString;
 		}
-
-		/// <summary>
-		/// Bind all parameters values.
-		/// </summary>
-		/// <param name="command">The command where bind each value.</param>
-		/// <param name="sqlQueryParametersList">The list of Sql query parameter in the exact sequence they are present in the query.</param>
-		/// <param name="parameterSpecs">All parameter-specifications collected during query construction.</param>
-		/// <param name="queryParameters">The encapsulation of the parameter values to be bound.</param>
-		/// <param name="session">The session from where execute the query.</param>
-		private void BindParametersValues(IDbCommand command, IList<Parameter> sqlQueryParametersList, IEnumerable<IParameterSpecification> parameterSpecs, QueryParameters queryParameters, ISessionImplementor session)
-		{
-			foreach (var parameterSpecification in parameterSpecs)
-			{
-				parameterSpecification.Bind(command, sqlQueryParametersList, queryParameters, session);
-			}
-		}
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs	2011-06-13 12:31:25 UTC (rev 5917)
+++ trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs	2011-06-13 12:48:08 UTC (rev 5918)
@@ -358,7 +358,7 @@
 			var parameterSpecs = new HashSet<IParameterSpecification>(parametersSpecifications);
 			SqlString sqlString = SqlString.Copy();
 
-			// dynamic-filter parameters: during the HQL->SQL parsing, filters can be added as SQL_TOKEN/string and the SqlGenerator will not find it
+			// dynamic-filter parameters ?
 			//sqlString = ExpandDynamicFilterParameters(sqlString, parameterSpecs, session);
 			//AdjustQueryParametersForSubSelectFetching(sqlString, parameterSpecs, session, queryParameters); // NOTE: see TODO below
 


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