Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5936] trunk/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2011-06-16 16:51:58
|
Revision: 5936
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5936&view=rev
Author: fabiomaulo
Date: 2011-06-16 16:51:52 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
Removed no more needed code
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs
trunk/nhibernate/src/NHibernate/Engine/SubselectFetch.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs
trunk/nhibernate/src/NHibernate/Hql/Classic/QueryTranslator.cs
trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs
trunk/nhibernate/src/NHibernate/Loader/Loader.cs
Modified: trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs 2011-06-16 16:41:01 UTC (rev 5935)
+++ trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs 2011-06-16 16:51:52 UTC (rev 5936)
@@ -270,29 +270,6 @@
public IEnumerable<IParameterSpecification> ProcessedSqlParameters { get; internal set; }
- public SqlString FilteredSQL
- {
- get { return processedSQL; }
- }
-
- public IList<IType> FilteredParameterTypes
- {
- get { return filteredParameterTypes; }
- internal set { filteredParameterTypes = value; }
- }
-
- public IList<object> FilteredParameterValues
- {
- get { return filteredParameterValues; }
- internal set { filteredParameterValues = value; }
- }
-
- public IList<int> FilteredParameterLocations
- {
- get { return filteredParameterLocations; }
- internal set { filteredParameterLocations = value; }
- }
-
public bool NaturalKeyLookup { get; set; }
public IResultTransformer ResultTransformer
Modified: trunk/nhibernate/src/NHibernate/Engine/SubselectFetch.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/SubselectFetch.cs 2011-06-16 16:41:01 UTC (rev 5935)
+++ trunk/nhibernate/src/NHibernate/Engine/SubselectFetch.cs 2011-06-16 16:51:52 UTC (rev 5936)
@@ -24,7 +24,7 @@
this.loadable = loadable;
this.alias = alias;
- queryString = queryParameters.FilteredSQL.GetSubselectString();
+ queryString = queryParameters.ProcessedSql.GetSubselectString();
}
public QueryParameters QueryParameters
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs 2011-06-16 16:41:01 UTC (rev 5935)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs 2011-06-16 16:51:52 UTC (rev 5936)
@@ -441,7 +441,7 @@
// 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
+ AdjustQueryParametersForSubSelectFetching(sqlString, parameterSpecs, 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 and taking care about the work done by SubselectClauseExtractor
Modified: trunk/nhibernate/src/NHibernate/Hql/Classic/QueryTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Classic/QueryTranslator.cs 2011-06-16 16:41:01 UTC (rev 5935)
+++ trunk/nhibernate/src/NHibernate/Hql/Classic/QueryTranslator.cs 2011-06-16 16:51:52 UTC (rev 5936)
@@ -309,7 +309,7 @@
// dynamic-filter parameters: during the HQL->SQL parsing, filters can be added as SQL_TOKEN/string and the SqlGenerator will not find it
sql = ExpandDynamicFilterParameters(sql, parameterSpecs, session);
- AdjustQueryParametersForSubSelectFetching(sql, parameterSpecs, session, queryParameters); // NOTE: see TODO below
+ AdjustQueryParametersForSubSelectFetching(sql, parameterSpecs, queryParameters); // NOTE: see TODO below
sql = AddLimitsParametersIfNeeded(sql, 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
Modified: trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs 2011-06-16 16:41:01 UTC (rev 5935)
+++ trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs 2011-06-16 16:51:52 UTC (rev 5936)
@@ -190,7 +190,7 @@
// 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
+ AdjustQueryParametersForSubSelectFetching(sqlString, parameterSpecs, 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 and taking care about the work done by SubselectClauseExtractor
Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-16 16:41:01 UTC (rev 5935)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-16 16:51:52 UTC (rev 5936)
@@ -1686,7 +1686,7 @@
// 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
+ AdjustQueryParametersForSubSelectFetching(sqlString, parameterSpecs, 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 and taking care about the work done by SubselectClauseExtractor
@@ -1713,37 +1713,11 @@
return specifications;
}
- protected void AdjustQueryParametersForSubSelectFetching(SqlString sqlString, IEnumerable<IParameterSpecification> parameterSpecs, ISessionImplementor session, QueryParameters queryParameters)
+ protected void AdjustQueryParametersForSubSelectFetching(SqlString sqlString, IEnumerable<IParameterSpecification> parameterSpecs, QueryParameters queryParameters)
{
// TODO: Remove this when all parameters are managed using IParameterSpecification (QueryParameters does not need to have decomposed values for filters)
-
- var dynamicFilterParameterSpecifications = parameterSpecs.OfType<DynamicFilterParameterSpecification>().ToList();
- var filteredParameterValues = new List<object>();
- var filteredParameterTypes = new List<IType>();
- var filteredParameterLocations = new List<int>();
-
- if (dynamicFilterParameterSpecifications.Count != 0)
- {
- var sqlQueryParametersList = sqlString.GetParameters().ToList();
- foreach (DynamicFilterParameterSpecification specification in dynamicFilterParameterSpecifications)
- {
- string backTrackId = specification.GetIdsForBackTrack(session.Factory).First();
- object value = session.GetFilterParameterValue(specification.FilterParameterFullName);
- var elementType = specification.ExpectedType;
- foreach (int position in sqlQueryParametersList.GetEffectiveParameterLocations(backTrackId))
- {
- filteredParameterValues.Add(value);
- filteredParameterTypes.Add(elementType);
- filteredParameterLocations.Add(position);
- }
- }
- }
-
queryParameters.ProcessedSql = sqlString;
queryParameters.ProcessedSqlParameters = parameterSpecs.ToList();
- queryParameters.FilteredParameterLocations = filteredParameterLocations;
- queryParameters.FilteredParameterTypes = filteredParameterTypes;
- queryParameters.FilteredParameterValues = filteredParameterValues;
}
protected SqlString ExpandDynamicFilterParameters(SqlString sqlString, ICollection<IParameterSpecification> parameterSpecs, ISessionImplementor session)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
