Skip to content

Commit d419ab3

Browse files
authored
Cleanup guessed parameters handling in hql (#3255)
Partial revert of no longer needed logic from #2964 (obsoleted by #2723)
1 parent 7bd43f5 commit d419ab3

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs

-17
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public partial class HqlSqlWalker
5858
private readonly LiteralProcessor _literalProcessor;
5959

6060
private readonly IDictionary<string, string> _tokenReplacements;
61-
private readonly IDictionary<IParameterSpecification, IType> _guessedParameterTypes = new Dictionary<IParameterSpecification, IType>();
6261

6362
private JoinType _impliedJoinType;
6463

@@ -93,21 +92,6 @@ public override void ReportError(RecognitionException e)
9392
_parseErrorHandler.ReportError(e);
9493
}
9594

96-
internal IStatement Transform()
97-
{
98-
var tree = (IStatement) statement().Tree;
99-
// Use the guessed type in case we weren't been able to detect the type
100-
foreach (var parameter in _parameters)
101-
{
102-
if (parameter.ExpectedType == null && _guessedParameterTypes.TryGetValue(parameter, out var guessedType))
103-
{
104-
parameter.ExpectedType = guessedType;
105-
}
106-
}
107-
108-
return tree;
109-
}
110-
11195
/*
11296
protected override void Mismatch(IIntStream input, int ttype, BitSet follow)
11397
{
@@ -1176,7 +1160,6 @@ IASTNode GenerateNamedParameter(IASTNode delimiterNode, IASTNode nameNode)
11761160
// when the parameter is used as an argument.
11771161
if (isGuessedType)
11781162
{
1179-
_guessedParameterTypes[paramSpec] = type;
11801163
parameter.GuessedType = type;
11811164
}
11821165
else

src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -651,8 +651,7 @@ public IStatement Translate()
651651

652652
try
653653
{
654-
// Transform the tree.
655-
_resultAst = hqlSqlWalker.Transform();
654+
_resultAst = (IStatement) hqlSqlWalker.statement().Tree;
656655
}
657656
finally
658657
{

0 commit comments

Comments
 (0)