Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5949] trunk/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2011-06-18 13:30:45
|
Revision: 5949
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5949&view=rev
Author: fabiomaulo
Date: 2011-06-18 13:30:39 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
Removed no more needed code
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Engine/Query/NamedParameterDescriptor.cs
trunk/nhibernate/src/NHibernate/Engine/Query/ParameterMetadata.cs
trunk/nhibernate/src/NHibernate/Engine/Query/QueryPlanCache.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
trunk/nhibernate/src/NHibernate/Hql/Classic/QueryTranslator.cs
trunk/nhibernate/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs
trunk/nhibernate/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessSkip.cs
trunk/nhibernate/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessTake.cs
trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectCollectionLoader.cs
trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectOneToManyLoader.cs
trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs
trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs
trunk/nhibernate/src/NHibernate/Loader/Loader.cs
Modified: trunk/nhibernate/src/NHibernate/Engine/Query/NamedParameterDescriptor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/Query/NamedParameterDescriptor.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Engine/Query/NamedParameterDescriptor.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -9,14 +9,12 @@
{
private readonly string name;
private readonly IType expectedType;
- private readonly int[] sourceLocations;
private readonly bool jpaStyle;
- public NamedParameterDescriptor(string name, IType expectedType, int[] sourceLocations, bool jpaStyle)
+ public NamedParameterDescriptor(string name, IType expectedType, bool jpaStyle)
{
this.name = name;
this.expectedType = expectedType;
- this.sourceLocations = sourceLocations;
this.jpaStyle = jpaStyle;
}
@@ -30,11 +28,6 @@
get { return expectedType; }
}
- public int[] SourceLocations
- {
- get { return sourceLocations; }
- }
-
/// <summary>
/// Not supported yet (AST parse needed)
/// </summary>
Modified: trunk/nhibernate/src/NHibernate/Engine/Query/ParameterMetadata.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/Query/ParameterMetadata.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Engine/Query/ParameterMetadata.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -76,11 +76,5 @@
{
return GetNamedParameterDescriptor(name).ExpectedType;
}
-
- public int[] GetNamedParameterSourceLocations(string name)
- {
- return GetNamedParameterDescriptor(name).SourceLocations;
- }
-
}
}
Modified: trunk/nhibernate/src/NHibernate/Engine/Query/QueryPlanCache.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/Query/QueryPlanCache.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Engine/Query/QueryPlanCache.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -168,7 +168,7 @@
string name = entry.Key;
ParamLocationRecognizer.NamedParameterDescription description = entry.Value;
namedParamDescriptorMap[name] =
- new NamedParameterDescriptor(name, null, description.BuildPositionsArray(), description.JpaStyle);
+ new NamedParameterDescriptor(name, null, description.JpaStyle);
}
return new ParameterMetadata(ordinalDescriptors, namedParamDescriptorMap);
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -137,16 +137,6 @@
}
/// <summary>
- /// Returns the locations of all occurrences of the named parameter.
- /// </summary>
- /// <param name="name"></param>
- /// <returns></returns>
- public override int[] GetNamedParameterLocs(string name)
- {
- return _queryTranslator.GetParameterTranslations().GetNamedParameterSqlLocations(name);
- }
-
- /// <summary>
///
/// </summary>
/// <param name="lockModes">a collection of lock modes specified dynamically via the Query interface</param>
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -200,8 +200,7 @@
foreach (var name in parameterTranslations.GetNamedParameterNames())
{
namedDescriptorMap[name] =
- new NamedParameterDescriptor(name, parameterTranslations.GetNamedParameterExpectedType(name),
- parameterTranslations.GetNamedParameterSqlLocations(name), false);// description.JpaStyle);
+ new NamedParameterDescriptor(name, parameterTranslations.GetNamedParameterExpectedType(name), false);// description.JpaStyle);
}
Modified: trunk/nhibernate/src/NHibernate/Hql/Classic/QueryTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Classic/QueryTranslator.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Hql/Classic/QueryTranslator.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -448,8 +448,7 @@
string name = entry.Key;
ParamLocationRecognizer.NamedParameterDescription description = entry.Value;
namedParamDescriptorMap[name] =
- new NamedParameterDescriptor(name, parameterTranslations.GetNamedParameterExpectedType(name),
- description.BuildPositionsArray(), description.JpaStyle);
+ new NamedParameterDescriptor(name, parameterTranslations.GetNamedParameterExpectedType(name), description.JpaStyle);
}
return new ParameterMetadata(ordinalParamDescriptors, namedParamDescriptorMap);
@@ -794,18 +793,6 @@
}
}
- public override int[] GetNamedParameterLocs(string name)
- {
- List<int> o;
- if (!namedParameters.TryGetValue(name, out o))
- {
- QueryException qe = new QueryException("Named parameter does not appear in Query: " + name);
- qe.QueryString = queryString;
- throw qe;
- }
- return o.ToArray();
- }
-
public static string ScalarName(int x, int y)
{
return new StringBuilder()
@@ -1834,7 +1821,7 @@
public int[] GetNamedParameterSqlLocations(string name)
{
- return queryTraslator.GetNamedParameterLocs(name);
+ return new int[0];
}
public IType GetNamedParameterExpectedType(string name)
Modified: trunk/nhibernate/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -332,7 +332,7 @@
NamedParameter namedParameter;
if (_parameters.ConstantToParameterMap.TryGetValue(operandEx, out namedParameter))
{
- _parameters.RequiredHqlParameters.Add(new NamedParameterDescriptor(namedParameter.Name, null, new[] { _parameters.RequiredHqlParameters.Count + 1 }, false));
+ _parameters.RequiredHqlParameters.Add(new NamedParameterDescriptor(namedParameter.Name, null, false));
return _hqlTreeBuilder.Parameter(namedParameter.Name).AsExpression();
}
@@ -402,7 +402,7 @@
if (_parameters.ConstantToParameterMap.TryGetValue(expression, out namedParameter))
{
- _parameters.RequiredHqlParameters.Add(new NamedParameterDescriptor(namedParameter.Name, null, new[] { _parameters.RequiredHqlParameters.Count + 1 }, false));
+ _parameters.RequiredHqlParameters.Add(new NamedParameterDescriptor(namedParameter.Name, null, false));
if (namedParameter.Value is bool)
{
Modified: trunk/nhibernate/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessSkip.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessSkip.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessSkip.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -16,7 +16,7 @@
if (parameters.ConstantToParameterMap.TryGetValue(resultOperator.Count as ConstantExpression, out namedParameter))
{
- parameters.RequiredHqlParameters.Add(new NamedParameterDescriptor(namedParameter.Name, null, new[] {parameters.RequiredHqlParameters.Count + 1}, false));
+ parameters.RequiredHqlParameters.Add(new NamedParameterDescriptor(namedParameter.Name, null, false));
tree.AddSkipClause(tree.TreeBuilder.Parameter(namedParameter.Name));
}
else
Modified: trunk/nhibernate/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessTake.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessTake.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessTake.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -16,7 +16,7 @@
if (parameters.ConstantToParameterMap.TryGetValue(resultOperator.Count as ConstantExpression, out namedParameter))
{
- parameters.RequiredHqlParameters.Add(new NamedParameterDescriptor(namedParameter.Name, null, new[] {parameters.RequiredHqlParameters.Count + 1}, false));
+ parameters.RequiredHqlParameters.Add(new NamedParameterDescriptor(namedParameter.Name, null, false));
tree.AddTakeClause(tree.TreeBuilder.Parameter(namedParameter.Name));
}
else
Modified: trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectCollectionLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectCollectionLoader.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectCollectionLoader.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -52,11 +52,6 @@
LoadCollectionSubselect(session, keys, values, types, namedParameters, KeyType);
}
- public override int[] GetNamedParameterLocs(string name)
- {
- return new int[0];
- }
-
protected override IEnumerable<IParameterSpecification> GetParameterSpecifications()
{
return parametersSpecifications;
Modified: trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectOneToManyLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectOneToManyLoader.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectOneToManyLoader.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -54,11 +54,6 @@
LoadCollectionSubselect(session, keys, values, types, namedParameters, KeyType);
}
- public override int[] GetNamedParameterLocs(string name)
- {
- return new int[0];
- }
-
protected override IEnumerable<IParameterSpecification> GetParameterSpecifications()
{
return parametersSpecifications;
Modified: trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaLoader.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -186,10 +186,5 @@
{
return translator.CollectedParameterSpecifications;
}
-
- public override int[] GetNamedParameterLocs(string name)
- {
- return new int[0];
- }
}
}
\ 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-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -308,24 +308,6 @@
}
}
- public override int[] GetNamedParameterLocs(string name)
- {
- object loc = namedParameterBindPoints[name];
- if (loc == null)
- {
- throw new QueryException("Named parameter does not appear in Query: " + name, sql.ToString());
- }
-
- if (loc is int)
- {
- return new int[] {(int) loc};
- }
- else
- {
- return ArrayHelper.ToIntArray((IList) loc);
- }
- }
-
protected override void AutoDiscoverTypes(IDataReader rs)
{
MetaData metadata = new MetaData(rs);
Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-18 13:14:46 UTC (rev 5948)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-18 13:30:39 UTC (rev 5949)
@@ -1186,11 +1186,6 @@
//}
}
- public virtual int[] GetNamedParameterLocs(string name)
- {
- throw new AssertionFailure("no named parameters");
- }
-
/// <summary>
/// Fetch a <c>IDbCommand</c>, call <c>SetMaxRows</c> and then execute it,
/// advance to the first result and return an SQL <c>IDataReader</c>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
